1151 files changed, 56291 insertions, 31385 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 26ca9031ea49..adad2f3d438a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_FC4)		+= fc4/
 obj-$(CONFIG_SCSI)              += scsi/
 obj-$(CONFIG_ATA)               += ata/
 obj-$(CONFIG_FUSION)            += message/
+obj-$(CONFIG_FIREWIRE)          += firewire/
 obj-$(CONFIG_IEEE1394)          += ieee1394/
 obj-y                           += cdrom/
 obj-y                           += auxdisplay/
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 1683e5c5b94c..1cbe61905824 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -231,8 +231,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                  * Obtain the method mutex if necessary. Do not acquire mutex for a
                  * recursive call.
                  */
-                if (acpi_os_get_thread_id() !=
-                    obj_desc->method.mutex->mutex.owner_thread_id) {
+                if (!walk_state ||
+                    !obj_desc->method.mutex->mutex.owner_thread ||
+                    (walk_state->thread !=
+                     obj_desc->method.mutex->mutex.owner_thread)) {
                         /*
                          * Acquire the method mutex. This releases the interpreter if we
                          * block (and reacquires it before it returns)
@@ -246,14 +248,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                         }
 
                         /* Update the mutex and walk info and save the original sync_level */
-                        obj_desc->method.mutex->mutex.owner_thread_id =
-                                acpi_os_get_thread_id();
 
                         if (walk_state) {
                                 obj_desc->method.mutex->mutex.
                                     original_sync_level =
                                     walk_state->thread->current_sync_level;
 
+                                obj_desc->method.mutex->mutex.owner_thread =
+                                    walk_state->thread;
                                 walk_state->thread->current_sync_level =
                                     obj_desc->method.sync_level;
                         } else {
@@ -567,7 +569,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                         acpi_os_release_mutex(method_desc->method.mutex->mutex.
                                               os_mutex);
-                        method_desc->method.mutex->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+                        method_desc->method.mutex->mutex.owner_thread = NULL;
                 }
         }
 
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 6c6104a7a247..fc9da4879cbf 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
                     ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) &&
                      (op->common.parent->common.aml_opcode !=
                       AML_VAR_PACKAGE_OP)
-                     && (op->common.parent->common.aml_opcode !=
-                         AML_NAME_OP))) {
+                     && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {
                         walk_state->result_obj = obj_desc;
                 }
         }
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index e4073e05a75c..71503c036f7c 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -556,10 +556,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                          * indicate this to the interpreter, set the
                                          * object to the root
                                          */
-                                        obj_desc =
-                                            ACPI_CAST_PTR(union
-                                                          acpi_operand_object,
-                                                          acpi_gbl_root_node);
+                                        obj_desc = ACPI_CAST_PTR(union
+                                                                 acpi_operand_object,
+                                                                 acpi_gbl_root_node);
                                         status = AE_OK;
                                 } else {
                                         /*
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 16c8e38b51ef..5afcdd9c7449 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
  *
  ******************************************************************************/
 
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
-                                                  union acpi_parse_object
-                                                  *origin,
-                                                  union acpi_operand_object
-                                                  *method_desc,
-                                                  struct acpi_thread_state
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                  *origin, union acpi_operand_object
+                                                  *method_desc, struct acpi_thread_state
                                                   *thread)
 {
         struct acpi_walk_state *walk_state;
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e08cf98f504f..82f496c07675 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -147,9 +147,10 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event,
         return 0;
 }
 
-static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, unsigned count)
+static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event,
+                        unsigned count, int force_poll)
 {
-        if (acpi_ec_mode == EC_POLL) {
+        if (unlikely(force_poll) || acpi_ec_mode == EC_POLL) {
                 unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
                 while (time_before(jiffies, delay)) {
                         if (acpi_ec_check_status(ec, event, 0))
@@ -173,14 +174,15 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, unsigned count)
 
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
                                         const u8 * wdata, unsigned wdata_len,
-                                        u8 * rdata, unsigned rdata_len)
+                                        u8 * rdata, unsigned rdata_len,
+                                        int force_poll)
 {
         int result = 0;
         unsigned count = atomic_read(&ec->event_count);
         acpi_ec_write_cmd(ec, command);
 
         for (; wdata_len > 0; --wdata_len) {
-                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count);
+                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count, force_poll);
                 if (result) {
                         printk(KERN_ERR PREFIX
                                "write_cmd timeout, command = %d\n", command);
@@ -191,7 +193,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
         }
 
         if (!rdata_len) {
-                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count);
+                result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count, force_poll);
                 if (result) {
                         printk(KERN_ERR PREFIX
                                "finish-write timeout, command = %d\n", command);
@@ -202,7 +204,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
         }
 
         for (; rdata_len > 0; --rdata_len) {
-                result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, count);
+                result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, count, force_poll);
                 if (result) {
                         printk(KERN_ERR PREFIX "read timeout, command = %d\n",
                                command);
@@ -217,7 +219,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
 
 static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
                                const u8 * wdata, unsigned wdata_len,
-                               u8 * rdata, unsigned rdata_len)
+                               u8 * rdata, unsigned rdata_len,
+                               int force_poll)
 {
         int status;
         u32 glk;
@@ -240,7 +243,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
         /* Make sure GPE is enabled before doing transaction */
         acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
 
-        status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0);
+        status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0, 0);
         if (status) {
                 printk(KERN_DEBUG PREFIX
                        "input buffer is not empty, aborting transaction\n");
@@ -249,7 +252,8 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
 
         status = acpi_ec_transaction_unlocked(ec, command,
                                               wdata, wdata_len,
-                                              rdata, rdata_len);
+                                              rdata, rdata_len,
+                                              force_poll);
 
       end:
 
@@ -267,12 +271,12 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
 int acpi_ec_burst_enable(struct acpi_ec *ec)
 {
         u8 d;
-        return acpi_ec_transaction(ec, ACPI_EC_BURST_ENABLE, NULL, 0, &d, 1);
+        return acpi_ec_transaction(ec, ACPI_EC_BURST_ENABLE, NULL, 0, &d, 1, 0);
 }
 
 int acpi_ec_burst_disable(struct acpi_ec *ec)
 {
-        return acpi_ec_transaction(ec, ACPI_EC_BURST_DISABLE, NULL, 0, NULL, 0);
+        return acpi_ec_transaction(ec, ACPI_EC_BURST_DISABLE, NULL, 0, NULL, 0, 0);
 }
 
 static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
@@ -281,7 +285,7 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
         u8 d;
 
         result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_READ,
-                                     &address, 1, &d, 1);
+                                     &address, 1, &d, 1, 0);
         *data = d;
         return result;
 }
@@ -290,7 +294,7 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
 {
         u8 wdata[2] = { address, data };
         return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,
-                                   wdata, 2, NULL, 0);
+                                   wdata, 2, NULL, 0, 0);
 }
 
 /*
@@ -349,13 +353,15 @@ EXPORT_SYMBOL(ec_write);
 
 int ec_transaction(u8 command,
                    const u8 * wdata, unsigned wdata_len,
-                   u8 * rdata, unsigned rdata_len)
+                   u8 * rdata, unsigned rdata_len,
+                   int force_poll)
 {
         if (!first_ec)
                 return -ENODEV;
 
         return acpi_ec_transaction(first_ec, command, wdata,
-                                   wdata_len, rdata, rdata_len);
+                                   wdata_len, rdata, rdata_len,
+                                   force_poll);
 }
 
 EXPORT_SYMBOL(ec_transaction);
@@ -374,7 +380,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
          * bit to be cleared (and thus clearing the interrupt source).
          */
 
-        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);
+        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1, 0);
         if (result)
                 return result;
 
@@ -410,6 +416,7 @@ static u32 acpi_ec_gpe_handler(void *data)
         acpi_status status = AE_OK;
         u8 value;
         struct acpi_ec *ec = data;
+
         atomic_inc(&ec->event_count);
 
         if (acpi_ec_mode == EC_INTR) {
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 635ba449ebc2..e22f4a973c0f 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -341,9 +341,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
 
         /* A Non-NULL gpe_device means this is a GPE Block Device */
 
-        obj_desc =
-            acpi_ns_get_attached_object((struct acpi_namespace_node *)
-                                        gpe_device);
+        obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *)
+                                               gpe_device);
         if (!obj_desc || !obj_desc->device.gpe_block) {
                 return (NULL);
         }
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index ad5bc76edf46..902c287b3a4f 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -1033,8 +1033,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 
                         if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                              ACPI_GPE_DISPATCH_METHOD)
-                            && (gpe_event_info->
-                                flags & ACPI_GPE_TYPE_RUNTIME)) {
+                            && (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
                                 gpe_enabled_count++;
                         }
 
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index cae786ca8600..21cb749d0c75 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -196,15 +196,12 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                 notify_info->notify.value = (u16) notify_value;
                 notify_info->notify.handler_obj = handler_obj;
 
-                acpi_ex_exit_interpreter();
-
-                acpi_ev_notify_dispatch(notify_info);
-
-                status = acpi_ex_enter_interpreter();
+                status =
+                    acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
+                                    notify_info);
                 if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                        acpi_ut_delete_generic_state(notify_info);
                 }
-
         }
 
         if (!handler_obj) {
@@ -323,8 +320,9 @@ static u32 acpi_ev_global_lock_handler(void *context)
                 acpi_gbl_global_lock_acquired = TRUE;
                 /* Send a unit to the semaphore */
 
-                if (ACPI_FAILURE(acpi_os_signal_semaphore(
-                        acpi_gbl_global_lock_semaphore, 1))) {
+                if (ACPI_FAILURE
+                    (acpi_os_signal_semaphore
+                     (acpi_gbl_global_lock_semaphore, 1))) {
                         ACPI_ERROR((AE_INFO,
                                     "Could not signal Global Lock semaphore"));
                 }
@@ -450,7 +448,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
         }
 
         if (ACPI_FAILURE(status)) {
-                status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout);
+                status =
+                    acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex,
+                                              timeout);
         }
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 96b0e8431748..e99f0c435a47 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -291,7 +291,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                                u32 bit_width, acpi_integer * value)
 {
         acpi_status status;
-        acpi_status status2;
         acpi_adr_space_handler handler;
         acpi_adr_space_setup region_setup;
         union acpi_operand_object *handler_desc;
@@ -345,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                  * setup will potentially execute control methods
                  * (e.g., _REG method for this region)
                  */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
 
                 status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
                                       handler_desc->address_space.context,
@@ -353,10 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 
                 /* Re-enter the interpreter */
 
-                status2 = acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        return_ACPI_STATUS(status2);
-                }
+                acpi_ex_reacquire_interpreter();
 
                 /* Check for failure of the Region Setup */
 
@@ -409,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                  * exit the interpreter because the handler *might* block -- we don't
                  * know what it will do, so we can't hold the lock on the intepreter.
                  */
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
         }
 
         /* Call the handler */
@@ -430,10 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                  * We just returned from a non-default handler, we must re-enter the
                  * interpreter
                  */
-                status2 = acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status2)) {
-                        return_ACPI_STATUS(status2);
-                }
+                acpi_ex_reacquire_interpreter();
         }
 
         return_ACPI_STATUS(status);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a4fa7e6822a3..400d90fca966 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -228,7 +228,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
 
                                 /* Install a handler for this PCI root bridge */
 
-                                status = acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
+                                status =
+                                    acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
                                 if (ACPI_FAILURE(status)) {
                                         if (status == AE_SAME_HANDLER) {
                                                 /*
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index a3379bafa676..6d866a01f5f4 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -91,7 +91,6 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_fixed_event_handler
@@ -768,11 +767,9 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
                 return (AE_BAD_PARAMETER);
         }
 
-        status = acpi_ex_enter_interpreter();
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
+        /* Must lock interpreter to prevent race conditions */
 
+        acpi_ex_enter_interpreter();
         status = acpi_ev_acquire_global_lock(timeout);
         acpi_ex_exit_interpreter();
 
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 17065e98807c..9cbd3414a574 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -472,7 +472,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -568,7 +567,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,
 
 ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
 #endif                          /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_gpe_block
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index d470e8b1f4ea..79f2c0d42c06 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -512,9 +512,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                  * Create a new string object and string buffer
                  * (-1 because of extra separator included in string_length from above)
                  */
-                return_desc =
-                    acpi_ut_create_string_object((acpi_size)
-                                                 (string_length - 1));
+                return_desc = acpi_ut_create_string_object((acpi_size)
+                                                           (string_length - 1));
                 if (!return_desc) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index ae97812681a3..6e9a23e47fef 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -50,7 +50,6 @@
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
-
 #ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
@@ -583,10 +582,7 @@ acpi_ex_create_method(u8 * aml_start,
          * Get the sync_level. If method is serialized, a mutex will be
          * created for this method when it is parsed.
          */
-        if (acpi_gbl_all_methods_serialized) {
-                obj_desc->method.sync_level = 0;
-                obj_desc->method.method_flags |= AML_METHOD_SERIALIZED;
-        } else if (method_flags & AML_METHOD_SERIALIZED) {
+        if (method_flags & AML_METHOD_SERIALIZED) {
                 /*
                  * ACPI 1.0: sync_level = 0
                  * ACPI 2.0: sync_level = sync_level in method declaration
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 1a73c14df2c5..51c9c29987c3 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -134,7 +134,7 @@ static struct acpi_exdump_info acpi_ex_dump_method[8] = {
 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_id), "Owner Thread"},
+        {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.os_mutex), "OsMutex"}
@@ -451,9 +451,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         ACPI_FUNCTION_NAME(ex_dump_operand)
 
-            if (!
-                ((ACPI_LV_EXEC & acpi_dbg_level)
-                 && (_COMPONENT & acpi_dbg_layer))) {
+            if (!((ACPI_LV_EXEC & acpi_dbg_level)
+                  && (_COMPONENT & acpi_dbg_layer))) {
                 return;
         }
 
@@ -844,9 +843,8 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
         ACPI_FUNCTION_ENTRY();
 
         if (!flags) {
-                if (!
-                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
-                     && (_COMPONENT & acpi_dbg_layer))) {
+                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
+                      && (_COMPONENT & acpi_dbg_layer))) {
                         return;
                 }
         }
@@ -1011,9 +1009,8 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
         }
 
         if (!flags) {
-                if (!
-                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
-                     && (_COMPONENT & acpi_dbg_layer))) {
+                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
+                      && (_COMPONENT & acpi_dbg_layer))) {
                         return_VOID;
                 }
         }
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 4eb883bda6ae..6748e3ef0997 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -66,9 +66,10 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
  *
  ******************************************************************************/
 
-void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc,
-                          struct acpi_thread_state *thread)
+void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
 {
+        struct acpi_thread_state *thread = obj_desc->mutex.owner_thread;
+
         if (!thread) {
                 return;
         }
@@ -173,13 +174,16 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
 
         /* Support for multiple acquires by the owning thread */
 
-        if (obj_desc->mutex.owner_thread_id == acpi_os_get_thread_id()) {
-                /*
-                 * The mutex is already owned by this thread, just increment the
-                 * acquisition depth
-                 */
-                obj_desc->mutex.acquisition_depth++;
-                return_ACPI_STATUS(AE_OK);
+        if (obj_desc->mutex.owner_thread) {
+                if (obj_desc->mutex.owner_thread->thread_id ==
+                    walk_state->thread->thread_id) {
+                        /*
+                         * The mutex is already owned by this thread, just increment the
+                         * acquisition depth
+                         */
+                        obj_desc->mutex.acquisition_depth++;
+                        return_ACPI_STATUS(AE_OK);
+                }
         }
 
         /* Acquire the mutex, wait if necessary. Special case for Global Lock */
@@ -202,7 +206,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
 
         /* Have the mutex: update mutex and walk info and save the sync_level */
 
-        obj_desc->mutex.owner_thread_id = acpi_os_get_thread_id();
+        obj_desc->mutex.owner_thread = walk_state->thread;
         obj_desc->mutex.acquisition_depth = 1;
         obj_desc->mutex.original_sync_level =
             walk_state->thread->current_sync_level;
@@ -242,7 +246,7 @@ 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_id) {
+        if (!obj_desc->mutex.owner_thread) {
                 ACPI_ERROR((AE_INFO,
                             "Cannot release Mutex [%4.4s], not acquired",
                             acpi_ut_get_node_name(obj_desc->mutex.node)));
@@ -262,14 +266,15 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
          * The Mutex is owned, but this thread must be the owner.
          * Special case for Global Lock, any thread can release
          */
-        if ((obj_desc->mutex.owner_thread_id !=
+        if ((obj_desc->mutex.owner_thread->thread_id !=
              walk_state->thread->thread_id)
             && (obj_desc->mutex.os_mutex != acpi_gbl_global_lock_mutex)) {
                 ACPI_ERROR((AE_INFO,
                             "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
                             (unsigned long)walk_state->thread->thread_id,
                             acpi_ut_get_node_name(obj_desc->mutex.node),
-                            (unsigned long)obj_desc->mutex.owner_thread_id));
+                            (unsigned long)obj_desc->mutex.owner_thread->
+                            thread_id));
                 return_ACPI_STATUS(AE_AML_NOT_OWNER);
         }
 
@@ -296,7 +301,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
         /* Unlink the mutex from the owner's list */
 
-        acpi_ex_unlink_mutex(obj_desc, walk_state->thread);
+        acpi_ex_unlink_mutex(obj_desc);
 
         /* Release the mutex, special case for Global Lock */
 
@@ -308,7 +313,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
         /* Update the mutex and restore sync_level */
 
-        obj_desc->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+        obj_desc->mutex.owner_thread = NULL;
         walk_state->thread->current_sync_level =
             obj_desc->mutex.original_sync_level;
 
@@ -363,7 +368,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
 
                 /* Mark mutex unowned */
 
-                obj_desc->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+                obj_desc->mutex.owner_thread = NULL;
 
                 /* Update Thread sync_level (Last mutex is the important one) */
 
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 1ee4fb1175c6..308eae52dc05 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -177,8 +177,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
 
         ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Bytes from stream:\n"));
 
-        for (index = 0;
-             (index < ACPI_NAME_SIZE)
+        for (index = 0; (index < ACPI_NAME_SIZE)
              && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) {
                 char_buf[index] = *aml_address++;
                 ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index a6696621ff1b..efe5d4b461a4 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -242,7 +242,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
                                             obj_desc->common_field.bit_length,
                                             0xFFFFFFFF
                                             /* Temp until we pass region_length as parameter */
-                                            );
+                    );
                 bit_length = byte_alignment * 8;
 #endif
 
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index ba761862a599..09d897b3f6d5 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -354,8 +354,7 @@ acpi_ex_resolve_operands(u16 opcode,
                         if ((opcode == AML_STORE_OP) &&
                             (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
                              ACPI_TYPE_LOCAL_REFERENCE)
-                            && ((*stack_ptr)->reference.opcode ==
-                                AML_INDEX_OP)) {
+                            && ((*stack_ptr)->reference.opcode == AML_INDEX_OP)) {
                                 goto next_operand;
                         }
                         break;
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index b2edf620ba89..9460baff3032 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -66,7 +66,6 @@ ACPI_MODULE_NAME("exsystem")
 acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 {
         acpi_status status;
-        acpi_status status2;
 
         ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);
 
@@ -79,7 +78,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 
                 /* We must wait, so unlock the interpreter */
 
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
 
                 status = acpi_os_wait_semaphore(semaphore, 1, timeout);
 
@@ -89,13 +88,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 
                 /* Reacquire the interpreter */
 
-                status2 = acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status2)) {
-
-                        /* Report fatal error, could not acquire interpreter */
-
-                        return_ACPI_STATUS(status2);
-                }
+                acpi_ex_reacquire_interpreter();
         }
 
         return_ACPI_STATUS(status);
@@ -119,7 +112,6 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 {
         acpi_status status;
-        acpi_status status2;
 
         ACPI_FUNCTION_TRACE(ex_system_wait_mutex);
 
@@ -132,7 +124,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 
                 /* We must wait, so unlock the interpreter */
 
-                acpi_ex_exit_interpreter();
+                acpi_ex_relinquish_interpreter();
 
                 status = acpi_os_acquire_mutex(mutex, timeout);
 
@@ -142,13 +134,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 
                 /* Reacquire the interpreter */
 
-                status2 = acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status2)) {
-
-                        /* Report fatal error, could not acquire interpreter */
-
-                        return_ACPI_STATUS(status2);
-                }
+                acpi_ex_reacquire_interpreter();
         }
 
         return_ACPI_STATUS(status);
@@ -209,20 +195,18 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
 
 acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)
 {
-        acpi_status status;
-
         ACPI_FUNCTION_ENTRY();
 
         /* Since this thread will sleep, we must release the interpreter */
 
-        acpi_ex_exit_interpreter();
+        acpi_ex_relinquish_interpreter();
 
         acpi_os_sleep(how_long);
 
         /* And now we must get the interpreter again */
 
-        status = acpi_ex_enter_interpreter();
-        return (status);
+        acpi_ex_reacquire_interpreter();
+        return (AE_OK);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index aea461f3a48c..6b0aeccbb69b 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -76,14 +76,15 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
  *
  * PARAMETERS:  None
  *
- * RETURN:      Status
+ * RETURN:      None
  *
- * DESCRIPTION: Enter the interpreter execution region.  Failure to enter
- *              the interpreter region is a fatal system error
+ * DESCRIPTION: Enter the interpreter execution region. Failure to enter
+ *              the interpreter region is a fatal system error. Used in
+ *              conjunction with exit_interpreter.
  *
  ******************************************************************************/
 
-acpi_status acpi_ex_enter_interpreter(void)
+void acpi_ex_enter_interpreter(void)
 {
         acpi_status status;
 
@@ -91,31 +92,55 @@ acpi_status acpi_ex_enter_interpreter(void)
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
         if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not acquire AML Interpreter mutex"));
         }
 
-        return_ACPI_STATUS(status);
+        return_VOID;
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_exit_interpreter
+ * FUNCTION:    acpi_ex_reacquire_interpreter
  *
  * PARAMETERS:  None
  *
  * RETURN:      None
  *
- * DESCRIPTION: Exit the interpreter execution region
+ * DESCRIPTION: Reacquire the interpreter execution region from within the
+ *              interpreter code. Failure to enter the interpreter region is a
+ *              fatal system error. Used in  conjuction with
+ *              relinquish_interpreter
+ *
+ ******************************************************************************/
+
+void acpi_ex_reacquire_interpreter(void)
+{
+        ACPI_FUNCTION_TRACE(ex_reacquire_interpreter);
+
+        /*
+         * If the global serialized flag is set, do not release the interpreter,
+         * since it was not actually released by acpi_ex_relinquish_interpreter.
+         * This forces the interpreter to be single threaded.
+         */
+        if (!acpi_gbl_all_methods_serialized) {
+                acpi_ex_enter_interpreter();
+        }
+
+        return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_exit_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
  *
- * Cases where the interpreter is unlocked:
- *      1) Completion of the execution of a control method
- *      2) Method blocked on a Sleep() AML opcode
- *      3) Method blocked on an Acquire() AML opcode
- *      4) Method blocked on a Wait() AML opcode
- *      5) Method blocked to acquire the global lock
- *      6) Method blocked to execute a serialized control method that is
- *          already executing
- *      7) About to invoke a user-installed opregion handler
+ * DESCRIPTION: Exit the interpreter execution region. This is the top level
+ *              routine used to exit the interpreter when all processing has
+ *              been completed.
  *
  ******************************************************************************/
 
@@ -127,7 +152,46 @@ void acpi_ex_exit_interpreter(void)
 
         status = acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
         if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not release AML Interpreter mutex"));
+        }
+
+        return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_relinquish_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Exit the interpreter execution region, from within the
+ *              interpreter - before attempting an operation that will possibly
+ *              block the running thread.
+ *
+ * Cases where the interpreter is unlocked internally
+ *      1) Method to be blocked on a Sleep() AML opcode
+ *      2) Method to be blocked on an Acquire() AML opcode
+ *      3) Method to be blocked on a Wait() AML opcode
+ *      4) Method to be blocked to acquire the global lock
+ *      5) Method to be blocked waiting to execute a serialized control method
+ *          that is currently executing
+ *      6) About to invoke a user-installed opregion handler
+ *
+ ******************************************************************************/
+
+void acpi_ex_relinquish_interpreter(void)
+{
+        ACPI_FUNCTION_TRACE(ex_relinquish_interpreter);
+
+        /*
+         * If the global serialized flag is set, do not release the interpreter.
+         * This forces the interpreter to be single threaded.
+         */
+        if (!acpi_gbl_all_methods_serialized) {
+                acpi_ex_exit_interpreter();
         }
 
         return_VOID;
@@ -141,8 +205,8 @@ void acpi_ex_exit_interpreter(void)
  *
  * RETURN:      none
  *
- * DESCRIPTION: Truncate a number to 32-bits if the currently executing method
- *              belongs to a 32-bit ACPI table.
+ * DESCRIPTION: Truncate an ACPI Integer to 32 bits if the execution mode is
+ *              32-bit, as determined by the revision of the DSDT.
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4334c208841a..41427a41f620 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -245,6 +245,35 @@ arch_initcall(init_acpi_device_notify);
 
 #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
 
+#ifdef CONFIG_PM
+static u32 rtc_handler(void *context)
+{
+        acpi_clear_event(ACPI_EVENT_RTC);
+        acpi_disable_event(ACPI_EVENT_RTC, 0);
+        return ACPI_INTERRUPT_HANDLED;
+}
+
+static inline void rtc_wake_setup(void)
+{
+        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
+}
+
+static void rtc_wake_on(struct device *dev)
+{
+        acpi_clear_event(ACPI_EVENT_RTC);
+        acpi_enable_event(ACPI_EVENT_RTC, 0);
+}
+
+static void rtc_wake_off(struct device *dev)
+{
+        acpi_disable_event(ACPI_EVENT_RTC, 0);
+}
+#else
+#define rtc_wake_setup()        do{}while(0)
+#define rtc_wake_on             NULL
+#define rtc_wake_off            NULL
+#endif
+
 /* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find
  * its device node and pass extra config data.  This helps its driver use
  * capabilities that the now-obsolete mc146818 didn't have, and informs it
@@ -283,11 +312,24 @@ static int __init acpi_rtc_init(void)
         struct device *dev = get_rtc_dev();
 
         if (dev) {
+                rtc_wake_setup();
+                rtc_info.wake_on = rtc_wake_on;
+                rtc_info.wake_off = rtc_wake_off;
+
+                /* workaround bug in some ACPI tables */
+                if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) {
+                        DBG("bogus FADT month_alarm\n");
+                        acpi_gbl_FADT.month_alarm = 0;
+                }
+
                 rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm;
                 rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm;
                 rtc_info.rtc_century = acpi_gbl_FADT.century;
 
-                /* NOTE:  acpi_gbl_FADT->rtcs4 is NOT currently useful */
+                /* NOTE:  S4_RTC_WAKE is NOT currently useful to Linux */
+                if (acpi_gbl_FADT.flags & ACPI_FADT_S4_RTC_WAKE)
+                        printk(PREFIX "RTC can wake from S4\n");
+
 
                 dev->platform_data = &rtc_info;
 
@@ -296,7 +338,7 @@ static int __init acpi_rtc_init(void)
 
                 put_device(dev);
         } else
-                pr_debug("ACPI: RTC unavailable?\n");
+                DBG("RTC unavailable?\n");
         return 0;
 }
 /* do this between RTC subsys_initcall() and rtc_cmos driver_initcall() */
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index c84b1faba28c..76c525dc590b 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -152,7 +152,6 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
 
 ACPI_EXPORT_SYMBOL(acpi_get_firmware_waking_vector)
 #endif
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enter_sleep_state_prep
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 26fd0dd6953d..97b2ac57c16b 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -75,7 +75,7 @@ ACPI_MODULE_NAME("nseval")
  * MUTEX:       Locks interpreter
  *
  ******************************************************************************/
-acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
+acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
 {
         acpi_status status;
 
@@ -154,11 +154,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                  * Execute the method via the interpreter. The interpreter is locked
                  * here before calling into the AML parser
                  */
-                status = acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-
+                acpi_ex_enter_interpreter();
                 status = acpi_ps_execute_method(info);
                 acpi_ex_exit_interpreter();
         } else {
@@ -182,10 +178,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                  * resolution, we must lock it because we could access an opregion.
                  * The opregion access code assumes that the interpreter is locked.
                  */
-                status = acpi_ex_enter_interpreter();
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
+                acpi_ex_enter_interpreter();
 
                 /* Function has a strange interface */
 
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index c4ab615f77fe..33db2241044e 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -214,7 +214,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                         u32 level, void *context, void **return_value)
 {
         acpi_object_type type;
-        acpi_status status;
+        acpi_status status = AE_OK;
         struct acpi_init_walk_info *info =
             (struct acpi_init_walk_info *)context;
         struct acpi_namespace_node *node =
@@ -268,10 +268,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
         /*
          * Must lock the interpreter before executing AML code
          */
-        status = acpi_ex_enter_interpreter();
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
+        acpi_ex_enter_interpreter();
 
         /*
          * Each of these types can contain executable AML code within the
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 94eb8f332d94..280b8357c46c 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -65,10 +65,8 @@ ACPI_MODULE_NAME("nswalk")
  *              within Scope is returned.
  *
  ******************************************************************************/
-struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
-                                                  struct acpi_namespace_node
-                                                  *parent_node,
-                                                  struct acpi_namespace_node
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
+                                                  *parent_node, struct acpi_namespace_node
                                                   *child_node)
 {
         struct acpi_namespace_node *next_node = NULL;
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 8904d0fae6a2..be4f2899de74 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -48,7 +48,6 @@
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfeval")
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -73,8 +72,8 @@ ACPI_MODULE_NAME("nsxfeval")
 acpi_status
 acpi_evaluate_object_typed(acpi_handle handle,
                            acpi_string pathname,
-                           struct acpi_object_list * external_params,
-                           struct acpi_buffer * return_buffer,
+                           struct acpi_object_list *external_params,
+                           struct acpi_buffer *return_buffer,
                            acpi_object_type return_type)
 {
         acpi_status status;
@@ -143,7 +142,6 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
 ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
 #endif                          /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_evaluate_object
@@ -170,7 +168,6 @@ acpi_evaluate_object(acpi_handle handle,
                      struct acpi_buffer *return_buffer)
 {
         acpi_status status;
-        acpi_status status2;
         struct acpi_evaluate_info *info;
         acpi_size buffer_space_needed;
         u32 i;
@@ -329,14 +326,12 @@ acpi_evaluate_object(acpi_handle handle,
                  * Delete the internal return object. NOTE: Interpreter must be
                  * locked to avoid race condition.
                  */
-                status2 = acpi_ex_enter_interpreter();
-                if (ACPI_SUCCESS(status2)) {
+                acpi_ex_enter_interpreter();
 
-                        /* Remove one reference on the return object (should delete it) */
+                /* Remove one reference on the return object (should delete it) */
 
-                        acpi_ut_remove_reference(info->return_object);
-                        acpi_ex_exit_interpreter();
-                }
+                acpi_ut_remove_reference(info->return_object);
+                acpi_ex_exit_interpreter();
         }
 
       cleanup:
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 8fcd6a15517f..a2efae8a4c4e 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -40,19 +40,19 @@ static nodemask_t nodes_found_map = NODE_MASK_NONE;
 #define NID_INVAL       -1
 
 /* maps to convert between proximity domain and logical node ID */
-int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
+static int pxm_to_node_map[MAX_PXM_DOMAINS]
                                 = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
-int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
+static int node_to_pxm_map[MAX_NUMNODES]
                                 = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
 
-int __cpuinit pxm_to_node(int pxm)
+int pxm_to_node(int pxm)
 {
         if (pxm < 0)
                 return NID_INVAL;
         return pxm_to_node_map[pxm];
 }
 
-int __cpuinit node_to_pxm(int node)
+int node_to_pxm(int node)
 {
         if (node < 0)
                 return PXM_INVAL;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 971eca4864fa..b998340e23d4 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -30,7 +30,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
 #include <linux/delay.h>
@@ -72,6 +71,7 @@ static unsigned int acpi_irq_irq;
 static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
 static struct workqueue_struct *kacpid_wq;
+static struct workqueue_struct *kacpi_notify_wq;
 
 static void __init acpi_request_region (struct acpi_generic_address *addr,
         unsigned int length, char *desc)
@@ -138,8 +138,9 @@ acpi_status acpi_os_initialize1(void)
                 return AE_NULL_ENTRY;
         }
         kacpid_wq = create_singlethread_workqueue("kacpid");
+        kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
         BUG_ON(!kacpid_wq);
-
+        BUG_ON(!kacpi_notify_wq);
         return AE_OK;
 }
 
@@ -151,6 +152,7 @@ acpi_status acpi_os_terminate(void)
         }
 
         destroy_workqueue(kacpid_wq);
+        destroy_workqueue(kacpi_notify_wq);
 
         return AE_OK;
 }
@@ -604,6 +606,23 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
 static void acpi_os_execute_deferred(struct work_struct *work)
 {
         struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
+        if (!dpc) {
+                printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
+                return;
+        }
+
+        dpc->function(dpc->context);
+        kfree(dpc);
+
+        /* Yield cpu to notify thread */
+        cond_resched();
+
+        return;
+}
+
+static void acpi_os_execute_notify(struct work_struct *work)
+{
+        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
 
         if (!dpc) {
                 printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
@@ -638,14 +657,12 @@ acpi_status acpi_os_execute(acpi_execute_type type,
         acpi_status status = AE_OK;
         struct acpi_os_dpc *dpc;
 
-        ACPI_FUNCTION_TRACE("os_queue_for_execution");
-
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                           "Scheduling function [%p(%p)] for deferred execution.\n",
                           function, context));
 
         if (!function)
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                return AE_BAD_PARAMETER;
 
         /*
          * Allocate/initialize DPC structure.  Note that this memory will be
@@ -663,14 +680,21 @@ acpi_status acpi_os_execute(acpi_execute_type type,
         dpc->function = function;
         dpc->context = context;
 
-        INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-        if (!queue_work(kacpid_wq, &dpc->work)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        if (type == OSL_NOTIFY_HANDLER) {
+                INIT_WORK(&dpc->work, acpi_os_execute_notify);
+                if (!queue_work(kacpi_notify_wq, &dpc->work)) {
+                        status = AE_ERROR;
+                        kfree(dpc);
+                }
+        } else {
+                INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+                if (!queue_work(kacpid_wq, &dpc->work)) {
+                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Call to queue_work() failed.\n"));
-                kfree(dpc);
-                status = AE_ERROR;
+                        status = AE_ERROR;
+                        kfree(dpc);
+                }
         }
-
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 16d8b6cc3c22..9296e86761d7 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -185,459 +185,453 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* Index           Name                 Parser Args               Interpreter Args                ObjectType                    Class                      Type                  Flags */
 
 /* 00 */ ACPI_OP("Zero", ARGP_ZERO_OP, ARGI_ZERO_OP, ACPI_TYPE_INTEGER,
-                         AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                 AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* 01 */ ACPI_OP("One", ARGP_ONE_OP, ARGI_ONE_OP, ACPI_TYPE_INTEGER,
-                         AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                 AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* 02 */ ACPI_OP("Alias", ARGP_ALIAS_OP, ARGI_ALIAS_OP,
-                         ACPI_TYPE_LOCAL_ALIAS, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ACPI_TYPE_LOCAL_ALIAS, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_SIMPLE,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 03 */ ACPI_OP("Name", ARGP_NAME_OP, ARGI_NAME_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 04 */ ACPI_OP("ByteConst", ARGP_BYTE_OP, ARGI_BYTE_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 05 */ ACPI_OP("WordConst", ARGP_WORD_OP, ARGI_WORD_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 06 */ ACPI_OP("DwordConst", ARGP_DWORD_OP, ARGI_DWORD_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 07 */ ACPI_OP("String", ARGP_STRING_OP, ARGI_STRING_OP,
-                         ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, AML_CONSTANT),
 /* 08 */ ACPI_OP("Scope", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
-                         ACPI_TYPE_LOCAL_SCOPE, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ACPI_TYPE_LOCAL_SCOPE, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_NO_OBJ,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 09 */ ACPI_OP("Buffer", ARGP_BUFFER_OP, ARGI_BUFFER_OP,
-                         ACPI_TYPE_BUFFER, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_OBJECT,
-                         AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
+                 ACPI_TYPE_BUFFER, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_OBJECT,
+                 AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
 /* 0A */ ACPI_OP("Package", ARGP_PACKAGE_OP, ARGI_PACKAGE_OP,
-                         ACPI_TYPE_PACKAGE, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_OBJECT,
-                         AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
+                 ACPI_TYPE_PACKAGE, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_OBJECT,
+                 AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
 /* 0B */ ACPI_OP("Method", ARGP_METHOD_OP, ARGI_METHOD_OP,
-                         ACPI_TYPE_METHOD, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_COMPLEX,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED | AML_DEFER),
+                 ACPI_TYPE_METHOD, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_COMPLEX,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 0C */ ACPI_OP("Local0", ARGP_LOCAL0, ARGI_LOCAL0,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0D */ ACPI_OP("Local1", ARGP_LOCAL1, ARGI_LOCAL1,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0E */ ACPI_OP("Local2", ARGP_LOCAL2, ARGI_LOCAL2,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0F */ ACPI_OP("Local3", ARGP_LOCAL3, ARGI_LOCAL3,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 10 */ ACPI_OP("Local4", ARGP_LOCAL4, ARGI_LOCAL4,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 11 */ ACPI_OP("Local5", ARGP_LOCAL5, ARGI_LOCAL5,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 12 */ ACPI_OP("Local6", ARGP_LOCAL6, ARGI_LOCAL6,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 13 */ ACPI_OP("Local7", ARGP_LOCAL7, ARGI_LOCAL7,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LOCAL_VARIABLE, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LOCAL_VARIABLE, 0),
 /* 14 */ ACPI_OP("Arg0", ARGP_ARG0, ARGI_ARG0,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 15 */ ACPI_OP("Arg1", ARGP_ARG1, ARGI_ARG1,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 16 */ ACPI_OP("Arg2", ARGP_ARG2, ARGI_ARG2,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 17 */ ACPI_OP("Arg3", ARGP_ARG3, ARGI_ARG3,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 18 */ ACPI_OP("Arg4", ARGP_ARG4, ARGI_ARG4,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 19 */ ACPI_OP("Arg5", ARGP_ARG5, ARGI_ARG5,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 1A */ ACPI_OP("Arg6", ARGP_ARG6, ARGI_ARG6,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_METHOD_ARGUMENT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_METHOD_ARGUMENT, 0),
 /* 1B */ ACPI_OP("Store", ARGP_STORE_OP, ARGI_STORE_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R),
 /* 1C */ ACPI_OP("RefOf", ARGP_REF_OF_OP, ARGI_REF_OF_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
+                 AML_FLAGS_EXEC_1A_0T_1R),
 /* 1D */ ACPI_OP("Add", ARGP_ADD_OP, ARGI_ADD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 1E */ ACPI_OP("Concatenate", ARGP_CONCAT_OP, ARGI_CONCAT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 1F */ ACPI_OP("Subtract", ARGP_SUBTRACT_OP, ARGI_SUBTRACT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 20 */ ACPI_OP("Increment", ARGP_INCREMENT_OP, ARGI_INCREMENT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_1R,
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 21 */ ACPI_OP("Decrement", ARGP_DECREMENT_OP, ARGI_DECREMENT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_1R,
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 22 */ ACPI_OP("Multiply", ARGP_MULTIPLY_OP, ARGI_MULTIPLY_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 23 */ ACPI_OP("Divide", ARGP_DIVIDE_OP, ARGI_DIVIDE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_2T_1R,
-                         AML_FLAGS_EXEC_2A_2T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_2T_1R,
+                 AML_FLAGS_EXEC_2A_2T_1R | AML_CONSTANT),
 /* 24 */ ACPI_OP("ShiftLeft", ARGP_SHIFT_LEFT_OP, ARGI_SHIFT_LEFT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 25 */ ACPI_OP("ShiftRight", ARGP_SHIFT_RIGHT_OP, ARGI_SHIFT_RIGHT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 26 */ ACPI_OP("And", ARGP_BIT_AND_OP, ARGI_BIT_AND_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 27 */ ACPI_OP("NAnd", ARGP_BIT_NAND_OP, ARGI_BIT_NAND_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 28 */ ACPI_OP("Or", ARGP_BIT_OR_OP, ARGI_BIT_OR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 29 */ ACPI_OP("NOr", ARGP_BIT_NOR_OP, ARGI_BIT_NOR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 2A */ ACPI_OP("XOr", ARGP_BIT_XOR_OP, ARGI_BIT_XOR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 2B */ ACPI_OP("Not", ARGP_BIT_NOT_OP, ARGI_BIT_NOT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2C */ ACPI_OP("FindSetLeftBit", ARGP_FIND_SET_LEFT_BIT_OP,
-                         ARGI_FIND_SET_LEFT_BIT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ARGI_FIND_SET_LEFT_BIT_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2D */ ACPI_OP("FindSetRightBit", ARGP_FIND_SET_RIGHT_BIT_OP,
-                         ARGI_FIND_SET_RIGHT_BIT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ARGI_FIND_SET_RIGHT_BIT_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2E */ ACPI_OP("DerefOf", ARGP_DEREF_OF_OP, ARGI_DEREF_OF_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R, AML_FLAGS_EXEC_1A_0T_1R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_1R, AML_FLAGS_EXEC_1A_0T_1R),
 /* 2F */ ACPI_OP("Notify", ARGP_NOTIFY_OP, ARGI_NOTIFY_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_0R, AML_FLAGS_EXEC_2A_0T_0R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_0T_0R, AML_FLAGS_EXEC_2A_0T_0R),
 /* 30 */ ACPI_OP("SizeOf", ARGP_SIZE_OF_OP, ARGI_SIZE_OF_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_1R,
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
 /* 31 */ ACPI_OP("Index", ARGP_INDEX_OP, ARGI_INDEX_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R),
 /* 32 */ ACPI_OP("Match", ARGP_MATCH_OP, ARGI_MATCH_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_6A_0T_1R,
-                         AML_FLAGS_EXEC_6A_0T_1R | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_6A_0T_1R,
+                 AML_FLAGS_EXEC_6A_0T_1R | AML_CONSTANT),
 /* 33 */ ACPI_OP("CreateDWordField", ARGP_CREATE_DWORD_FIELD_OP,
-                         ARGI_CREATE_DWORD_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 ARGI_CREATE_DWORD_FIELD_OP,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_DEFER | AML_CREATE),
 /* 34 */ ACPI_OP("CreateWordField", ARGP_CREATE_WORD_FIELD_OP,
-                         ARGI_CREATE_WORD_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 ARGI_CREATE_WORD_FIELD_OP,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_DEFER | AML_CREATE),
 /* 35 */ ACPI_OP("CreateByteField", ARGP_CREATE_BYTE_FIELD_OP,
-                         ARGI_CREATE_BYTE_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 ARGI_CREATE_BYTE_FIELD_OP,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_DEFER | AML_CREATE),
 /* 36 */ ACPI_OP("CreateBitField", ARGP_CREATE_BIT_FIELD_OP,
-                         ARGI_CREATE_BIT_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 ARGI_CREATE_BIT_FIELD_OP,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_DEFER | AML_CREATE),
 /* 37 */ ACPI_OP("ObjectType", ARGP_TYPE_OP, ARGI_TYPE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_1R,
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
 /* 38 */ ACPI_OP("LAnd", ARGP_LAND_OP, ARGI_LAND_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
-                         AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT),
 /* 39 */ ACPI_OP("LOr", ARGP_LOR_OP, ARGI_LOR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
-                         AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT),
 /* 3A */ ACPI_OP("LNot", ARGP_LNOT_OP, ARGI_LNOT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
-                         AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
+                 AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 3B */ ACPI_OP("LEqual", ARGP_LEQUAL_OP, ARGI_LEQUAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_0T_1R,
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3C */ ACPI_OP("LGreater", ARGP_LGREATER_OP, ARGI_LGREATER_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_0T_1R,
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3D */ ACPI_OP("LLess", ARGP_LLESS_OP, ARGI_LLESS_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3E */ ACPI_OP("If", ARGP_IF_OP, ARGI_IF_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 3F */ ACPI_OP("Else", ARGP_ELSE_OP, ARGI_ELSE_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 40 */ ACPI_OP("While", ARGP_WHILE_OP, ARGI_WHILE_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 41 */ ACPI_OP("Noop", ARGP_NOOP_OP, ARGI_NOOP_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 42 */ ACPI_OP("Return", ARGP_RETURN_OP, ARGI_RETURN_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_CONTROL,
-                         AML_TYPE_CONTROL, AML_HAS_ARGS),
+                 ACPI_TYPE_ANY, AML_CLASS_CONTROL,
+                 AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 43 */ ACPI_OP("Break", ARGP_BREAK_OP, ARGI_BREAK_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 44 */ ACPI_OP("BreakPoint", ARGP_BREAK_POINT_OP, ARGI_BREAK_POINT_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 45 */ ACPI_OP("Ones", ARGP_ONES_OP, ARGI_ONES_OP, ACPI_TYPE_INTEGER,
-                         AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                 AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 
 /* Prefixed opcodes (Two-byte opcodes with a prefix op) */
 
 /* 46 */ ACPI_OP("Mutex", ARGP_MUTEX_OP, ARGI_MUTEX_OP, ACPI_TYPE_MUTEX,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 47 */ ACPI_OP("Event", ARGP_EVENT_OP, ARGI_EVENT_OP, ACPI_TYPE_EVENT,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                         AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
 /* 48 */ ACPI_OP("CondRefOf", ARGP_COND_REF_OF_OP, ARGI_COND_REF_OF_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
 /* 49 */ ACPI_OP("CreateField", ARGP_CREATE_FIELD_OP,
-                         ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD,
-                         AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_FIELD | AML_CREATE),
+                 ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD,
+                 AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_DEFER | AML_FIELD | AML_CREATE),
 /* 4A */ ACPI_OP("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R,
-                         AML_FLAGS_EXEC_1A_1T_0R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R,
+                 AML_FLAGS_EXEC_1A_1T_0R),
 /* 4B */ ACPI_OP("Stall", ARGP_STALL_OP, ARGI_STALL_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                         AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                 AML_FLAGS_EXEC_1A_0T_0R),
 /* 4C */ ACPI_OP("Sleep", ARGP_SLEEP_OP, ARGI_SLEEP_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                         AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                 AML_FLAGS_EXEC_1A_0T_0R),
 /* 4D */ ACPI_OP("Acquire", ARGP_ACQUIRE_OP, ARGI_ACQUIRE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R),
 /* 4E */ ACPI_OP("Signal", ARGP_SIGNAL_OP, ARGI_SIGNAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 4F */ ACPI_OP("Wait", ARGP_WAIT_OP, ARGI_WAIT_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                         AML_FLAGS_EXEC_2A_0T_1R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                 AML_FLAGS_EXEC_2A_0T_1R),
 /* 50 */ ACPI_OP("Reset", ARGP_RESET_OP, ARGI_RESET_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                         AML_FLAGS_EXEC_1A_0T_0R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                 AML_FLAGS_EXEC_1A_0T_0R),
 /* 51 */ ACPI_OP("Release", ARGP_RELEASE_OP, ARGI_RELEASE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 52 */ ACPI_OP("FromBCD", ARGP_FROM_BCD_OP, ARGI_FROM_BCD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 53 */ ACPI_OP("ToBCD", ARGP_TO_BCD_OP, ARGI_TO_BCD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 54 */ ACPI_OP("Unload", ARGP_UNLOAD_OP, ARGI_UNLOAD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 55 */ ACPI_OP("Revision", ARGP_REVISION_OP, ARGI_REVISION_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_CONSTANT, 0),
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 AML_TYPE_CONSTANT, 0),
 /* 56 */ ACPI_OP("Debug", ARGP_DEBUG_OP, ARGI_DEBUG_OP,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_CONSTANT, 0),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_CONSTANT, 0),
 /* 57 */ ACPI_OP("Fatal", ARGP_FATAL_OP, ARGI_FATAL_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_0T_0R,
-                         AML_FLAGS_EXEC_3A_0T_0R),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_0T_0R,
+                 AML_FLAGS_EXEC_3A_0T_0R),
 /* 58 */ ACPI_OP("OperationRegion", ARGP_REGION_OP, ARGI_REGION_OP,
-                         ACPI_TYPE_REGION, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_COMPLEX,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED | AML_DEFER),
+                 ACPI_TYPE_REGION, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_COMPLEX,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 59 */ ACPI_OP("Field", ARGP_FIELD_OP, ARGI_FIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_FIELD),
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5A */ ACPI_OP("Device", ARGP_DEVICE_OP, ARGI_DEVICE_OP,
-                         ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_NO_OBJ,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 5B */ ACPI_OP("Processor", ARGP_PROCESSOR_OP, ARGI_PROCESSOR_OP,
-                         ACPI_TYPE_PROCESSOR, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ACPI_TYPE_PROCESSOR, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_SIMPLE,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 5C */ ACPI_OP("PowerResource", ARGP_POWER_RES_OP, ARGI_POWER_RES_OP,
-                         ACPI_TYPE_POWER, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ACPI_TYPE_POWER, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_SIMPLE,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 5D */ ACPI_OP("ThermalZone", ARGP_THERMAL_ZONE_OP,
-                         ARGI_THERMAL_ZONE_OP, ACPI_TYPE_THERMAL,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ARGI_THERMAL_ZONE_OP, ACPI_TYPE_THERMAL,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_NO_OBJ,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 5E */ ACPI_OP("IndexField", ARGP_INDEX_FIELD_OP, ARGI_INDEX_FIELD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_FIELD),
+                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_FIELD),
+                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 
 /* Internal opcodes that map to invalid AML opcodes */
 
 /* 60 */ ACPI_OP("LNotEqual", ARGP_LNOTEQUAL_OP, ARGI_LNOTEQUAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                         AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                 AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
 /* 61 */ ACPI_OP("LLessEqual", ARGP_LLESSEQUAL_OP, ARGI_LLESSEQUAL_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                         AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                 AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
 /* 62 */ ACPI_OP("LGreaterEqual", ARGP_LGREATEREQUAL_OP,
-                         ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS,
-                         AML_HAS_ARGS | AML_CONSTANT),
+                 ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS,
+                 AML_HAS_ARGS | AML_CONSTANT),
 /* 63 */ ACPI_OP("-NamePath-", ARGP_NAMEPATH_OP, ARGI_NAMEPATH_OP,
-                         ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE),
+                 ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE),
 /* 64 */ ACPI_OP("-MethodCall-", ARGP_METHODCALL_OP, ARGI_METHODCALL_OP,
-                         ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL,
-                         AML_TYPE_METHOD_CALL,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE),
+                 ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL,
+                 AML_TYPE_METHOD_CALL,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE),
 /* 65 */ ACPI_OP("-ByteList-", ARGP_BYTELIST_OP, ARGI_BYTELIST_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, 0),
+                 ACPI_TYPE_ANY, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, 0),
 /* 66 */ ACPI_OP("-ReservedField-", ARGP_RESERVEDFIELD_OP,
-                         ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                 ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 67 */ ACPI_OP("-NamedField-", ARGP_NAMEDFIELD_OP, ARGI_NAMEDFIELD_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                         AML_TYPE_BOGUS,
-                         AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
+                 ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                 AML_TYPE_BOGUS,
+                 AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
 /* 68 */ ACPI_OP("-AccessField-", ARGP_ACCESSFIELD_OP,
-                         ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                 ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 69 */ ACPI_OP("-StaticString", ARGP_STATICSTRING_OP,
-                         ARGI_STATICSTRING_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                 ARGI_STATICSTRING_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 6A */ ACPI_OP("-Return Value-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                         AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN,
-                         AML_HAS_ARGS | AML_HAS_RETVAL),
+                 AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN,
+                 AML_HAS_ARGS | AML_HAS_RETVAL),
 /* 6B */ ACPI_OP("-UNKNOWN_OP-", ARG_NONE, ARG_NONE, ACPI_TYPE_INVALID,
-                         AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                 AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 6C */ ACPI_OP("-ASCII_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                         AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                 AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 6D */ ACPI_OP("-PREFIX_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                         AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                 AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS),
 
 /* ACPI 2.0 opcodes */
 
 /* 6E */ ACPI_OP("QwordConst", ARGP_QWORD_OP, ARGI_QWORD_OP,
-                         ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                         AML_TYPE_LITERAL, AML_CONSTANT),
+                 ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                 AML_TYPE_LITERAL, AML_CONSTANT),
         /* 6F */ ACPI_OP("Package", /* Var */ ARGP_VAR_PACKAGE_OP,
                          ARGI_VAR_PACKAGE_OP, ACPI_TYPE_PACKAGE,
                          AML_CLASS_CREATE, AML_TYPE_CREATE_OBJECT,
                          AML_HAS_ARGS | AML_DEFER),
 /* 70 */ ACPI_OP("ConcatenateResTemplate", ARGP_CONCAT_RES_OP,
-                         ARGI_CONCAT_RES_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 ARGI_CONCAT_RES_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 71 */ ACPI_OP("Mod", ARGP_MOD_OP, ARGI_MOD_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 72 */ ACPI_OP("CreateQWordField", ARGP_CREATE_QWORD_FIELD_OP,
-                         ARGI_CREATE_QWORD_FIELD_OP,
-                         ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                         AML_TYPE_CREATE_FIELD,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                         AML_DEFER | AML_CREATE),
+                 ARGI_CREATE_QWORD_FIELD_OP,
+                 ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                 AML_TYPE_CREATE_FIELD,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                 AML_DEFER | AML_CREATE),
 /* 73 */ ACPI_OP("ToBuffer", ARGP_TO_BUFFER_OP, ARGI_TO_BUFFER_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 74 */ ACPI_OP("ToDecimalString", ARGP_TO_DEC_STR_OP,
-                         ARGI_TO_DEC_STR_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ARGI_TO_DEC_STR_OP, ACPI_TYPE_ANY,
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 75 */ ACPI_OP("ToHexString", ARGP_TO_HEX_STR_OP, ARGI_TO_HEX_STR_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 76 */ ACPI_OP("ToInteger", ARGP_TO_INTEGER_OP, ARGI_TO_INTEGER_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R,
-                         AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_1T_1R,
+                 AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 77 */ ACPI_OP("ToString", ARGP_TO_STRING_OP, ARGI_TO_STRING_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_2A_1T_1R,
-                         AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_2A_1T_1R,
+                 AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 78 */ ACPI_OP("CopyObject", ARGP_COPY_OP, ARGI_COPY_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
 /* 79 */ ACPI_OP("Mid", ARGP_MID_OP, ARGI_MID_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_1T_1R,
-                         AML_FLAGS_EXEC_3A_1T_1R | AML_CONSTANT),
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_1T_1R,
+                 AML_FLAGS_EXEC_3A_1T_1R | AML_CONSTANT),
 /* 7A */ ACPI_OP("Continue", ARGP_CONTINUE_OP, ARGI_CONTINUE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                 ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 7B */ ACPI_OP("LoadTable", ARGP_LOAD_TABLE_OP, ARGI_LOAD_TABLE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                         AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
+                 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                 AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
 /* 7C */ ACPI_OP("DataTableRegion", ARGP_DATA_REGION_OP,
-                         ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
-                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE | AML_NAMED),
+                 ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
+                 AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                 AML_NSNODE | AML_NAMED),
 /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
-                         ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                         AML_TYPE_NAMED_NO_OBJ,
-                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                         AML_NSNODE),
+                 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                 AML_TYPE_NAMED_NO_OBJ,
+                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE),
 
 /* ACPI 3.0 opcodes */
 
 /* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY,
-                         AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
-                         AML_FLAGS_EXEC_0A_0T_1R)
+                 AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
+                 AML_FLAGS_EXEC_0A_0T_1R)
 
 /*! [End] no source code translation !*/
 };
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 8c6d3fdec38a..0dd2ce8a3475 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -567,7 +567,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
                                                      (*sub_object_list)->string.
                                                      length + 1);
                         } else {
-                                temp_size_needed += acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
+                                temp_size_needed +=
+                                    acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
                         }
                 } else {
                         /*
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index cc48ab05676c..50da494c3ee2 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -267,16 +267,19 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                  * If BIOS erroneously reversed the _PRT source_name and source_index,
                  * then reverse them back.
                  */
-                if (ACPI_GET_OBJECT_TYPE (sub_object_list[3]) != ACPI_TYPE_INTEGER) {
+                if (ACPI_GET_OBJECT_TYPE(sub_object_list[3]) !=
+                    ACPI_TYPE_INTEGER) {
                         if (acpi_gbl_enable_interpreter_slack) {
                                 source_name_index = 3;
                                 source_index_index = 2;
-                                printk(KERN_WARNING "ACPI: Handling Garbled _PRT entry\n");
+                                printk(KERN_WARNING
+                                       "ACPI: Handling Garbled _PRT entry\n");
                         } else {
                                 ACPI_ERROR((AE_INFO,
-                                        "(PRT[%X].source_index) Need Integer, found %s",
-                                        index,
-                                        acpi_ut_get_object_type_name(sub_object_list[3])));
+                                            "(PRT[%X].source_index) Need Integer, found %s",
+                                            index,
+                                            acpi_ut_get_object_type_name
+                                            (sub_object_list[3])));
                                 return_ACPI_STATUS(AE_BAD_DATA);
                         }
                 }
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index de20a5d6decf..46da116a4030 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -46,7 +46,6 @@
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsdump")
-
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 /* Local prototypes */
 static void acpi_rs_out_string(char *title, char *value);
@@ -489,10 +488,9 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         /*
                          * Optional resource_source for Address resources
                          */
-                        acpi_rs_dump_resource_source(ACPI_CAST_PTR
-                                                     (struct
-                                                      acpi_resource_source,
-                                                      target));
+                        acpi_rs_dump_resource_source(ACPI_CAST_PTR(struct
+                                                                   acpi_resource_source,
+                                                                   target));
                         break;
 
                 default:
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
index 7e3c335ab320..2c2adb6292c1 100644
--- a/drivers/acpi/resources/rsinfo.c
+++ b/drivers/acpi/resources/rsinfo.c
@@ -142,7 +142,7 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
 };
 #endif
 
-#endif  /* ACPI_FUTURE_USAGE */
+#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,
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index a92755c8877d..ca21e4660c79 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -153,10 +153,9 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                 /* Perform the conversion */
 
-                status = acpi_rs_convert_resource_to_aml(resource,
-                                                         ACPI_CAST_PTR(union
-                                                                       aml_resource,
-                                                                       aml),
+                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)) {
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 3b63b561b94e..c7081afa893a 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -46,7 +46,6 @@
 
 #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
@@ -429,8 +428,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                          * Optional resource_source (Index and String)
                          */
                         aml_length =
-                            acpi_rs_set_resource_source(aml,
-                                                        (acpi_rs_length)
+                            acpi_rs_set_resource_source(aml, (acpi_rs_length)
                                                         aml_length, source);
                         acpi_rs_set_resource_length(aml_length, aml);
                         break;
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 2442a8f8df57..11c0bd7b9cfd 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -353,10 +353,8 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                  *
                  * Zero the entire area of the buffer.
                  */
-                total_length =
-                    (u32)
-                    ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
-                    1;
+                total_length = (u32)
+                ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1;
                 total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
 
                 ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index 991f8901498c..f63813a358c5 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -217,7 +217,6 @@ acpi_get_current_resources(acpi_handle device_handle,
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_current_resources)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -261,7 +260,6 @@ acpi_get_possible_resources(acpi_handle device_handle,
 
 ACPI_EXPORT_SYMBOL(acpi_get_possible_resources)
 #endif                          /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_set_current_resources
@@ -496,7 +494,6 @@ ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)
  *              each resource in the list.
  *
  ******************************************************************************/
-
 acpi_status
 acpi_walk_resources(acpi_handle device_handle,
                     char *name,
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index d80dd84e5bfd..6b3b8a522476 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -302,7 +302,7 @@ static void acpi_device_shutdown(struct device *dev)
         return ;
 }
 
-static struct bus_type acpi_bus_type = {
+struct bus_type acpi_bus_type = {
         .name           = "acpi",
         .suspend        = acpi_device_suspend,
         .resume         = acpi_device_resume,
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index f8c63410bcbf..bc7e16ec8393 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -29,7 +29,6 @@ static u32 acpi_suspend_states[] = {
         [PM_SUSPEND_ON] = ACPI_STATE_S0,
         [PM_SUSPEND_STANDBY] = ACPI_STATE_S1,
         [PM_SUSPEND_MEM] = ACPI_STATE_S3,
-        [PM_SUSPEND_DISK] = ACPI_STATE_S4,
         [PM_SUSPEND_MAX] = ACPI_STATE_S5
 };
 
@@ -94,14 +93,6 @@ static int acpi_pm_enter(suspend_state_t pm_state)
                 do_suspend_lowlevel();
                 break;
 
-        case PM_SUSPEND_DISK:
-                if (acpi_pm_ops.pm_disk_mode == PM_DISK_PLATFORM)
-                        status = acpi_enter_sleep_state(acpi_state);
-                break;
-        case PM_SUSPEND_MAX:
-                acpi_power_off();
-                break;
-
         default:
                 return -EINVAL;
         }
@@ -157,12 +148,13 @@ int acpi_suspend(u32 acpi_state)
         suspend_state_t states[] = {
                 [1] = PM_SUSPEND_STANDBY,
                 [3] = PM_SUSPEND_MEM,
-                [4] = PM_SUSPEND_DISK,
                 [5] = PM_SUSPEND_MAX
         };
 
         if (acpi_state < 6 && states[acpi_state])
                 return pm_suspend(states[acpi_state]);
+        if (acpi_state == 4)
+                return hibernate();
         return -EINVAL;
 }
 
@@ -189,6 +181,49 @@ static struct pm_ops acpi_pm_ops = {
         .finish = acpi_pm_finish,
 };
 
+#ifdef CONFIG_SOFTWARE_SUSPEND
+static int acpi_hibernation_prepare(void)
+{
+        return acpi_sleep_prepare(ACPI_STATE_S4);
+}
+
+static int acpi_hibernation_enter(void)
+{
+        acpi_status status = AE_OK;
+        unsigned long flags = 0;
+
+        ACPI_FLUSH_CPU_CACHE();
+
+        local_irq_save(flags);
+        acpi_enable_wakeup_device(ACPI_STATE_S4);
+        /* This shouldn't return.  If it returns, we have a problem */
+        status = acpi_enter_sleep_state(ACPI_STATE_S4);
+        local_irq_restore(flags);
+
+        return ACPI_SUCCESS(status) ? 0 : -EFAULT;
+}
+
+static void acpi_hibernation_finish(void)
+{
+        acpi_leave_sleep_state(ACPI_STATE_S4);
+        acpi_disable_wakeup_device(ACPI_STATE_S4);
+
+        /* reset firmware waking vector */
+        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
+
+        if (init_8259A_after_S1) {
+                printk("Broken toshiba laptop -> kicking interrupts\n");
+                init_8259A(0);
+        }
+}
+
+static struct hibernation_ops acpi_hibernation_ops = {
+        .prepare = acpi_hibernation_prepare,
+        .enter = acpi_hibernation_enter,
+        .finish = acpi_hibernation_finish,
+};
+#endif                          /* CONFIG_SOFTWARE_SUSPEND */
+
 /*
  * Toshiba fails to preserve interrupts over S1, reinitialization
  * of 8259 is needed after S1 resume.
@@ -227,14 +262,17 @@ int __init acpi_sleep_init(void)
                         sleep_states[i] = 1;
                         printk(" S%d", i);
                 }
-                if (i == ACPI_STATE_S4) {
-                        if (sleep_states[i])
-                                acpi_pm_ops.pm_disk_mode = PM_DISK_PLATFORM;
-                }
         }
         printk(")\n");
 
         pm_set_ops(&acpi_pm_ops);
+
+#ifdef CONFIG_SOFTWARE_SUSPEND
+        if (sleep_states[ACPI_STATE_S4])
+                hibernation_set_ops(&acpi_hibernation_ops);
+#else
+        sleep_states[ACPI_STATE_S4] = 0;
+#endif
+
         return 0;
 }
-
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index dcde9ddd105a..61f1822cc350 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -60,7 +60,7 @@ acpi_system_write_sleep(struct file *file,
         state = simple_strtoul(str, NULL, 0);
 #ifdef CONFIG_SOFTWARE_SUSPEND
         if (state == 4) {
-                error = pm_suspend(PM_SUSPEND_DISK);
+                error = hibernate();
                 goto Done;
         }
 #endif
@@ -70,6 +70,14 @@ acpi_system_write_sleep(struct file *file,
 }
 #endif                          /* CONFIG_ACPI_SLEEP_PROC_SLEEP */
 
+#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
+/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
+#else
+#define HAVE_ACPI_LEGACY_ALARM
+#endif
+
+#ifdef  HAVE_ACPI_LEGACY_ALARM
+
 static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
 {
         u32 sec, min, hr;
@@ -341,6 +349,7 @@ acpi_system_write_alarm(struct file *file,
       end:
         return_VALUE(result ? result : count);
 }
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
@@ -370,8 +379,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                            dev->wakeup.state.enabled ? "enabled" : "disabled");
                 if (ldev)
                         seq_printf(seq, "%s:%s",
-                                ldev->bus ? ldev->bus->name : "no-bus",
-                                ldev->bus_id);
+                                   ldev->bus ? ldev->bus->name : "no-bus",
+                                   ldev->bus_id);
                 seq_printf(seq, "\n");
                 put_device(ldev);
 
@@ -464,6 +473,7 @@ static const struct file_operations acpi_system_sleep_fops = {
 };
 #endif                          /* CONFIG_ACPI_SLEEP_PROC_SLEEP */
 
+#ifdef  HAVE_ACPI_LEGACY_ALARM
 static const struct file_operations acpi_system_alarm_fops = {
         .open = acpi_system_alarm_open_fs,
         .read = seq_read,
@@ -479,8 +489,9 @@ static u32 rtc_handler(void *context)
 
         return ACPI_INTERRUPT_HANDLED;
 }
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
-static int acpi_sleep_proc_init(void)
+static int __init acpi_sleep_proc_init(void)
 {
         struct proc_dir_entry *entry = NULL;
 
@@ -496,6 +507,7 @@ static int acpi_sleep_proc_init(void)
                 entry->proc_fops = &acpi_system_sleep_fops;
 #endif
 
+#ifdef  HAVE_ACPI_LEGACY_ALARM
         /* 'alarm' [R/W] */
         entry =
             create_proc_entry("alarm", S_IFREG | S_IRUGO | S_IWUSR,
@@ -503,6 +515,9 @@ static int acpi_sleep_proc_init(void)
         if (entry)
                 entry->proc_fops = &acpi_system_alarm_fops;
 
+        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
+
         /* 'wakeup device' [R/W] */
         entry =
             create_proc_entry("wakeup", S_IFREG | S_IRUGO | S_IWUSR,
@@ -510,7 +525,6 @@ static int acpi_sleep_proc_init(void)
         if (entry)
                 entry->proc_fops = &acpi_system_wakeup_device_fops;
 
-        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
         return 0;
 }
 
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index 1db833eb2417..1285e91474fb 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -334,7 +334,8 @@ static void acpi_tb_convert_fadt(void)
                                      (acpi_gbl_FADT.xpm1a_event_block.address +
                                       pm1_register_length));
         /* Don't forget to copy space_id of the GAS */
-        acpi_gbl_xpm1a_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+        acpi_gbl_xpm1a_enable.space_id =
+            acpi_gbl_FADT.xpm1a_event_block.space_id;
 
         /* The PM1B register block is optional, ignore if not present */
 
@@ -344,7 +345,8 @@ static void acpi_tb_convert_fadt(void)
                                              (acpi_gbl_FADT.xpm1b_event_block.
                                               address + pm1_register_length));
                 /* Don't forget to copy space_id of the GAS */
-                acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+                acpi_gbl_xpm1b_enable.space_id =
+                    acpi_gbl_FADT.xpm1a_event_block.space_id;
 
         }
 
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 417ef5fa7666..5b302c4e293f 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -201,6 +201,7 @@ acpi_status acpi_reallocate_root_table(void)
 
         return_ACPI_STATUS(AE_OK);
 }
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_load_table
@@ -262,7 +263,7 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
 acpi_status
 acpi_get_table_header(char *signature,
                       acpi_native_uint instance,
-                      struct acpi_table_header *out_table_header)
+                      struct acpi_table_header * out_table_header)
 {
         acpi_native_uint i;
         acpi_native_uint j;
@@ -321,7 +322,6 @@ acpi_get_table_header(char *signature,
 
 ACPI_EXPORT_SYMBOL(acpi_get_table_header)
 
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_unload_table_id
@@ -346,11 +346,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id)
                         continue;
                 }
                 /*
-                * Delete all namespace objects owned by this table. Note that these
-                * objects can appear anywhere in the namespace by virtue of the AML
-                * "Scope" operator. Thus, we need to track ownership by an ID, not
-                * simply a position within the hierarchy
-                */
+                 * Delete all namespace objects owned by this table. Note that these
+                 * objects can appear anywhere in the namespace by virtue of the AML
+                 * "Scope" operator. Thus, we need to track ownership by an ID, not
+                 * simply a position within the hierarchy
+                 */
                 acpi_tb_delete_namespace_by_owner(i);
                 status = acpi_tb_release_owner_id(i);
                 acpi_tb_set_table_loaded_flag(i, FALSE);
@@ -376,7 +376,7 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
  *****************************************************************************/
 acpi_status
 acpi_get_table(char *signature,
-               acpi_native_uint instance, struct acpi_table_header ** out_table)
+               acpi_native_uint instance, struct acpi_table_header **out_table)
 {
         acpi_native_uint i;
         acpi_native_uint j;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 589b98b7b216..1ada017d01ef 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -59,8 +59,6 @@
 #define ACPI_THERMAL_NOTIFY_CRITICAL    0xF0
 #define ACPI_THERMAL_NOTIFY_HOT         0xF1
 #define ACPI_THERMAL_MODE_ACTIVE        0x00
-#define ACPI_THERMAL_MODE_PASSIVE       0x01
-#define ACPI_THERMAL_MODE_CRITICAL      0xff
 #define ACPI_THERMAL_PATH_POWEROFF      "/sbin/poweroff"
 
 #define ACPI_THERMAL_MAX_ACTIVE 10
@@ -86,9 +84,6 @@ static int acpi_thermal_resume(struct acpi_device *device);
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);
-static ssize_t acpi_thermal_write_trip_points(struct file *,
-                                              const char __user *, size_t,
-                                              loff_t *);
 static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file);
 static ssize_t acpi_thermal_write_cooling_mode(struct file *,
                                                const char __user *, size_t,
@@ -167,7 +162,6 @@ struct acpi_thermal {
         unsigned long temperature;
         unsigned long last_temperature;
         unsigned long polling_frequency;
-        u8 cooling_mode;
         volatile u8 zombie;
         struct acpi_thermal_flags flags;
         struct acpi_thermal_state state;
@@ -193,7 +187,6 @@ static const struct file_operations acpi_thermal_temp_fops = {
 static const struct file_operations acpi_thermal_trip_fops = {
         .open = acpi_thermal_trip_open_fs,
         .read = seq_read,
-        .write = acpi_thermal_write_trip_points,
         .llseek = seq_lseek,
         .release = single_release,
 };
@@ -297,11 +290,6 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
-        tz->cooling_mode = mode;
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cooling mode [%s]\n",
-                          mode ? "passive" : "active"));
-
         return 0;
 }
 
@@ -889,67 +877,6 @@ static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)
         return single_open(file, acpi_thermal_trip_seq_show, PDE(inode)->data);
 }
 
-static ssize_t
-acpi_thermal_write_trip_points(struct file *file,
-                               const char __user * buffer,
-                               size_t count, loff_t * ppos)
-{
-        struct seq_file *m = file->private_data;
-        struct acpi_thermal *tz = m->private;
-
-        char *limit_string;
-        int num, critical, hot, passive;
-        int *active;
-        int i = 0;
-
-
-        limit_string = kzalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
-        if (!limit_string)
-                return -ENOMEM;
-
-        active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
-        if (!active) {
-                kfree(limit_string);
-                return -ENOMEM;
-        }
-
-        if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {
-                count = -EINVAL;
-                goto end;
-        }
-
-        if (copy_from_user(limit_string, buffer, count)) {
-                count = -EFAULT;
-                goto end;
-        }
-
-        limit_string[count] = '\0';
-
-        num = sscanf(limit_string, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
-                     &critical, &hot, &passive,
-                     &active[0], &active[1], &active[2], &active[3], &active[4],
-                     &active[5], &active[6], &active[7], &active[8],
-                     &active[9]);
-        if (!(num >= 5 && num < (ACPI_THERMAL_MAX_ACTIVE + 3))) {
-                count = -EINVAL;
-                goto end;
-        }
-
-        tz->trips.critical.temperature = CELSIUS_TO_KELVIN(critical);
-        tz->trips.hot.temperature = CELSIUS_TO_KELVIN(hot);
-        tz->trips.passive.temperature = CELSIUS_TO_KELVIN(passive);
-        for (i = 0; i < num - 3; i++) {
-                if (!(tz->trips.active[i].flags.valid))
-                        break;
-                tz->trips.active[i].temperature = CELSIUS_TO_KELVIN(active[i]);
-        }
-
-      end:
-        kfree(active);
-        kfree(limit_string);
-        return count;
-}
-
 static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
 {
         struct acpi_thermal *tz = seq->private;
@@ -958,15 +885,10 @@ static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
         if (!tz)
                 goto end;
 
-        if (!tz->flags.cooling_mode) {
+        if (!tz->flags.cooling_mode)
                 seq_puts(seq, "<setting not supported>\n");
-        }
-
-        if (tz->cooling_mode == ACPI_THERMAL_MODE_CRITICAL)
-                seq_printf(seq, "cooling mode:  critical\n");
         else
-                seq_printf(seq, "cooling mode:  %s\n",
-                           tz->cooling_mode ? "passive" : "active");
+                seq_puts(seq, "0 - Active; 1 - Passive\n");
 
       end:
         return 0;
@@ -1223,28 +1145,6 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
         result = acpi_thermal_set_cooling_mode(tz, ACPI_THERMAL_MODE_ACTIVE);
         if (!result)
                 tz->flags.cooling_mode = 1;
-        else {
-                /* Oh,we have not _SCP method.
-                   Generally show cooling_mode by _ACx, _PSV,spec 12.2 */
-                tz->flags.cooling_mode = 0;
-                if (tz->trips.active[0].flags.valid
-                    && tz->trips.passive.flags.valid) {
-                        if (tz->trips.passive.temperature >
-                            tz->trips.active[0].temperature)
-                                tz->cooling_mode = ACPI_THERMAL_MODE_ACTIVE;
-                        else
-                                tz->cooling_mode = ACPI_THERMAL_MODE_PASSIVE;
-                } else if (!tz->trips.active[0].flags.valid
-                           && tz->trips.passive.flags.valid) {
-                        tz->cooling_mode = ACPI_THERMAL_MODE_PASSIVE;
-                } else if (tz->trips.active[0].flags.valid
-                           && !tz->trips.passive.flags.valid) {
-                        tz->cooling_mode = ACPI_THERMAL_MODE_ACTIVE;
-                } else {
-                        /* _ACx and _PSV are optional, but _CRT is required */
-                        tz->cooling_mode = ACPI_THERMAL_MODE_CRITICAL;
-                }
-        }
 
         /* Get default polling frequency [_TZP] (optional) */
         if (tzp)
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 55a764807499..6e56d5f7c43a 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -107,7 +107,6 @@ acpi_status acpi_ut_create_caches(void)
         if (ACPI_FAILURE(status)) {
                 return (status);
         }
-
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
         /* Memory allocation lists */
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 870f6edeb5f2..285a0f531760 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -45,7 +45,6 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utcache")
-
 #ifdef ACPI_USE_LOCAL_CACHE
 /*******************************************************************************
  *
@@ -64,7 +63,7 @@ ACPI_MODULE_NAME("utcache")
 acpi_status
 acpi_os_create_cache(char *cache_name,
                      u16 object_size,
-                     u16 max_depth, struct acpi_memory_list **return_cache)
+                     u16 max_depth, struct acpi_memory_list ** return_cache)
 {
         struct acpi_memory_list *cache;
 
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 84d529db0a66..4c1e00874dff 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -814,7 +814,9 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
                 /*
                  * Create the object array
                  */
-                target_object->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.count + 1) * sizeof(void *));
+                target_object->package.elements =
+                    ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.
+                                          count + 1) * sizeof(void *));
                 if (!target_object->package.elements) {
                         status = AE_NO_MEMORY;
                         goto error_exit;
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index 61ad4f2daee2..c7e128e5369b 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -45,7 +45,6 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
-
 #ifdef ACPI_DEBUG_OUTPUT
 static acpi_thread_id acpi_gbl_prev_thread_id;
 static char *acpi_gbl_fn_entry_str = "----Entry";
@@ -181,7 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_level,
                 if (ACPI_LV_THREADS & acpi_dbg_level) {
                         acpi_os_printf
                             ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",
-                             (unsigned long)acpi_gbl_prev_thread_id, (unsigned long)thread_id);
+                             (unsigned long)acpi_gbl_prev_thread_id,
+                             (unsigned long)thread_id);
                 }
 
                 acpi_gbl_prev_thread_id = thread_id;
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 673a0caa4073..f777cebdc46d 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -170,6 +170,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                         acpi_os_delete_mutex(object->mutex.os_mutex);
                         acpi_gbl_global_lock_mutex = NULL;
                 } else {
+                        acpi_ex_unlink_mutex(object);
                         acpi_os_delete_mutex(object->mutex.os_mutex);
                 }
                 break;
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index af33358a964b..1621655d6e2b 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -55,12 +55,10 @@ ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
  * Static global variable initialization.
  *
  ******************************************************************************/
-
 /*
  * We want the debug switches statically initialized so they
  * are already set when the debugger is entered.
  */
-
 /* Debug switch - level and trace mask */
 u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
 
@@ -735,5 +733,5 @@ void acpi_ut_init_globals(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
-ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
-ACPI_EXPORT_SYMBOL(acpi_gpe_count)
+    ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+    ACPI_EXPORT_SYMBOL(acpi_gpe_count)
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 50133fffe420..2d19f71e9cfa 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -802,9 +802,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
 
                 valid_digits++;
 
-                if (sign_of0x
-                    && ((valid_digits > 16)
-                        || ((valid_digits > 8) && mode32))) {
+                if (sign_of0x && ((valid_digits > 16)
+                                  || ((valid_digits > 8) && mode32))) {
                         /*
                          * This is to_integer operation case.
                          * No any restrictions for string-to-integer conversion,
@@ -1049,6 +1048,7 @@ acpi_ut_exception(char *module_name,
         acpi_os_vprintf(format, args);
         acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
 }
+
 EXPORT_SYMBOL(acpi_ut_exception);
 
 void ACPI_INTERNAL_VAR_XFACE
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index cbad2ef5987d..4820bc86d1f5 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -244,7 +244,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 
         ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                           "Thread %lX attempting to acquire Mutex [%s]\n",
-                          (unsigned long) this_thread_id,
+                          (unsigned long)this_thread_id,
                           acpi_ut_get_mutex_name(mutex_id)));
 
         status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,
@@ -252,7 +252,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
         if (ACPI_SUCCESS(status)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                                   "Thread %lX acquired Mutex [%s]\n",
-                                  (unsigned long) this_thread_id,
+                                  (unsigned long)this_thread_id,
                                   acpi_ut_get_mutex_name(mutex_id)));
 
                 acpi_gbl_mutex_info[mutex_id].use_count++;
@@ -260,7 +260,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
         } else {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "Thread %lX could not acquire Mutex [%X]",
-                                (unsigned long) this_thread_id, mutex_id));
+                                (unsigned long)this_thread_id, mutex_id));
         }
 
         return (status);
@@ -287,7 +287,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
         this_thread_id = acpi_os_get_thread_id();
         ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                           "Thread %lX releasing Mutex [%s]\n",
-                          (unsigned long) this_thread_id,
+                          (unsigned long)this_thread_id,
                           acpi_ut_get_mutex_name(mutex_id)));
 
         if (mutex_id > ACPI_MAX_MUTEX) {
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
index e8fe1ba6cc24..cbbd3315a1e2 100644
--- a/drivers/acpi/utilities/utresrc.c
+++ b/drivers/acpi/utilities/utresrc.c
@@ -46,7 +46,6 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
-
 #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
 /*
  * Strings used to decode resource descriptors.
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index de3276f4f468..e9a57806cd34 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -337,7 +337,6 @@ acpi_status acpi_terminate(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_terminate)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -470,7 +469,6 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
 
 ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
-
 /*****************************************************************************
  *
  * FUNCTION:    acpi_purge_cached_objects
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 45dbdc14915f..b4a8d6030e48 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -2,10 +2,9 @@
 # SATA/PATA driver configuration
 #
 
-menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
-
-config ATA
-        tristate "ATA device support"
+menuconfig ATA
+        tristate "Serial ATA (prod) and Parallel ATA (experimental) drivers"
+        depends on HAS_IOMEM
         depends on BLOCK
         depends on !(M32R || M68K) || BROKEN
         depends on !SUN4 || BROKEN
@@ -23,6 +22,19 @@ config ATA_NONSTANDARD
        bool
        default n
 
+config ATA_ACPI
+        bool
+        depends on ACPI && PCI
+        default y
+        help
+          This option adds support for ATA-related ACPI objects.
+          These ACPI objects add the ability to retrieve taskfiles
+          from the ACPI BIOS and write them to the disk controller.
+          These objects may be related to performance, security,
+          power management, or other areas.
+          You can disable this at kernel boot time by using the
+          option libata.noacpi=1
+
 config SATA_AHCI
         tristate "AHCI SATA support"
         depends on PCI
@@ -120,7 +132,7 @@ config SATA_SIS
         depends on PCI
         select PATA_SIS
         help
-          This option enables support for SiS Serial ATA on 
+          This option enables support for SiS Serial ATA on
           SiS 964/965/966/180 and Parallel ATA on SiS 180.
           The PATA support for SiS 180 requires additionally to
           enable the PATA_SIS driver in the config.
@@ -156,19 +168,6 @@ config SATA_INIC162X
         help
           This option enables support for Initio 162x Serial ATA.
 
-config SATA_ACPI
-        bool
-        depends on ACPI && PCI
-        default y
-        help
-          This option adds support for SATA-related ACPI objects.
-          These ACPI objects add the ability to retrieve taskfiles
-          from the ACPI BIOS and write them to the disk controller.
-          These objects may be related to performance, security,
-          power management, or other areas.
-          You can disable this at kernel boot time by using the
-          option libata.noacpi=1
-
 config PATA_ALI
         tristate "ALi PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
@@ -435,7 +434,7 @@ config PATA_OPTIDMA
         help
           This option enables DMA/PIO support for the later OPTi
           controllers found on some old motherboards and in some
-          latops
+          laptops.
 
           If unsure, say N.
 
@@ -584,6 +583,4 @@ config PATA_SCC
 
           If unsure, say N.
 
-endif
-endmenu
-
+endif # ATA
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 6f42a0e2812d..8149c68ac2c7 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -69,4 +69,4 @@ obj-$(CONFIG_ATA_GENERIC)	+= ata_generic.o
 obj-$(CONFIG_PATA_LEGACY)       += pata_legacy.o
 
 libata-objs     := libata-core.o libata-scsi.o libata-sff.o libata-eh.o
-libata-$(CONFIG_SATA_ACPI) += libata-acpi.o
+libata-$(CONFIG_ATA_ACPI)       += libata-acpi.o
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 34c5534ed64c..7baeaffefe7a 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "ahci"
-#define DRV_VERSION     "2.1"
+#define DRV_VERSION     "2.2"
 
 
 enum {
@@ -170,10 +170,12 @@ enum {
         AHCI_FLAG_IGN_IRQ_IF_ERR        = (1 << 25), /* ignore IRQ_IF_ERR */
         AHCI_FLAG_HONOR_PI              = (1 << 26), /* honor PORTS_IMPL */
         AHCI_FLAG_IGN_SERR_INTERNAL     = (1 << 27), /* ignore SERR_INTERNAL */
+        AHCI_FLAG_32BIT_ONLY            = (1 << 28), /* force 32bit */
 
         AHCI_FLAG_COMMON                = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                           ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                                          ATA_FLAG_SKIP_D2H_BSY,
+                                          ATA_FLAG_SKIP_D2H_BSY |
+                                          ATA_FLAG_ACPI_SATA,
 };
 
 struct ahci_cmd_hdr {
@@ -250,10 +252,6 @@ static struct scsi_host_template ahci_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static const struct ata_port_operations ahci_ops = {
@@ -357,7 +355,8 @@ static const struct ata_port_info ahci_port_info[] = {
         /* board_ahci_sb600 */
         {
                 .flags          = AHCI_FLAG_COMMON |
-                                  AHCI_FLAG_IGN_SERR_INTERNAL,
+                                  AHCI_FLAG_IGN_SERR_INTERNAL |
+                                  AHCI_FLAG_32BIT_ONLY,
                 .pio_mask       = 0x1f, /* pio0-4 */
                 .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                 .port_ops       = &ahci_ops,
@@ -400,6 +399,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 
         /* ATI */
         { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
+        { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 */
 
         /* VIA */
         { PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */
@@ -494,6 +494,13 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
         hpriv->saved_cap = cap = readl(mmio + HOST_CAP);
         hpriv->saved_port_map = port_map = readl(mmio + HOST_PORTS_IMPL);
 
+        /* some chips lie about 64bit support */
+        if ((cap & HOST_CAP_64) && (pi->flags & AHCI_FLAG_32BIT_ONLY)) {
+                dev_printk(KERN_INFO, &pdev->dev,
+                           "controller can't do 64bit DMA, forcing 32bit\n");
+                cap &= ~HOST_CAP_64;
+        }
+
         /* fixup zero port_map */
         if (!port_map) {
                 port_map = (1 << ahci_nr_ports(hpriv->cap)) - 1;
@@ -874,7 +881,8 @@ static int ahci_clo(struct ata_port *ap)
         return 0;
 }
 
-static int ahci_softreset(struct ata_port *ap, unsigned int *class)
+static int ahci_softreset(struct ata_port *ap, unsigned int *class,
+                          unsigned long deadline)
 {
         struct ahci_port_priv *pp = ap->private_data;
         void __iomem *port_mmio = ahci_port_base(ap);
@@ -959,15 +967,13 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class)
          */
         msleep(150);
 
-        *class = ATA_DEV_NONE;
-        if (ata_port_online(ap)) {
-                if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
-                        rc = -EIO;
-                        reason = "device not ready";
-                        goto fail;
-                }
-                *class = ahci_dev_classify(ap);
+        rc = ata_wait_ready(ap, deadline);
+        /* link occupied, -ENODEV too is an error */
+        if (rc) {
+                reason = "device not ready";
+                goto fail;
         }
+        *class = ahci_dev_classify(ap);
 
         DPRINTK("EXIT, class=%u\n", *class);
         return 0;
@@ -979,7 +985,8 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class)
         return rc;
 }
 
-static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
+static int ahci_hardreset(struct ata_port *ap, unsigned int *class,
+                          unsigned long deadline)
 {
         struct ahci_port_priv *pp = ap->private_data;
         u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
@@ -995,7 +1002,7 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
         tf.command = 0x80;
         ata_tf_to_fis(&tf, d2h_fis, 0);
 
-        rc = sata_std_hardreset(ap, class);
+        rc = sata_std_hardreset(ap, class, deadline);
 
         ahci_start_engine(ap);
 
@@ -1008,7 +1015,8 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
         return rc;
 }
 
-static int ahci_vt8251_hardreset(struct ata_port *ap, unsigned int *class)
+static int ahci_vt8251_hardreset(struct ata_port *ap, unsigned int *class,
+                                 unsigned long deadline)
 {
         int rc;
 
@@ -1016,7 +1024,8 @@ static int ahci_vt8251_hardreset(struct ata_port *ap, unsigned int *class)
 
         ahci_stop_engine(ap);
 
-        rc = sata_port_hardreset(ap, sata_ehc_deb_timing(&ap->eh_context));
+        rc = sata_port_hardreset(ap, sata_ehc_deb_timing(&ap->eh_context),
+                                 deadline);
 
         /* vt8251 needs SError cleared for the port to operate */
         ahci_scr_write(ap, SCR_ERROR, ahci_scr_read(ap, SCR_ERROR));
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 92a491ddd030..7565f022bd69 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "ata_generic"
-#define DRV_VERSION "0.2.11"
+#define DRV_VERSION "0.2.12"
 
 /*
  *      A generic parallel ATA driver using libata
@@ -54,7 +54,7 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused)
 
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
                 struct ata_device *dev = &ap->device[i];
-                if (ata_dev_ready(dev)) {
+                if (ata_dev_enabled(dev)) {
                         /* We don't really care */
                         dev->pio_mode = XFER_PIO_0;
                         dev->dma_mode = XFER_MW_DMA_0;
@@ -90,10 +90,6 @@ static struct scsi_host_template generic_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations generic_port_ops = {
@@ -145,7 +141,7 @@ static int all_generic_ide;		/* Set to claim all devices */
 static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         u16 command;
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &generic_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -153,7 +149,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
                 .udma_mask = 0x3f,
                 .port_ops = &generic_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         /* Don't use the generic entry unless instructed to do so */
         if (id->driver_data == 1 && all_generic_ide == 0)
@@ -179,7 +175,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
         if (dev->vendor == PCI_VENDOR_ID_AL)
                 ata_pci_clear_simplex(dev);
 
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static struct pci_device_id ata_generic[] = {
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 55d306a3e538..0458811010fd 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -155,7 +155,6 @@ struct piix_host_priv {
 static int piix_init_one (struct pci_dev *pdev,
                                     const struct pci_device_id *ent);
 static void piix_pata_error_handler(struct ata_port *ap);
-static void piix_sata_error_handler(struct ata_port *ap);
 static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);
 static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
 static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
@@ -275,10 +274,6 @@ static struct scsi_host_template piix_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations piix_pata_ops = {
@@ -368,7 +363,7 @@ static const struct ata_port_operations piix_sata_ops = {
 
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
-        .error_handler          = piix_sata_error_handler,
+        .error_handler          = ata_bmdma_error_handler,
         .post_internal_cmd      = ata_bmdma_post_internal_cmd,
 
         .irq_handler            = ata_interrupt,
@@ -625,17 +620,18 @@ static int ich_pata_cable_detect(struct ata_port *ap)
 /**
  *      piix_pata_prereset - prereset for PATA host controller
  *      @ap: Target port
+ *      @deadline: deadline jiffies for the operation
  *
  *      LOCKING:
  *      None (inherited from caller).
  */
-static int piix_pata_prereset(struct ata_port *ap)
+static int piix_pata_prereset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
         if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 static void piix_pata_error_handler(struct ata_port *ap)
@@ -644,13 +640,6 @@ static void piix_pata_error_handler(struct ata_port *ap)
                            ata_std_postreset);
 }
 
-
-static void piix_sata_error_handler(struct ata_port *ap)
-{
-        ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL,
-                           ata_std_postreset);
-}
-
 /**
  *      piix_set_piomode - Initialize host controller PATA PIO timings
  *      @ap: Port whose timings we are configuring
@@ -1034,7 +1023,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int printed_version;
         struct device *dev = &pdev->dev;
         struct ata_port_info port_info[2];
-        struct ata_port_info *ppinfo[2] = { &port_info[0], &port_info[1] };
+        const struct ata_port_info *ppi[] = { &port_info[0], &port_info[1] };
         struct piix_host_priv *hpriv;
         unsigned long port_flags;
 
@@ -1093,7 +1082,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 port_info[1].mwdma_mask = 0;
                 port_info[1].udma_mask = 0;
         }
-        return ata_pci_init_one(pdev, ppinfo, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static int __init piix_init(void)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 03a0acff6cfa..02236739b40f 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -270,8 +270,7 @@ out:
 
 /**
  * do_drive_get_GTF - get the drive bootup default taskfile settings
- * @ap: the ata_port for the drive
- * @ix: target ata_device (drive) index
+ * @dev: target ATA device
  * @gtf_length: number of bytes of _GTF data returned at @gtf_address
  * @gtf_address: buffer containing _GTF taskfile arrays
  *
@@ -286,20 +285,19 @@ out:
  * The returned @gtf_length and @gtf_address are only valid if the
  * function return value is 0.
  */
-static int do_drive_get_GTF(struct ata_port *ap, int ix,
-                        unsigned int *gtf_length, unsigned long *gtf_address,
-                        unsigned long *obj_loc)
+static int do_drive_get_GTF(struct ata_device *dev, unsigned int *gtf_length,
+                            unsigned long *gtf_address, unsigned long *obj_loc)
 {
-        acpi_status                     status;
-        acpi_handle                     dev_handle = NULL;
-        acpi_handle                     chan_handle, drive_handle;
-        acpi_integer                    pcidevfn = 0;
-        u32                             dev_adr;
-        struct acpi_buffer              output;
-        union acpi_object               *out_obj;
-        struct device                   *dev = ap->host->dev;
-        struct ata_device               *atadev = &ap->device[ix];
-        int                             err = -ENODEV;
+        struct ata_port *ap = dev->ap;
+        acpi_status status;
+        acpi_handle dev_handle = NULL;
+        acpi_handle chan_handle, drive_handle;
+        acpi_integer pcidevfn = 0;
+        u32 dev_adr;
+        struct acpi_buffer output;
+        union acpi_object *out_obj;
+        struct device *gdev = ap->host->dev;
+        int err = -ENODEV;
 
         *gtf_length = 0;
         *gtf_address = 0UL;
@@ -309,34 +307,34 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
                 return 0;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
+                ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
                                __FUNCTION__, ap->port_no);
 
-        if (!ata_dev_enabled(atadev) || (ap->flags & ATA_FLAG_DISABLED)) {
+        if (!ata_dev_enabled(dev) || (ap->flags & ATA_FLAG_DISABLED)) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG, "%s: ERR: "
+                        ata_dev_printk(dev, KERN_DEBUG, "%s: ERR: "
                                 "ata_dev_present: %d, PORT_DISABLED: %lu\n",
-                                __FUNCTION__, ata_dev_enabled(atadev),
+                                __FUNCTION__, ata_dev_enabled(dev),
                                 ap->flags & ATA_FLAG_DISABLED);
                 goto out;
         }
 
         /* Don't continue if device has no _ADR method.
          * _GTF is intended for known motherboard devices. */
-        if (!(ap->cbl == ATA_CBL_SATA)) {
-                err = pata_get_dev_handle(dev, &dev_handle, &pcidevfn);
+        if (!(ap->flags & ATA_FLAG_ACPI_SATA)) {
+                err = pata_get_dev_handle(gdev, &dev_handle, &pcidevfn);
                 if (err < 0) {
                         if (ata_msg_probe(ap))
-                                ata_dev_printk(atadev, KERN_DEBUG,
+                                ata_dev_printk(dev, KERN_DEBUG,
                                         "%s: pata_get_dev_handle failed (%d)\n",
                                         __FUNCTION__, err);
                         goto out;
                 }
         } else {
-                err = sata_get_dev_handle(dev, &dev_handle, &pcidevfn);
+                err = sata_get_dev_handle(gdev, &dev_handle, &pcidevfn);
                 if (err < 0) {
                         if (ata_msg_probe(ap))
-                                ata_dev_printk(atadev, KERN_DEBUG,
+                                ata_dev_printk(dev, KERN_DEBUG,
                                         "%s: sata_get_dev_handle failed (%d\n",
                                         __FUNCTION__, err);
                         goto out;
@@ -344,15 +342,15 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
         }
 
         /* Get this drive's _ADR info. if not already known. */
-        if (!atadev->obj_handle) {
-                if (!(ap->cbl == ATA_CBL_SATA)) {
+        if (!dev->obj_handle) {
+                if (!(ap->flags & ATA_FLAG_ACPI_SATA)) {
                         /* get child objects of dev_handle == channel objects,
                          * + _their_ children == drive objects */
                         /* channel is ap->port_no */
                         chan_handle = acpi_get_child(dev_handle,
                                                 ap->port_no);
                         if (ata_msg_probe(ap))
-                                ata_dev_printk(atadev, KERN_DEBUG,
+                                ata_dev_printk(dev, KERN_DEBUG,
                                         "%s: chan adr=%d: chan_handle=0x%p\n",
                                         __FUNCTION__, ap->port_no,
                                         chan_handle);
@@ -361,26 +359,26 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
                                 goto out;
                         }
                         /* TBD: could also check ACPI object VALID bits */
-                        drive_handle = acpi_get_child(chan_handle, ix);
+                        drive_handle = acpi_get_child(chan_handle, dev->devno);
                         if (!drive_handle) {
                                 err = -ENODEV;
                                 goto out;
                         }
-                        dev_adr = ix;
-                        atadev->obj_handle = drive_handle;
+                        dev_adr = dev->devno;
+                        dev->obj_handle = drive_handle;
                 } else {        /* for SATA mode */
                         dev_adr = SATA_ADR_RSVD;
-                        err = get_sata_adr(dev, dev_handle, pcidevfn, 0,
-                                        ap, atadev, &dev_adr);
+                        err = get_sata_adr(gdev, dev_handle, pcidevfn, 0,
+                                        ap, dev, &dev_adr);
                 }
                 if (err < 0 || dev_adr == SATA_ADR_RSVD ||
-                    !atadev->obj_handle) {
+                    !dev->obj_handle) {
                         if (ata_msg_probe(ap))
-                                ata_dev_printk(atadev, KERN_DEBUG,
+                                ata_dev_printk(dev, KERN_DEBUG,
                                         "%s: get_sata/pata_adr failed: "
                                         "err=%d, dev_adr=%u, obj_handle=0x%p\n",
                                         __FUNCTION__, err, dev_adr,
-                                        atadev->obj_handle);
+                                        dev->obj_handle);
                         goto out;
                 }
         }
@@ -391,11 +389,11 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
 
         /* _GTF has no input parameters */
         err = -EIO;
-        status = acpi_evaluate_object(atadev->obj_handle, "_GTF",
+        status = acpi_evaluate_object(dev->obj_handle, "_GTF",
                                         NULL, &output);
         if (ACPI_FAILURE(status)) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG,
+                        ata_dev_printk(dev, KERN_DEBUG,
                                 "%s: Run _GTF error: status = 0x%x\n",
                                 __FUNCTION__, status);
                 goto out;
@@ -403,7 +401,7 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
 
         if (!output.length || !output.pointer) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG, "%s: Run _GTF: "
+                        ata_dev_printk(dev, KERN_DEBUG, "%s: Run _GTF: "
                                 "length or ptr is NULL (0x%llx, 0x%p)\n",
                                 __FUNCTION__,
                                 (unsigned long long)output.length,
@@ -416,7 +414,7 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
         if (out_obj->type != ACPI_TYPE_BUFFER) {
                 kfree(output.pointer);
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG, "%s: Run _GTF: "
+                        ata_dev_printk(dev, KERN_DEBUG, "%s: Run _GTF: "
                                 "error: expected object type of "
                                 " ACPI_TYPE_BUFFER, got 0x%x\n",
                                 __FUNCTION__, out_obj->type);
@@ -427,7 +425,7 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
         if (!out_obj->buffer.length || !out_obj->buffer.pointer ||
             out_obj->buffer.length % REGS_PER_GTF) {
                 if (ata_msg_drv(ap))
-                        ata_dev_printk(atadev, KERN_ERR,
+                        ata_dev_printk(dev, KERN_ERR,
                                 "%s: unexpected GTF length (%d) or addr (0x%p)\n",
                                 __FUNCTION__, out_obj->buffer.length,
                                 out_obj->buffer.pointer);
@@ -439,7 +437,7 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
         *gtf_address = (unsigned long)out_obj->buffer.pointer;
         *obj_loc = (unsigned long)out_obj;
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG, "%s: returning "
+                ata_dev_printk(dev, KERN_DEBUG, "%s: returning "
                         "gtf_length=%d, gtf_address=0x%lx, obj_loc=0x%lx\n",
                         __FUNCTION__, *gtf_length, *gtf_address, *obj_loc);
         err = 0;
@@ -449,7 +447,7 @@ out:
 
 /**
  * taskfile_load_raw - send taskfile registers to host controller
- * @ap: Port to which output is sent
+ * @dev: target ATA device
  * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7)
  *
  * Outputs ATA taskfile to standard ATA host controller using MMIO
@@ -466,15 +464,15 @@ out:
  * LOCKING: TBD:
  * Inherited from caller.
  */
-static void taskfile_load_raw(struct ata_port *ap,
-                                struct ata_device *atadev,
-                                const struct taskfile_array *gtf)
+static void taskfile_load_raw(struct ata_device *dev,
+                              const struct taskfile_array *gtf)
 {
+        struct ata_port *ap = dev->ap;
         struct ata_taskfile tf;
         unsigned int err;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG, "%s: (0x1f1-1f7): hex: "
+                ata_dev_printk(dev, KERN_DEBUG, "%s: (0x1f1-1f7): hex: "
                         "%02x %02x %02x %02x %02x %02x %02x\n",
                         __FUNCTION__,
                         gtf->tfa[0], gtf->tfa[1], gtf->tfa[2],
@@ -485,12 +483,11 @@ static void taskfile_load_raw(struct ata_port *ap,
             && (gtf->tfa[6] == 0))
                 return;
 
-        ata_tf_init(atadev, &tf);
+        ata_tf_init(dev, &tf);
 
         /* convert gtf to tf */
         tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */
-        tf.protocol = atadev->class == ATA_DEV_ATAPI ?
-                ATA_PROT_ATAPI_NODATA : ATA_PROT_NODATA;
+        tf.protocol = ATA_PROT_NODATA;
         tf.feature = gtf->tfa[0];       /* 0x1f1 */
         tf.nsect   = gtf->tfa[1];       /* 0x1f2 */
         tf.lbal    = gtf->tfa[2];       /* 0x1f3 */
@@ -499,17 +496,16 @@ static void taskfile_load_raw(struct ata_port *ap,
         tf.device  = gtf->tfa[5];       /* 0x1f6 */
         tf.command = gtf->tfa[6];       /* 0x1f7 */
 
-        err = ata_exec_internal(atadev, &tf, NULL, DMA_NONE, NULL, 0);
+        err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
         if (err && ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_ERR,
+                ata_dev_printk(dev, KERN_ERR,
                         "%s: ata_exec_internal failed: %u\n",
                         __FUNCTION__, err);
 }
 
 /**
  * do_drive_set_taskfiles - write the drive taskfile settings from _GTF
- * @ap: the ata_port for the drive
- * @atadev: target ata_device
+ * @dev: target ATA device
  * @gtf_length: total number of bytes of _GTF taskfiles
  * @gtf_address: location of _GTF taskfile arrays
  *
@@ -518,30 +514,31 @@ static void taskfile_load_raw(struct ata_port *ap,
  * Write {gtf_address, length gtf_length} in groups of
  * REGS_PER_GTF bytes.
  */
-static int do_drive_set_taskfiles(struct ata_port *ap,
-                struct ata_device *atadev, unsigned int gtf_length,
-                unsigned long gtf_address)
+static int do_drive_set_taskfiles(struct ata_device *dev,
+                                  unsigned int gtf_length,
+                                  unsigned long gtf_address)
 {
-        int                     err = -ENODEV;
-        int                     gtf_count = gtf_length / REGS_PER_GTF;
-        int                     ix;
+        struct ata_port *ap = dev->ap;
+        int err = -ENODEV;
+        int gtf_count = gtf_length / REGS_PER_GTF;
+        int ix;
         struct taskfile_array   *gtf;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
+                ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
                                __FUNCTION__, ap->port_no);
 
-        if (libata_noacpi || !(ap->cbl == ATA_CBL_SATA))
+        if (libata_noacpi || !(ap->flags & ATA_FLAG_ACPI_SATA))
                 return 0;
 
-        if (!ata_dev_enabled(atadev) || (ap->flags & ATA_FLAG_DISABLED))
+        if (!ata_dev_enabled(dev) || (ap->flags & ATA_FLAG_DISABLED))
                 goto out;
         if (!gtf_count)         /* shouldn't be here */
                 goto out;
 
         if (gtf_length % REGS_PER_GTF) {
                 if (ata_msg_drv(ap))
-                        ata_dev_printk(atadev, KERN_ERR,
+                        ata_dev_printk(dev, KERN_ERR,
                                 "%s: unexpected GTF length (%d)\n",
                                 __FUNCTION__, gtf_length);
                 goto out;
@@ -552,7 +549,7 @@ static int do_drive_set_taskfiles(struct ata_port *ap,
                         (gtf_address + ix * REGS_PER_GTF);
 
                 /* send all TaskFile registers (0x1f1-0x1f7) *in*that*order* */
-                taskfile_load_raw(ap, atadev, gtf);
+                taskfile_load_raw(dev, gtf);
         }
 
         err = 0;
@@ -568,11 +565,11 @@ out:
  */
 int ata_acpi_exec_tfs(struct ata_port *ap)
 {
-        int             ix;
-        int             ret =0;
-        unsigned int    gtf_length;
-        unsigned long   gtf_address;
-        unsigned long   obj_loc;
+        int ix;
+        int ret = 0;
+        unsigned int gtf_length;
+        unsigned long gtf_address;
+        unsigned long obj_loc;
 
         if (libata_noacpi)
                 return 0;
@@ -581,15 +578,17 @@ int ata_acpi_exec_tfs(struct ata_port *ap)
          * we should not run GTF on PATA devices since some
          * PATA require execution of GTM/STM before GTF.
          */
-        if (!(ap->cbl == ATA_CBL_SATA))
+        if (!(ap->flags & ATA_FLAG_ACPI_SATA))
                 return 0;
 
         for (ix = 0; ix < ATA_MAX_DEVICES; ix++) {
-                if (!ata_dev_enabled(&ap->device[ix]))
+                struct ata_device *dev = &ap->device[ix];
+
+                if (!ata_dev_enabled(dev))
                         continue;
 
-                ret = do_drive_get_GTF(ap, ix,
-                                &gtf_length, &gtf_address, &obj_loc);
+                ret = do_drive_get_GTF(dev, &gtf_length, &gtf_address,
+                                       &obj_loc);
                 if (ret < 0) {
                         if (ata_msg_probe(ap))
                                 ata_port_printk(ap, KERN_DEBUG,
@@ -598,8 +597,7 @@ int ata_acpi_exec_tfs(struct ata_port *ap)
                         break;
                 }
 
-                ret = do_drive_set_taskfiles(ap, &ap->device[ix],
-                                gtf_length, gtf_address);
+                ret = do_drive_set_taskfiles(dev, gtf_length, gtf_address);
                 kfree((void *)obj_loc);
                 if (ret < 0) {
                         if (ata_msg_probe(ap))
@@ -615,8 +613,7 @@ int ata_acpi_exec_tfs(struct ata_port *ap)
 
 /**
  * ata_acpi_push_id - send Identify data to drive
- * @ap: the ata_port for the drive
- * @ix: drive index
+ * @dev: target ATA device
  *
  * _SDD ACPI object: for SATA mode only
  * Must be after Identify (Packet) Device -- uses its data
@@ -624,57 +621,57 @@ int ata_acpi_exec_tfs(struct ata_port *ap)
  * method and if it fails for whatever reason, we should still
  * just keep going.
  */
-int ata_acpi_push_id(struct ata_port *ap, unsigned int ix)
+int ata_acpi_push_id(struct ata_device *dev)
 {
-        acpi_handle                     handle;
-        acpi_integer                    pcidevfn;
-        int                             err;
-        struct device                   *dev = ap->host->dev;
-        struct ata_device               *atadev = &ap->device[ix];
-        u32                             dev_adr;
-        acpi_status                     status;
-        struct acpi_object_list         input;
-        union acpi_object               in_params[1];
+        struct ata_port *ap = dev->ap;
+        acpi_handle handle;
+        acpi_integer pcidevfn;
+        int err;
+        struct device *gdev = ap->host->dev;
+        u32 dev_adr;
+        acpi_status status;
+        struct acpi_object_list input;
+        union acpi_object in_params[1];
 
         if (libata_noacpi)
                 return 0;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",
-                               __FUNCTION__, ix, ap->port_no);
+                ata_dev_printk(dev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",
+                               __FUNCTION__, dev->devno, ap->port_no);
 
         /* Don't continue if not a SATA device. */
-        if (!(ap->cbl == ATA_CBL_SATA)) {
+        if (!(ap->flags & ATA_FLAG_ACPI_SATA)) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG,
+                        ata_dev_printk(dev, KERN_DEBUG,
                                 "%s: Not a SATA device\n", __FUNCTION__);
                 goto out;
         }
 
         /* Don't continue if device has no _ADR method.
          * _SDD is intended for known motherboard devices. */
-        err = sata_get_dev_handle(dev, &handle, &pcidevfn);
+        err = sata_get_dev_handle(gdev, &handle, &pcidevfn);
         if (err < 0) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG,
+                        ata_dev_printk(dev, KERN_DEBUG,
                                 "%s: sata_get_dev_handle failed (%d\n",
                                 __FUNCTION__, err);
                 goto out;
         }
 
         /* Get this drive's _ADR info, if not already known */
-        if (!atadev->obj_handle) {
+        if (!dev->obj_handle) {
                 dev_adr = SATA_ADR_RSVD;
-                err = get_sata_adr(dev, handle, pcidevfn, ix, ap, atadev,
+                err = get_sata_adr(gdev, handle, pcidevfn, dev->devno, ap, dev,
                                         &dev_adr);
                 if (err < 0 || dev_adr == SATA_ADR_RSVD ||
-                        !atadev->obj_handle) {
+                        !dev->obj_handle) {
                         if (ata_msg_probe(ap))
-                                ata_dev_printk(atadev, KERN_DEBUG,
+                                ata_dev_printk(dev, KERN_DEBUG,
                                         "%s: get_sata_adr failed: "
                                         "err=%d, dev_adr=%u, obj_handle=0x%p\n",
                                         __FUNCTION__, err, dev_adr,
-                                        atadev->obj_handle);
+                                        dev->obj_handle);
                         goto out;
                 }
         }
@@ -684,19 +681,19 @@ int ata_acpi_push_id(struct ata_port *ap, unsigned int ix)
         input.count = 1;
         input.pointer = in_params;
         in_params[0].type = ACPI_TYPE_BUFFER;
-        in_params[0].buffer.length = sizeof(atadev->id[0]) * ATA_ID_WORDS;
-        in_params[0].buffer.pointer = (u8 *)atadev->id;
+        in_params[0].buffer.length = sizeof(dev->id[0]) * ATA_ID_WORDS;
+        in_params[0].buffer.pointer = (u8 *)dev->id;
         /* Output buffer: _SDD has no output */
 
         /* It's OK for _SDD to be missing too. */
-        swap_buf_le16(atadev->id, ATA_ID_WORDS);
-        status = acpi_evaluate_object(atadev->obj_handle, "_SDD", &input, NULL);
-        swap_buf_le16(atadev->id, ATA_ID_WORDS);
+        swap_buf_le16(dev->id, ATA_ID_WORDS);
+        status = acpi_evaluate_object(dev->obj_handle, "_SDD", &input, NULL);
+        swap_buf_le16(dev->id, ATA_ID_WORDS);
 
         err = ACPI_FAILURE(status) ? -EIO : 0;
         if (err < 0) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(atadev, KERN_DEBUG,
+                        ata_dev_printk(dev, KERN_DEBUG,
                                        "%s _SDD error: status = 0x%x\n",
                                        __FUNCTION__, status);
         }
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ca67484af1eb..a6de57e02047 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -59,7 +59,7 @@
 
 #include "libata.h"
 
-#define DRV_VERSION     "2.20"  /* must be exactly four chars */
+#define DRV_VERSION     "2.21"  /* must be exactly four chars */
 
 
 /* debounce timing parameters in msecs { interval, duration, timeout } */
@@ -895,6 +895,7 @@ static u64 ata_read_native_max_address(struct ata_device *dev)
 /**
  *      ata_set_native_max_address_ext  -       LBA48 native max set
  *      @dev: Device to query
+ *      @new_sectors: new max sectors value to set for the device
  *
  *      Perform an LBA48 size set max upon the device in question. Return the
  *      actual LBA48 size or zero if the command fails.
@@ -932,6 +933,7 @@ static u64 ata_set_native_max_address_ext(struct ata_device *dev, u64 new_sector
 /**
  *      ata_set_native_max_address      -       LBA28 native max set
  *      @dev: Device to query
+ *      @new_sectors: new max sectors value to set for the device
  *
  *      Perform an LBA28 size set max upon the device in question. Return the
  *      actual LBA28 size or zero if the command fails.
@@ -975,7 +977,7 @@ static u64 ata_hpa_resize(struct ata_device *dev)
 {
         u64 sectors = dev->n_sectors;
         u64 hpa_sectors;
-        
+
         if (ata_id_has_lba48(dev->id))
                 hpa_sectors = ata_read_native_max_address_ext(dev);
         else
@@ -1316,7 +1318,7 @@ void ata_port_flush_task(struct ata_port *ap)
         spin_unlock_irqrestore(ap->lock, flags);
 
         DPRINTK("flush #1\n");
-        flush_workqueue(ata_wq);
+        cancel_work_sync(&ap->port_task.work); /* akpm: seems unneeded */
 
         /*
          * At this point, if a task is running, it's guaranteed to see
@@ -1327,7 +1329,7 @@ void ata_port_flush_task(struct ata_port *ap)
                 if (ata_msg_ctl(ap))
                         ata_port_printk(ap, KERN_DEBUG, "%s: flush #2\n",
                                         __FUNCTION__);
-                flush_workqueue(ata_wq);
+                cancel_work_sync(&ap->port_task.work);
         }
 
         spin_lock_irqsave(ap->lock, flags);
@@ -1586,7 +1588,7 @@ unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd)
  *      Check if the current speed of the device requires IORDY. Used
  *      by various controllers for chip configuration.
  */
- 
+
 unsigned int ata_pio_need_iordy(const struct ata_device *adev)
 {
         /* Controller doesn't support  IORDY. Probably a pointless check
@@ -1609,7 +1611,7 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev)
  *      Compute the highest mode possible if we are not using iordy. Return
  *      -1 if no iordy mode is available.
  */
- 
+
 static u32 ata_pio_mask_no_iordy(const struct ata_device *adev)
 {
         /* If we have no drive specific rule, then PIO 2 is non IORDY */
@@ -1652,7 +1654,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
         struct ata_taskfile tf;
         unsigned int err_mask = 0;
         const char *reason;
-        int tried_spinup = 0;
+        int may_fallback = 1, tried_spinup = 0;
         int rc;
 
         if (ata_msg_ctl(ap))
@@ -1696,11 +1698,31 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                         return -ENOENT;
                 }
 
+                /* Device or controller might have reported the wrong
+                 * device class.  Give a shot at the other IDENTIFY if
+                 * the current one is aborted by the device.
+                 */
+                if (may_fallback &&
+                    (err_mask == AC_ERR_DEV) && (tf.feature & ATA_ABORTED)) {
+                        may_fallback = 0;
+
+                        if (class == ATA_DEV_ATA)
+                                class = ATA_DEV_ATAPI;
+                        else
+                                class = ATA_DEV_ATA;
+                        goto retry;
+                }
+
                 rc = -EIO;
                 reason = "I/O error";
                 goto err_out;
         }
 
+        /* Falling back doesn't make sense if ID data was read
+         * successfully at least once.
+         */
+        may_fallback = 0;
+
         swap_buf_le16(id, ATA_ID_WORDS);
 
         /* sanity check */
@@ -1841,7 +1863,7 @@ int ata_dev_configure(struct ata_device *dev)
                 ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __FUNCTION__);
 
         /* set _SDD */
-        rc = ata_acpi_push_id(ap, dev->devno);
+        rc = ata_acpi_push_id(dev);
         if (rc) {
                 ata_dev_printk(dev, KERN_WARNING, "failed to set _SDD(%d)\n",
                         rc);
@@ -1891,7 +1913,6 @@ int ata_dev_configure(struct ata_device *dev)
                         snprintf(revbuf, 7, "ATA-%d",  ata_id_major_version(id));
 
                 dev->n_sectors = ata_id_n_sectors(id);
-                dev->n_sectors_boot = dev->n_sectors;
 
                 /* SCSI only uses 4-char revisions, dump full 8 chars from ATA */
                 ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,
@@ -2642,7 +2663,7 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed,
                 t->active += (t->cycle - (t->active + t->recover)) / 2;
                 t->recover = t->cycle - t->active;
         }
-        
+
         /* In a few cases quantisation may produce enough errors to
            leave t->cycle too low for the sum of active and recovery
            if so we must correct this */
@@ -2858,7 +2879,7 @@ int ata_do_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev)
                 dev = &ap->device[i];
 
                 /* don't update suspended devices' xfer mode */
-                if (!ata_dev_ready(dev))
+                if (!ata_dev_enabled(dev))
                         continue;
 
                 rc = ata_dev_set_mode(dev);
@@ -2872,9 +2893,6 @@ int ata_do_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev)
         if (used_dma && (ap->host->flags & ATA_HOST_SIMPLEX))
                 ap->host->simplex_claimed = ap;
 
-        /* step5: chip specific finalisation */
-        if (ap->ops->post_set_mode)
-                ap->ops->post_set_mode(ap);
  out:
         if (rc)
                 *r_failed_dev = dev;
@@ -2979,23 +2997,71 @@ int ata_busy_sleep(struct ata_port *ap,
         return 0;
 }
 
-static void ata_bus_post_reset(struct ata_port *ap, unsigned int devmask)
+/**
+ *      ata_wait_ready - sleep until BSY clears, or timeout
+ *      @ap: port containing status register to be polled
+ *      @deadline: deadline jiffies for the operation
+ *
+ *      Sleep until ATA Status register bit BSY clears, or timeout
+ *      occurs.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep).
+ *
+ *      RETURNS:
+ *      0 on success, -errno otherwise.
+ */
+int ata_wait_ready(struct ata_port *ap, unsigned long deadline)
+{
+        unsigned long start = jiffies;
+        int warned = 0;
+
+        while (1) {
+                u8 status = ata_chk_status(ap);
+                unsigned long now = jiffies;
+
+                if (!(status & ATA_BUSY))
+                        return 0;
+                if (status == 0xff)
+                        return -ENODEV;
+                if (time_after(now, deadline))
+                        return -EBUSY;
+
+                if (!warned && time_after(now, start + 5 * HZ) &&
+                    (deadline - now > 3 * HZ)) {
+                        ata_port_printk(ap, KERN_WARNING,
+                                "port is slow to respond, please be patient "
+                                "(Status 0x%x)\n", status);
+                        warned = 1;
+                }
+
+                msleep(50);
+        }
+}
+
+static int ata_bus_post_reset(struct ata_port *ap, unsigned int devmask,
+                              unsigned long deadline)
 {
         struct ata_ioports *ioaddr = &ap->ioaddr;
         unsigned int dev0 = devmask & (1 << 0);
         unsigned int dev1 = devmask & (1 << 1);
-        unsigned long timeout;
+        int rc, ret = 0;
 
         /* if device 0 was found in ata_devchk, wait for its
          * BSY bit to clear
          */
-        if (dev0)
-                ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+        if (dev0) {
+                rc = ata_wait_ready(ap, deadline);
+                if (rc) {
+                        if (rc != -ENODEV)
+                                return rc;
+                        ret = rc;
+                }
+        }
 
         /* if device 1 was found in ata_devchk, wait for
          * register access, then wait for BSY to clear
          */
-        timeout = jiffies + ATA_TMOUT_BOOT;
         while (dev1) {
                 u8 nsect, lbal;
 
@@ -3004,14 +3070,18 @@ static void ata_bus_post_reset(struct ata_port *ap, unsigned int devmask)
                 lbal = ioread8(ioaddr->lbal_addr);
                 if ((nsect == 1) && (lbal == 1))
                         break;
-                if (time_after(jiffies, timeout)) {
-                        dev1 = 0;
-                        break;
-                }
+                if (time_after(jiffies, deadline))
+                        return -EBUSY;
                 msleep(50);     /* give drive a breather */
         }
-        if (dev1)
-                ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+        if (dev1) {
+                rc = ata_wait_ready(ap, deadline);
+                if (rc) {
+                        if (rc != -ENODEV)
+                                return rc;
+                        ret = rc;
+                }
+        }
 
         /* is all this really necessary? */
         ap->ops->dev_select(ap, 0);
@@ -3019,10 +3089,12 @@ static void ata_bus_post_reset(struct ata_port *ap, unsigned int devmask)
                 ap->ops->dev_select(ap, 1);
         if (dev0)
                 ap->ops->dev_select(ap, 0);
+
+        return ret;
 }
 
-static unsigned int ata_bus_softreset(struct ata_port *ap,
-                                      unsigned int devmask)
+static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
+                             unsigned long deadline)
 {
         struct ata_ioports *ioaddr = &ap->ioaddr;
 
@@ -3052,11 +3124,9 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
          * pulldown resistor.
          */
         if (ata_check_status(ap) == 0xFF)
-                return 0;
-
-        ata_bus_post_reset(ap, devmask);
+                return -ENODEV;
 
-        return 0;
+        return ata_bus_post_reset(ap, devmask, deadline);
 }
 
 /**
@@ -3085,6 +3155,7 @@ void ata_bus_reset(struct ata_port *ap)
         unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
         u8 err;
         unsigned int dev0, dev1 = 0, devmask = 0;
+        int rc;
 
         DPRINTK("ENTER, host %u, port %u\n", ap->print_id, ap->port_no);
 
@@ -3106,9 +3177,11 @@ void ata_bus_reset(struct ata_port *ap)
         ap->ops->dev_select(ap, 0);
 
         /* issue bus reset */
-        if (ap->flags & ATA_FLAG_SRST)
-                if (ata_bus_softreset(ap, devmask))
+        if (ap->flags & ATA_FLAG_SRST) {
+                rc = ata_bus_softreset(ap, devmask, jiffies + 40 * HZ);
+                if (rc && rc != -ENODEV)
                         goto err_out;
+        }
 
         /*
          * determine by signature whether we have ATA or ATAPI devices
@@ -3150,29 +3223,37 @@ err_out:
  *      sata_phy_debounce - debounce SATA phy status
  *      @ap: ATA port to debounce SATA phy status for
  *      @params: timing parameters { interval, duratinon, timeout } in msec
+ *      @deadline: deadline jiffies for the operation
  *
  *      Make sure SStatus of @ap reaches stable state, determined by
  *      holding the same value where DET is not 1 for @duration polled
  *      every @interval, before @timeout.  Timeout constraints the
- *      beginning of the stable state.  Because, after hot unplugging,
- *      DET gets stuck at 1 on some controllers, this functions waits
+ *      beginning of the stable state.  Because DET gets stuck at 1 on
+ *      some controllers after hot unplugging, this functions waits
  *      until timeout then returns 0 if DET is stable at 1.
  *
+ *      @timeout is further limited by @deadline.  The sooner of the
+ *      two is used.
+ *
  *      LOCKING:
  *      Kernel thread context (may sleep)
  *
  *      RETURNS:
  *      0 on success, -errno on failure.
  */
-int sata_phy_debounce(struct ata_port *ap, const unsigned long *params)
+int sata_phy_debounce(struct ata_port *ap, const unsigned long *params,
+                      unsigned long deadline)
 {
         unsigned long interval_msec = params[0];
-        unsigned long duration = params[1] * HZ / 1000;
-        unsigned long timeout = jiffies + params[2] * HZ / 1000;
-        unsigned long last_jiffies;
+        unsigned long duration = msecs_to_jiffies(params[1]);
+        unsigned long last_jiffies, t;
         u32 last, cur;
         int rc;
 
+        t = jiffies + msecs_to_jiffies(params[2]);
+        if (time_before(t, deadline))
+                deadline = t;
+
         if ((rc = sata_scr_read(ap, SCR_STATUS, &cur)))
                 return rc;
         cur &= 0xf;
@@ -3188,7 +3269,7 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params)
 
                 /* DET stable? */
                 if (cur == last) {
-                        if (cur == 1 && time_before(jiffies, timeout))
+                        if (cur == 1 && time_before(jiffies, deadline))
                                 continue;
                         if (time_after(jiffies, last_jiffies + duration))
                                 return 0;
@@ -3199,8 +3280,8 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params)
                 last = cur;
                 last_jiffies = jiffies;
 
-                /* check timeout */
-                if (time_after(jiffies, timeout))
+                /* check deadline */
+                if (time_after(jiffies, deadline))
                         return -EBUSY;
         }
 }
@@ -3209,6 +3290,7 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params)
  *      sata_phy_resume - resume SATA phy
  *      @ap: ATA port to resume SATA phy for
  *      @params: timing parameters { interval, duratinon, timeout } in msec
+ *      @deadline: deadline jiffies for the operation
  *
  *      Resume SATA phy of @ap and debounce it.
  *
@@ -3218,7 +3300,8 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params)
  *      RETURNS:
  *      0 on success, -errno on failure.
  */
-int sata_phy_resume(struct ata_port *ap, const unsigned long *params)
+int sata_phy_resume(struct ata_port *ap, const unsigned long *params,
+                    unsigned long deadline)
 {
         u32 scontrol;
         int rc;
@@ -3236,43 +3319,19 @@ int sata_phy_resume(struct ata_port *ap, const unsigned long *params)
          */
         msleep(200);
 
-        return sata_phy_debounce(ap, params);
-}
-
-static void ata_wait_spinup(struct ata_port *ap)
-{
-        struct ata_eh_context *ehc = &ap->eh_context;
-        unsigned long end, secs;
-        int rc;
-
-        /* first, debounce phy if SATA */
-        if (ap->cbl == ATA_CBL_SATA) {
-                rc = sata_phy_debounce(ap, sata_deb_timing_hotplug);
-
-                /* if debounced successfully and offline, no need to wait */
-                if ((rc == 0 || rc == -EOPNOTSUPP) && ata_port_offline(ap))
-                        return;
-        }
-
-        /* okay, let's give the drive time to spin up */
-        end = ehc->i.hotplug_timestamp + ATA_SPINUP_WAIT * HZ / 1000;
-        secs = ((end - jiffies) + HZ - 1) / HZ;
-
-        if (time_after(jiffies, end))
-                return;
-
-        if (secs > 5)
-                ata_port_printk(ap, KERN_INFO, "waiting for device to spin up "
-                                "(%lu secs)\n", secs);
-
-        schedule_timeout_uninterruptible(end - jiffies);
+        return sata_phy_debounce(ap, params, deadline);
 }
 
 /**
  *      ata_std_prereset - prepare for reset
  *      @ap: ATA port to be reset
+ *      @deadline: deadline jiffies for the operation
  *
- *      @ap is about to be reset.  Initialize it.
+ *      @ap is about to be reset.  Initialize it.  Failure from
+ *      prereset makes libata abort whole reset sequence and give up
+ *      that port, so prereset should be best-effort.  It does its
+ *      best to prepare for reset sequence but if things go wrong, it
+ *      should just whine, not fail.
  *
  *      LOCKING:
  *      Kernel thread context (may sleep)
@@ -3280,41 +3339,41 @@ static void ata_wait_spinup(struct ata_port *ap)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-int ata_std_prereset(struct ata_port *ap)
+int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
 {
         struct ata_eh_context *ehc = &ap->eh_context;
         const unsigned long *timing = sata_ehc_deb_timing(ehc);
         int rc;
 
-        /* handle link resume & hotplug spinup */
+        /* handle link resume */
         if ((ehc->i.flags & ATA_EHI_RESUME_LINK) &&
             (ap->flags & ATA_FLAG_HRST_TO_RESUME))
                 ehc->i.action |= ATA_EH_HARDRESET;
 
-        if ((ehc->i.flags & ATA_EHI_HOTPLUGGED) &&
-            (ap->flags & ATA_FLAG_SKIP_D2H_BSY))
-                ata_wait_spinup(ap);
-
         /* if we're about to do hardreset, nothing more to do */
         if (ehc->i.action & ATA_EH_HARDRESET)
                 return 0;
 
         /* if SATA, resume phy */
         if (ap->cbl == ATA_CBL_SATA) {
-                rc = sata_phy_resume(ap, timing);
-                if (rc && rc != -EOPNOTSUPP) {
-                        /* phy resume failed */
+                rc = sata_phy_resume(ap, timing, deadline);
+                /* whine about phy resume failure but proceed */
+                if (rc && rc != -EOPNOTSUPP)
                         ata_port_printk(ap, KERN_WARNING, "failed to resume "
                                         "link for reset (errno=%d)\n", rc);
-                        return rc;
-                }
         }
 
         /* Wait for !BSY if the controller can wait for the first D2H
          * Reg FIS and we don't know that no device is attached.
          */
-        if (!(ap->flags & ATA_FLAG_SKIP_D2H_BSY) && !ata_port_offline(ap))
-                ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+        if (!(ap->flags & ATA_FLAG_SKIP_D2H_BSY) && !ata_port_offline(ap)) {
+                rc = ata_wait_ready(ap, deadline);
+                if (rc) {
+                        ata_port_printk(ap, KERN_WARNING, "device not ready "
+                                        "(errno=%d), forcing hardreset\n", rc);
+                        ehc->i.action |= ATA_EH_HARDRESET;
+                }
+        }
 
         return 0;
 }
@@ -3323,6 +3382,7 @@ int ata_std_prereset(struct ata_port *ap)
  *      ata_std_softreset - reset host port via ATA SRST
  *      @ap: port to reset
  *      @classes: resulting classes of attached devices
+ *      @deadline: deadline jiffies for the operation
  *
  *      Reset host port using ATA SRST.
  *
@@ -3332,10 +3392,12 @@ int ata_std_prereset(struct ata_port *ap)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-int ata_std_softreset(struct ata_port *ap, unsigned int *classes)
+int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
+                      unsigned long deadline)
 {
         unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
-        unsigned int devmask = 0, err_mask;
+        unsigned int devmask = 0;
+        int rc;
         u8 err;
 
         DPRINTK("ENTER\n");
@@ -3356,11 +3418,11 @@ int ata_std_softreset(struct ata_port *ap, unsigned int *classes)
 
         /* issue bus reset */
         DPRINTK("about to softreset, devmask=%x\n", devmask);
-        err_mask = ata_bus_softreset(ap, devmask);
-        if (err_mask) {
-                ata_port_printk(ap, KERN_ERR, "SRST failed (err_mask=0x%x)\n",
-                                err_mask);
-                return -EIO;
+        rc = ata_bus_softreset(ap, devmask, deadline);
+        /* if link is occupied, -ENODEV too is an error */
+        if (rc && (rc != -ENODEV || sata_scr_valid(ap))) {
+                ata_port_printk(ap, KERN_ERR, "SRST failed (errno=%d)\n", rc);
+                return rc;
         }
 
         /* determine by signature whether we have ATA or ATAPI devices */
@@ -3377,6 +3439,7 @@ int ata_std_softreset(struct ata_port *ap, unsigned int *classes)
  *      sata_port_hardreset - reset port via SATA phy reset
  *      @ap: port to reset
  *      @timing: timing parameters { interval, duratinon, timeout } in msec
+ *      @deadline: deadline jiffies for the operation
  *
  *      SATA phy-reset host port using DET bits of SControl register.
  *
@@ -3386,7 +3449,8 @@ int ata_std_softreset(struct ata_port *ap, unsigned int *classes)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing)
+int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing,
+                        unsigned long deadline)
 {
         u32 scontrol;
         int rc;
@@ -3425,7 +3489,7 @@ int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing)
         msleep(1);
 
         /* bring phy back */
-        rc = sata_phy_resume(ap, timing);
+        rc = sata_phy_resume(ap, timing, deadline);
  out:
         DPRINTK("EXIT, rc=%d\n", rc);
         return rc;
@@ -3435,6 +3499,7 @@ int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing)
  *      sata_std_hardreset - reset host port via SATA phy reset
  *      @ap: port to reset
  *      @class: resulting class of attached device
+ *      @deadline: deadline jiffies for the operation
  *
  *      SATA phy-reset host port using DET bits of SControl register,
  *      wait for !BSY and classify the attached device.
@@ -3445,7 +3510,8 @@ int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
+int sata_std_hardreset(struct ata_port *ap, unsigned int *class,
+                       unsigned long deadline)
 {
         const unsigned long *timing = sata_ehc_deb_timing(&ap->eh_context);
         int rc;
@@ -3453,7 +3519,7 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
         DPRINTK("ENTER\n");
 
         /* do hardreset */
-        rc = sata_port_hardreset(ap, timing);
+        rc = sata_port_hardreset(ap, timing, deadline);
         if (rc) {
                 ata_port_printk(ap, KERN_ERR,
                                 "COMRESET failed (errno=%d)\n", rc);
@@ -3470,10 +3536,12 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
         /* wait a while before checking status, see SRST for more info */
         msleep(150);
 
-        if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
+        rc = ata_wait_ready(ap, deadline);
+        /* link occupied, -ENODEV too is an error */
+        if (rc) {
                 ata_port_printk(ap, KERN_ERR,
-                                "COMRESET failed (device not ready)\n");
-                return -EIO;
+                                "COMRESET failed (errno=%d)\n", rc);
+                return rc;
         }
 
         ap->ops->dev_select(ap, 0);     /* probably unnecessary */
@@ -3554,7 +3622,6 @@ static int ata_dev_same_device(struct ata_device *dev, unsigned int new_class,
         const u16 *old_id = dev->id;
         unsigned char model[2][ATA_ID_PROD_LEN + 1];
         unsigned char serial[2][ATA_ID_SERNO_LEN + 1];
-        u64 new_n_sectors;
 
         if (dev->class != new_class) {
                 ata_dev_printk(dev, KERN_INFO, "class mismatch %d != %d\n",
@@ -3566,7 +3633,6 @@ static int ata_dev_same_device(struct ata_device *dev, unsigned int new_class,
         ata_id_c_string(new_id, model[1], ATA_ID_PROD, sizeof(model[1]));
         ata_id_c_string(old_id, serial[0], ATA_ID_SERNO, sizeof(serial[0]));
         ata_id_c_string(new_id, serial[1], ATA_ID_SERNO, sizeof(serial[1]));
-        new_n_sectors = ata_id_n_sectors(new_id);
 
         if (strcmp(model[0], model[1])) {
                 ata_dev_printk(dev, KERN_INFO, "model number mismatch "
@@ -3580,25 +3646,12 @@ static int ata_dev_same_device(struct ata_device *dev, unsigned int new_class,
                 return 0;
         }
 
-        if (dev->class == ATA_DEV_ATA && dev->n_sectors != new_n_sectors) {
-                ata_dev_printk(dev, KERN_INFO, "n_sectors mismatch "
-                               "%llu != %llu\n",
-                               (unsigned long long)dev->n_sectors,
-                               (unsigned long long)new_n_sectors);
-                /* Are we the boot time size - if so we appear to be the
-                   same disk at this point and our HPA got reapplied */
-                if (ata_ignore_hpa && dev->n_sectors_boot == new_n_sectors 
-                    && ata_id_hpa_enabled(new_id))
-                        return 1;
-                return 0;
-        }
-
         return 1;
 }
 
 /**
- *      ata_dev_revalidate - Revalidate ATA device
- *      @dev: device to revalidate
+ *      ata_dev_reread_id - Re-read IDENTIFY data
+ *      @adev: target ATA device
  *      @readid_flags: read ID flags
  *
  *      Re-read IDENTIFY page and make sure @dev is still attached to
@@ -3610,34 +3663,68 @@ static int ata_dev_same_device(struct ata_device *dev, unsigned int new_class,
  *      RETURNS:
  *      0 on success, negative errno otherwise
  */
-int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags)
+int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags)
 {
         unsigned int class = dev->class;
         u16 *id = (void *)dev->ap->sector_buf;
         int rc;
 
-        if (!ata_dev_enabled(dev)) {
-                rc = -ENODEV;
-                goto fail;
-        }
-
         /* read ID data */
         rc = ata_dev_read_id(dev, &class, readid_flags, id);
         if (rc)
-                goto fail;
+                return rc;
 
         /* is the device still there? */
-        if (!ata_dev_same_device(dev, class, id)) {
-                rc = -ENODEV;
-                goto fail;
-        }
+        if (!ata_dev_same_device(dev, class, id))
+                return -ENODEV;
 
         memcpy(dev->id, id, sizeof(id[0]) * ATA_ID_WORDS);
+        return 0;
+}
+
+/**
+ *      ata_dev_revalidate - Revalidate ATA device
+ *      @dev: device to revalidate
+ *      @readid_flags: read ID flags
+ *
+ *      Re-read IDENTIFY page, make sure @dev is still attached to the
+ *      port and reconfigure it according to the new IDENTIFY page.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ *
+ *      RETURNS:
+ *      0 on success, negative errno otherwise
+ */
+int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags)
+{
+        u64 n_sectors = dev->n_sectors;
+        int rc;
+
+        if (!ata_dev_enabled(dev))
+                return -ENODEV;
+
+        /* re-read ID */
+        rc = ata_dev_reread_id(dev, readid_flags);
+        if (rc)
+                goto fail;
 
         /* configure device according to the new ID */
         rc = ata_dev_configure(dev);
-        if (rc == 0)
-                return 0;
+        if (rc)
+                goto fail;
+
+        /* verify n_sectors hasn't changed */
+        if (dev->class == ATA_DEV_ATA && dev->n_sectors != n_sectors) {
+                ata_dev_printk(dev, KERN_INFO, "n_sectors mismatch "
+                               "%llu != %llu\n",
+                               (unsigned long long)n_sectors,
+                               (unsigned long long)dev->n_sectors);
+                rc = -ENODEV;
+                goto fail;
+        }
+
+        return 0;
 
  fail:
         ata_dev_printk(dev, KERN_ERR, "revalidation failed (errno=%d)\n", rc);
@@ -3681,6 +3768,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "ATAPI CD-ROM DRIVE 40X MAXIMUM",NULL,ATA_HORKAGE_NODMA },
         { "_NEC DV5800A",       NULL,           ATA_HORKAGE_NODMA },
         { "SAMSUNG CD-ROM SN-124","N001",       ATA_HORKAGE_NODMA },
+        { "Seagate STT20000A", NULL,            ATA_HORKAGE_NODMA },
 
         /* Weird ATAPI devices */
         { "TORiSAN DVD-ROM DRD-N216", NULL,     ATA_HORKAGE_MAX_SEC_128 |
@@ -5793,37 +5881,11 @@ static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,
  */
 int ata_host_suspend(struct ata_host *host, pm_message_t mesg)
 {
-        int i, j, rc;
+        int rc;
 
         rc = ata_host_request_pm(host, mesg, 0, ATA_EHI_QUIET, 1);
-        if (rc)
-                goto fail;
-
-        /* EH is quiescent now.  Fail if we have any ready device.
-         * This happens if hotplug occurs between completion of device
-         * suspension and here.
-         */
-        for (i = 0; i < host->n_ports; i++) {
-                struct ata_port *ap = host->ports[i];
-
-                for (j = 0; j < ATA_MAX_DEVICES; j++) {
-                        struct ata_device *dev = &ap->device[j];
-
-                        if (ata_dev_ready(dev)) {
-                                ata_port_printk(ap, KERN_WARNING,
-                                                "suspend failed, device %d "
-                                                "still active\n", dev->devno);
-                                rc = -EBUSY;
-                                goto fail;
-                        }
-                }
-        }
-
-        host->dev->power.power_state = mesg;
-        return 0;
-
- fail:
-        ata_host_resume(host);
+        if (rc == 0)
+                host->dev->power.power_state = mesg;
         return rc;
 }
 
@@ -5932,6 +5994,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
         if (!ap)
                 return NULL;
 
+        ap->pflags |= ATA_PFLAG_INITIALIZING;
         ap->lock = &host->lock;
         ap->flags = ATA_FLAG_DISABLED;
         ap->print_id = -1;
@@ -6300,6 +6363,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
                         ehi->action |= ATA_EH_SOFTRESET;
                         ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
 
+                        ap->pflags &= ~ATA_PFLAG_INITIALIZING;
                         ap->pflags |= ATA_PFLAG_LOADING;
                         ata_port_schedule_eh(ap);
 
@@ -6425,9 +6489,9 @@ void ata_port_detach(struct ata_port *ap)
         /* Flush hotplug task.  The sequence is similar to
          * ata_port_flush_task().
          */
-        flush_workqueue(ata_aux_wq);
+        cancel_work_sync(&ap->hotplug_task.work); /* akpm: why? */
         cancel_delayed_work(&ap->hotplug_task);
-        flush_workqueue(ata_aux_wq);
+        cancel_work_sync(&ap->hotplug_task.work);
 
  skip_eh:
         /* remove the associated SCSI host */
@@ -6793,6 +6857,7 @@ EXPORT_SYMBOL_GPL(ata_port_disable);
 EXPORT_SYMBOL_GPL(ata_ratelimit);
 EXPORT_SYMBOL_GPL(ata_wait_register);
 EXPORT_SYMBOL_GPL(ata_busy_sleep);
+EXPORT_SYMBOL_GPL(ata_wait_ready);
 EXPORT_SYMBOL_GPL(ata_port_queue_task);
 EXPORT_SYMBOL_GPL(ata_scsi_ioctl);
 EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);
@@ -6823,6 +6888,7 @@ EXPORT_SYMBOL_GPL(ata_timing_merge);
 #ifdef CONFIG_PCI
 EXPORT_SYMBOL_GPL(pci_test_config_bits);
 EXPORT_SYMBOL_GPL(ata_pci_init_native_host);
+EXPORT_SYMBOL_GPL(ata_pci_init_bmdma);
 EXPORT_SYMBOL_GPL(ata_pci_prepare_native_host);
 EXPORT_SYMBOL_GPL(ata_pci_init_one);
 EXPORT_SYMBOL_GPL(ata_pci_remove_one);
@@ -6836,11 +6902,6 @@ EXPORT_SYMBOL_GPL(ata_pci_default_filter);
 EXPORT_SYMBOL_GPL(ata_pci_clear_simplex);
 #endif /* CONFIG_PCI */
 
-#ifdef CONFIG_PM
-EXPORT_SYMBOL_GPL(ata_scsi_device_suspend);
-EXPORT_SYMBOL_GPL(ata_scsi_device_resume);
-#endif /* CONFIG_PM */
-
 EXPORT_SYMBOL_GPL(ata_eng_timeout);
 EXPORT_SYMBOL_GPL(ata_port_schedule_eh);
 EXPORT_SYMBOL_GPL(ata_port_abort);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 2bff9adcacf1..d8070989a39f 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -50,34 +50,39 @@ enum {
         ATA_EH_SPDN_FALLBACK_TO_PIO     = (1 << 2),
 };
 
+/* Waiting in ->prereset can never be reliable.  It's sometimes nice
+ * to wait there but it can't be depended upon; otherwise, we wouldn't
+ * be resetting.  Just give it enough time for most drives to spin up.
+ */
+enum {
+        ATA_EH_PRERESET_TIMEOUT         = 10 * HZ,
+};
+
+/* The following table determines how we sequence resets.  Each entry
+ * represents timeout for that try.  The first try can be soft or
+ * hardreset.  All others are hardreset if available.  In most cases
+ * the first reset w/ 10sec timeout should succeed.  Following entries
+ * are mostly for error handling, hotplug and retarded devices.
+ */
+static const unsigned long ata_eh_reset_timeouts[] = {
+        10 * HZ,        /* most drives spin up by 10sec */
+        10 * HZ,        /* > 99% working drives spin up before 20sec */
+        35 * HZ,        /* give > 30 secs of idleness for retarded devices */
+        5 * HZ,         /* and sweet one last chance */
+        /* > 1 min has elapsed, give up */
+};
+
 static void __ata_port_freeze(struct ata_port *ap);
 static void ata_eh_finish(struct ata_port *ap);
 #ifdef CONFIG_PM
 static void ata_eh_handle_port_suspend(struct ata_port *ap);
 static void ata_eh_handle_port_resume(struct ata_port *ap);
-static int ata_eh_suspend(struct ata_port *ap,
-                          struct ata_device **r_failed_dev);
-static void ata_eh_prep_resume(struct ata_port *ap);
-static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev);
 #else /* CONFIG_PM */
 static void ata_eh_handle_port_suspend(struct ata_port *ap)
 { }
 
 static void ata_eh_handle_port_resume(struct ata_port *ap)
 { }
-
-static int ata_eh_suspend(struct ata_port *ap, struct ata_device **r_failed_dev)
-{
-        return 0;
-}
-
-static void ata_eh_prep_resume(struct ata_port *ap)
-{ }
-
-static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev)
-{
-        return 0;
-}
 #endif /* CONFIG_PM */
 
 static void ata_ering_record(struct ata_ering *ering, int is_io,
@@ -546,6 +551,9 @@ void ata_port_schedule_eh(struct ata_port *ap)
 {
         WARN_ON(!ap->ops->error_handler);
 
+        if (ap->pflags & ATA_PFLAG_INITIALIZING)
+                return;
+
         ap->pflags |= ATA_PFLAG_EH_PENDING;
         scsi_schedule_eh(ap->scsi_host);
 
@@ -1001,7 +1009,7 @@ static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc)
         sense_buf[0] = 0x70;
         sense_buf[2] = qc->result_tf.feature >> 4;
 
-        /* some devices time out if garbage left in tf */ 
+        /* some devices time out if garbage left in tf */
         ata_tf_init(dev, &tf);
 
         memset(cdb, 0, ATAPI_CDB_LEN);
@@ -1558,14 +1566,14 @@ static void ata_eh_report(struct ata_port *ap)
 }
 
 static int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
-                        unsigned int *classes)
+                        unsigned int *classes, unsigned long deadline)
 {
         int i, rc;
 
         for (i = 0; i < ATA_MAX_DEVICES; i++)
                 classes[i] = ATA_DEV_UNKNOWN;
 
-        rc = reset(ap, classes);
+        rc = reset(ap, classes, deadline);
         if (rc)
                 return rc;
 
@@ -1603,8 +1611,9 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
 {
         struct ata_eh_context *ehc = &ap->eh_context;
         unsigned int *classes = ehc->classes;
-        int tries = ATA_EH_RESET_TRIES;
         int verbose = !(ehc->i.flags & ATA_EHI_QUIET);
+        int try = 0;
+        unsigned long deadline;
         unsigned int action;
         ata_reset_fn_t reset;
         int i, did_followup_srst, rc;
@@ -1624,7 +1633,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
                 ehc->i.action |= ATA_EH_HARDRESET;
 
         if (prereset) {
-                rc = prereset(ap);
+                rc = prereset(ap, jiffies + ATA_EH_PRERESET_TIMEOUT);
                 if (rc) {
                         if (rc == -ENOENT) {
                                 ata_port_printk(ap, KERN_DEBUG,
@@ -1665,6 +1674,8 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
         }
 
  retry:
+        deadline = jiffies + ata_eh_reset_timeouts[try++];
+
         /* shut up during boot probing */
         if (verbose)
                 ata_port_printk(ap, KERN_INFO, "%s resetting port\n",
@@ -1676,7 +1687,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
         else
                 ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
 
-        rc = ata_do_reset(ap, reset, classes);
+        rc = ata_do_reset(ap, reset, classes, deadline);
 
         did_followup_srst = 0;
         if (reset == hardreset &&
@@ -1693,7 +1704,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
                 }
 
                 ata_eh_about_to_do(ap, NULL, ATA_EH_RESET_MASK);
-                rc = ata_do_reset(ap, reset, classes);
+                rc = ata_do_reset(ap, reset, classes, deadline);
 
                 if (rc == 0 && classify &&
                     classes[0] == ATA_DEV_UNKNOWN) {
@@ -1703,22 +1714,21 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
                 }
         }
 
-        if (rc && --tries) {
-                const char *type;
+        if (rc && try < ARRAY_SIZE(ata_eh_reset_timeouts)) {
+                unsigned long now = jiffies;
 
-                if (reset == softreset) {
-                        if (did_followup_srst)
-                                type = "follow-up soft";
-                        else
-                                type = "soft";
-                } else
-                        type = "hard";
+                if (time_before(now, deadline)) {
+                        unsigned long delta = deadline - jiffies;
 
-                ata_port_printk(ap, KERN_WARNING,
-                                "%sreset failed, retrying in 5 secs\n", type);
-                ssleep(5);
+                        ata_port_printk(ap, KERN_WARNING, "reset failed "
+                                "(errno=%d), retrying in %u secs\n",
+                                rc, (jiffies_to_msecs(delta) + 999) / 1000);
+
+                        schedule_timeout_uninterruptible(delta);
+                }
 
-                if (reset == hardreset)
+                if (reset == hardreset &&
+                    try == ARRAY_SIZE(ata_eh_reset_timeouts) - 1)
                         sata_down_spd_limit(ap);
                 if (hardreset)
                         reset = hardreset;
@@ -1767,7 +1777,7 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
                 if (ehc->i.flags & ATA_EHI_DID_RESET)
                         readid_flags |= ATA_READID_POSTRESET;
 
-                if (action & ATA_EH_REVALIDATE && ata_dev_ready(dev)) {
+                if ((action & ATA_EH_REVALIDATE) && ata_dev_enabled(dev)) {
                         if (ata_port_offline(ap)) {
                                 rc = -EIO;
                                 goto err;
@@ -1848,166 +1858,6 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
         return rc;
 }
 
-#ifdef CONFIG_PM
-/**
- *      ata_eh_suspend - handle suspend EH action
- *      @ap: target host port
- *      @r_failed_dev: result parameter to indicate failing device
- *
- *      Handle suspend EH action.  Disk devices are spinned down and
- *      other types of devices are just marked suspended.  Once
- *      suspended, no EH action to the device is allowed until it is
- *      resumed.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep).
- *
- *      RETURNS:
- *      0 on success, -errno otherwise
- */
-static int ata_eh_suspend(struct ata_port *ap, struct ata_device **r_failed_dev)
-{
-        struct ata_device *dev;
-        int i, rc = 0;
-
-        DPRINTK("ENTER\n");
-
-        for (i = 0; i < ATA_MAX_DEVICES; i++) {
-                unsigned long flags;
-                unsigned int action, err_mask;
-
-                dev = &ap->device[i];
-                action = ata_eh_dev_action(dev);
-
-                if (!ata_dev_enabled(dev) || !(action & ATA_EH_SUSPEND))
-                        continue;
-
-                WARN_ON(dev->flags & ATA_DFLAG_SUSPENDED);
-
-                ata_eh_about_to_do(ap, dev, ATA_EH_SUSPEND);
-
-                if (dev->class == ATA_DEV_ATA && !(action & ATA_EH_PM_FREEZE)) {
-                        /* flush cache */
-                        rc = ata_flush_cache(dev);
-                        if (rc)
-                                break;
-
-                        /* spin down */
-                        err_mask = ata_do_simple_cmd(dev, ATA_CMD_STANDBYNOW1);
-                        if (err_mask) {
-                                ata_dev_printk(dev, KERN_ERR, "failed to "
-                                               "spin down (err_mask=0x%x)\n",
-                                               err_mask);
-                                rc = -EIO;
-                                break;
-                        }
-                }
-
-                spin_lock_irqsave(ap->lock, flags);
-                dev->flags |= ATA_DFLAG_SUSPENDED;
-                spin_unlock_irqrestore(ap->lock, flags);
-
-                ata_eh_done(ap, dev, ATA_EH_SUSPEND);
-        }
-
-        if (rc)
-                *r_failed_dev = dev;
-
-        DPRINTK("EXIT\n");
-        return rc;
-}
-
-/**
- *      ata_eh_prep_resume - prep for resume EH action
- *      @ap: target host port
- *
- *      Clear SUSPENDED in preparation for scheduled resume actions.
- *      This allows other parts of EH to access the devices being
- *      resumed.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep).
- */
-static void ata_eh_prep_resume(struct ata_port *ap)
-{
-        struct ata_device *dev;
-        unsigned long flags;
-        int i;
-
-        DPRINTK("ENTER\n");
-
-        for (i = 0; i < ATA_MAX_DEVICES; i++) {
-                unsigned int action;
-
-                dev = &ap->device[i];
-                action = ata_eh_dev_action(dev);
-
-                if (!ata_dev_enabled(dev) || !(action & ATA_EH_RESUME))
-                        continue;
-
-                spin_lock_irqsave(ap->lock, flags);
-                dev->flags &= ~ATA_DFLAG_SUSPENDED;
-                spin_unlock_irqrestore(ap->lock, flags);
-        }
-
-        DPRINTK("EXIT\n");
-}
-
-/**
- *      ata_eh_resume - handle resume EH action
- *      @ap: target host port
- *      @r_failed_dev: result parameter to indicate failing device
- *
- *      Handle resume EH action.  Target devices are already reset and
- *      revalidated.  Spinning up is the only operation left.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep).
- *
- *      RETURNS:
- *      0 on success, -errno otherwise
- */
-static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev)
-{
-        struct ata_device *dev;
-        int i, rc = 0;
-
-        DPRINTK("ENTER\n");
-
-        for (i = 0; i < ATA_MAX_DEVICES; i++) {
-                unsigned int action, err_mask;
-
-                dev = &ap->device[i];
-                action = ata_eh_dev_action(dev);
-
-                if (!ata_dev_enabled(dev) || !(action & ATA_EH_RESUME))
-                        continue;
-
-                ata_eh_about_to_do(ap, dev, ATA_EH_RESUME);
-
-                if (dev->class == ATA_DEV_ATA && !(action & ATA_EH_PM_FREEZE)) {
-                        err_mask = ata_do_simple_cmd(dev,
-                                                     ATA_CMD_IDLEIMMEDIATE);
-                        if (err_mask) {
-                                ata_dev_printk(dev, KERN_ERR, "failed to "
-                                               "spin up (err_mask=0x%x)\n",
-                                               err_mask);
-                                rc = -EIO;
-                                break;
-                        }
-                }
-
-                ata_eh_done(ap, dev, ATA_EH_RESUME);
-        }
-
-        if (rc)
-                *r_failed_dev = dev;
-
-        DPRINTK("EXIT\n");
-        return 0;
-}
-#endif /* CONFIG_PM */
-
 static int ata_port_nr_enabled(struct ata_port *ap)
 {
         int i, cnt = 0;
@@ -2033,17 +1883,6 @@ static int ata_eh_skip_recovery(struct ata_port *ap)
         struct ata_eh_context *ehc = &ap->eh_context;
         int i;
 
-        /* skip if all possible devices are suspended */
-        for (i = 0; i < ata_port_max_devices(ap); i++) {
-                struct ata_device *dev = &ap->device[i];
-
-                if (!(dev->flags & ATA_DFLAG_SUSPENDED))
-                        break;
-        }
-
-        if (i == ata_port_max_devices(ap))
-                return 1;
-
         /* thaw frozen port, resume link and recover failed devices */
         if ((ap->pflags & ATA_PFLAG_FROZEN) ||
             (ehc->i.flags & ATA_EHI_RESUME_LINK) || ata_port_nr_enabled(ap))
@@ -2123,9 +1962,6 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
         if (ap->pflags & ATA_PFLAG_UNLOADING)
                 goto out;
 
-        /* prep for resume */
-        ata_eh_prep_resume(ap);
-
         /* skip EH if possible. */
         if (ata_eh_skip_recovery(ap))
                 ehc->i.action = 0;
@@ -2153,11 +1989,6 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
         if (rc)
                 goto dev_fail;
 
-        /* resume devices */
-        rc = ata_eh_resume(ap, &dev);
-        if (rc)
-                goto dev_fail;
-
         /* configure transfer mode if necessary */
         if (ehc->i.flags & ATA_EHI_SETMODE) {
                 rc = ata_set_mode(ap, &dev);
@@ -2166,25 +1997,16 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                 ehc->i.flags &= ~ATA_EHI_SETMODE;
         }
 
-        /* suspend devices */
-        rc = ata_eh_suspend(ap, &dev);
-        if (rc)
-                goto dev_fail;
-
         goto out;
 
  dev_fail:
         ehc->tries[dev->devno]--;
 
         switch (rc) {
-        case -EINVAL:
-                /* eeek, something went very wrong, give up */
-                ehc->tries[dev->devno] = 0;
-                break;
-
         case -ENODEV:
                 /* device missing or wrong IDENTIFY data, schedule probing */
                 ehc->i.probe_mask |= (1 << dev->devno);
+        case -EINVAL:
                 /* give it just one more chance */
                 ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1);
         case -EIO:
@@ -2366,22 +2188,13 @@ static void ata_eh_handle_port_suspend(struct ata_port *ap)
  *
  *      Resume @ap.
  *
- *      This function also waits upto one second until all devices
- *      hanging off this port requests resume EH action.  This is to
- *      prevent invoking EH and thus reset multiple times on resume.
- *
- *      On DPM resume, where some of devices might not be resumed
- *      together, this may delay port resume upto one second, but such
- *      DPM resumes are rare and 1 sec delay isn't too bad.
- *
  *      LOCKING:
  *      Kernel thread context (may sleep).
  */
 static void ata_eh_handle_port_resume(struct ata_port *ap)
 {
-        unsigned long timeout;
         unsigned long flags;
-        int i, rc = 0;
+        int rc = 0;
 
         /* are we resuming? */
         spin_lock_irqsave(ap->lock, flags);
@@ -2392,31 +2205,12 @@ static void ata_eh_handle_port_resume(struct ata_port *ap)
         }
         spin_unlock_irqrestore(ap->lock, flags);
 
-        /* spurious? */
-        if (!(ap->pflags & ATA_PFLAG_SUSPENDED))
-                goto done;
+        WARN_ON(!(ap->pflags & ATA_PFLAG_SUSPENDED));
 
         if (ap->ops->port_resume)
                 rc = ap->ops->port_resume(ap);
 
-        /* give devices time to request EH */
-        timeout = jiffies + HZ; /* 1s max */
-        while (1) {
-                for (i = 0; i < ATA_MAX_DEVICES; i++) {
-                        struct ata_device *dev = &ap->device[i];
-                        unsigned int action = ata_eh_dev_action(dev);
-
-                        if ((dev->flags & ATA_DFLAG_SUSPENDED) &&
-                            !(action & ATA_EH_RESUME))
-                                break;
-                }
-
-                if (i == ATA_MAX_DEVICES || time_after(jiffies, timeout))
-                        break;
-                msleep(10);
-        }
-
- done:
+        /* report result */
         spin_lock_irqsave(ap->lock, flags);
         ap->pflags &= ~(ATA_PFLAG_PM_PENDING | ATA_PFLAG_SUSPENDED);
         if (ap->pm_result) {
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 9afba2ba489e..242c43eef807 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -510,133 +510,6 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf)
         }
 }
 
-#ifdef CONFIG_PM
-/**
- *      ata_scsi_device_suspend - suspend ATA device associated with sdev
- *      @sdev: the SCSI device to suspend
- *      @mesg: target power management message
- *
- *      Request suspend EH action on the ATA device associated with
- *      @sdev and wait for the operation to complete.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep).
- *
- *      RETURNS:
- *      0 on success, -errno otherwise.
- */
-int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t mesg)
-{
-        struct ata_port *ap = ata_shost_to_port(sdev->host);
-        struct ata_device *dev = ata_scsi_find_dev(ap, sdev);
-        unsigned long flags;
-        unsigned int action;
-        int rc = 0;
-
-        if (!dev)
-                goto out;
-
-        spin_lock_irqsave(ap->lock, flags);
-
-        /* wait for the previous resume to complete */
-        while (dev->flags & ATA_DFLAG_SUSPENDED) {
-                spin_unlock_irqrestore(ap->lock, flags);
-                ata_port_wait_eh(ap);
-                spin_lock_irqsave(ap->lock, flags);
-        }
-
-        /* if @sdev is already detached, nothing to do */
-        if (sdev->sdev_state == SDEV_OFFLINE ||
-            sdev->sdev_state == SDEV_CANCEL || sdev->sdev_state == SDEV_DEL)
-                goto out_unlock;
-
-        /* request suspend */
-        action = ATA_EH_SUSPEND;
-        if (mesg.event != PM_EVENT_SUSPEND)
-                action |= ATA_EH_PM_FREEZE;
-        ap->eh_info.dev_action[dev->devno] |= action;
-        ap->eh_info.flags |= ATA_EHI_QUIET;
-        ata_port_schedule_eh(ap);
-
-        spin_unlock_irqrestore(ap->lock, flags);
-
-        /* wait for EH to do the job */
-        ata_port_wait_eh(ap);
-
-        spin_lock_irqsave(ap->lock, flags);
-
-        /* If @sdev is still attached but the associated ATA device
-         * isn't suspended, the operation failed.
-         */
-        if (sdev->sdev_state != SDEV_OFFLINE &&
-            sdev->sdev_state != SDEV_CANCEL && sdev->sdev_state != SDEV_DEL &&
-            !(dev->flags & ATA_DFLAG_SUSPENDED))
-                rc = -EIO;
-
- out_unlock:
-        spin_unlock_irqrestore(ap->lock, flags);
- out:
-        if (rc == 0)
-                sdev->sdev_gendev.power.power_state = mesg;
-        return rc;
-}
-
-/**
- *      ata_scsi_device_resume - resume ATA device associated with sdev
- *      @sdev: the SCSI device to resume
- *
- *      Request resume EH action on the ATA device associated with
- *      @sdev and return immediately.  This enables parallel
- *      wakeup/spinup of devices.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep).
- *
- *      RETURNS:
- *      0.
- */
-int ata_scsi_device_resume(struct scsi_device *sdev)
-{
-        struct ata_port *ap = ata_shost_to_port(sdev->host);
-        struct ata_device *dev = ata_scsi_find_dev(ap, sdev);
-        struct ata_eh_info *ehi = &ap->eh_info;
-        unsigned long flags;
-        unsigned int action;
-
-        if (!dev)
-                goto out;
-
-        spin_lock_irqsave(ap->lock, flags);
-
-        /* if @sdev is already detached, nothing to do */
-        if (sdev->sdev_state == SDEV_OFFLINE ||
-            sdev->sdev_state == SDEV_CANCEL || sdev->sdev_state == SDEV_DEL)
-                goto out_unlock;
-
-        /* request resume */
-        action = ATA_EH_RESUME;
-        if (sdev->sdev_gendev.power.power_state.event == PM_EVENT_SUSPEND)
-                __ata_ehi_hotplugged(ehi);
-        else
-                action |= ATA_EH_PM_FREEZE | ATA_EH_SOFTRESET;
-        ehi->dev_action[dev->devno] |= action;
-
-        /* We don't want autopsy and verbose EH messages.  Disable
-         * those if we're the only device on this link.
-         */
-        if (ata_port_max_devices(ap) == 1)
-                ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
-
-        ata_port_schedule_eh(ap);
-
- out_unlock:
-        spin_unlock_irqrestore(ap->lock, flags);
- out:
-        sdev->sdev_gendev.power.power_state = PMSG_ON;
-        return 0;
-}
-#endif /* CONFIG_PM */
-
 /**
  *      ata_to_sense_error - convert ATA error to SCSI error
  *      @id: ATA device number
@@ -929,6 +802,8 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
 
         blk_queue_max_phys_segments(sdev->request_queue, LIBATA_MAX_PRD);
 
+        sdev->manage_start_stop = 1;
+
         if (dev)
                 ata_scsi_dev_config(sdev, dev);
 
@@ -1018,6 +893,23 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
         return queue_depth;
 }
 
+/* XXX: for spindown warning */
+static void ata_delayed_done_timerfn(unsigned long arg)
+{
+        struct scsi_cmnd *scmd = (void *)arg;
+
+        scmd->scsi_done(scmd);
+}
+
+/* XXX: for spindown warning */
+static void ata_delayed_done(struct scsi_cmnd *scmd)
+{
+        static struct timer_list timer;
+
+        setup_timer(&timer, ata_delayed_done_timerfn, (unsigned long)scmd);
+        mod_timer(&timer, jiffies + 5 * HZ);
+}
+
 /**
  *      ata_scsi_start_stop_xlat - Translate SCSI START STOP UNIT command
  *      @qc: Storage for translated ATA taskfile
@@ -1069,9 +961,37 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
                 }
 
                 tf->command = ATA_CMD_VERIFY;   /* READ VERIFY */
-        } else
+        } else {
+                /* XXX: This is for backward compatibility, will be
+                 * removed.  Read Documentation/feature-removal-schedule.txt
+                 * for more info.
+                 */
+                if ((qc->dev->flags & ATA_DFLAG_SPUNDOWN) &&
+                    (system_state == SYSTEM_HALT ||
+                     system_state == SYSTEM_POWER_OFF)) {
+                        static unsigned long warned = 0;
+
+                        if (!test_and_set_bit(0, &warned)) {
+                                ata_dev_printk(qc->dev, KERN_WARNING,
+                                        "DISK MIGHT NOT BE SPUN DOWN PROPERLY. "
+                                        "UPDATE SHUTDOWN UTILITY\n");
+                                ata_dev_printk(qc->dev, KERN_WARNING,
+                                        "For more info, visit "
+                                        "http://linux-ata.org/shutdown.html\n");
+
+                                /* ->scsi_done is not used, use it for
+                                 * delayed completion.
+                                 */
+                                scmd->scsi_done = qc->scsidone;
+                                qc->scsidone = ata_delayed_done;
+                        }
+                        scmd->result = SAM_STAT_GOOD;
+                        return 1;
+                }
+
                 /* Issue ATA STANDBY IMMEDIATE command */
                 tf->command = ATA_CMD_STANDBYNOW1;
+        }
 
         /*
          * Standby and Idle condition timers could be implemented but that
@@ -1474,6 +1394,14 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
                 }
         }
 
+        /* XXX: track spindown state for spindown skipping and warning */
+        if (unlikely(qc->tf.command == ATA_CMD_STANDBY ||
+                     qc->tf.command == ATA_CMD_STANDBYNOW1))
+                qc->dev->flags |= ATA_DFLAG_SPUNDOWN;
+        else if (likely(system_state != SYSTEM_HALT &&
+                        system_state != SYSTEM_POWER_OFF))
+                qc->dev->flags &= ~ATA_DFLAG_SPUNDOWN;
+
         if (need_sense && !ap->ops->error_handler)
                 ata_dump_status(ap->print_id, &qc->result_tf);
 
@@ -1587,14 +1515,14 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
 
 early_finish:
         ata_qc_free(qc);
-        done(cmd);
+        qc->scsidone(cmd);
         DPRINTK("EXIT - early finish (good or error)\n");
         return 0;
 
 err_did:
         ata_qc_free(qc);
         cmd->result = (DID_ERROR << 16);
-        done(cmd);
+        qc->scsidone(cmd);
 err_mem:
         DPRINTK("EXIT - internal\n");
         return 0;
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index d211db6b35a2..e35d13466c69 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -544,7 +544,7 @@ static int ata_resources_present(struct pci_dev *pdev, int port)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-static int ata_pci_init_bmdma(struct ata_host *host)
+int ata_pci_init_bmdma(struct ata_host *host)
 {
         struct device *gdev = host->dev;
         struct pci_dev *pdev = to_pci_dev(gdev);
@@ -566,7 +566,7 @@ static int ata_pci_init_bmdma(struct ata_host *host)
         }
         host->iomap = pcim_iomap_table(pdev);
 
-        for (i = 0; i < host->n_ports; i++) {
+        for (i = 0; i < 2; i++) {
                 struct ata_port *ap = host->ports[i];
                 void __iomem *bmdma = host->iomap[4] + 8 * i;
 
@@ -585,54 +585,52 @@ static int ata_pci_init_bmdma(struct ata_host *host)
 /**
  *      ata_pci_init_native_host - acquire native ATA resources and init host
  *      @host: target ATA host
- *      @port_mask: ports to consider
  *
- *      Acquire native PCI ATA resources for @host and initialize
- *      @host accordoingly.
+ *      Acquire native PCI ATA resources for @host and initialize the
+ *      first two ports of @host accordingly.  Ports marked dummy are
+ *      skipped and allocation failure makes the port dummy.
  *
  *      LOCKING:
  *      Inherited from calling layer (may sleep).
  *
  *      RETURNS:
- *      0 on success, -errno otherwise.
+ *      0 if at least one port is initialized, -ENODEV if no port is
+ *      available.
  */
-int ata_pci_init_native_host(struct ata_host *host, unsigned int port_mask)
+int ata_pci_init_native_host(struct ata_host *host)
 {
         struct device *gdev = host->dev;
         struct pci_dev *pdev = to_pci_dev(gdev);
+        unsigned int mask = 0;
         int i, rc;
 
-        /* Discard disabled ports.  Some controllers show their unused
-         * channels this way.  Disabled ports are made dummy.
-         */
-        for (i = 0; i < 2; i++) {
-                if ((port_mask & (1 << i)) && !ata_resources_present(pdev, i)) {
-                        host->ports[i]->ops = &ata_dummy_port_ops;
-                        port_mask &= ~(1 << i);
-                }
-        }
-
-        if (!port_mask) {
-                dev_printk(KERN_ERR, gdev, "no available port\n");
-                return -ENODEV;
-        }
-
         /* request, iomap BARs and init port addresses accordingly */
         for (i = 0; i < 2; i++) {
                 struct ata_port *ap = host->ports[i];
                 int base = i * 2;
                 void __iomem * const *iomap;
 
-                if (!(port_mask & (1 << i)))
+                if (ata_port_is_dummy(ap))
+                        continue;
+
+                /* Discard disabled ports.  Some controllers show
+                 * their unused channels this way.  Disabled ports are
+                 * made dummy.
+                 */
+                if (!ata_resources_present(pdev, i)) {
+                        ap->ops = &ata_dummy_port_ops;
                         continue;
+                }
 
                 rc = pcim_iomap_regions(pdev, 0x3 << base, DRV_NAME);
                 if (rc) {
-                        dev_printk(KERN_ERR, gdev, "failed to request/iomap "
-                                   "BARs for port %d (errno=%d)\n", i, rc);
+                        dev_printk(KERN_WARNING, gdev,
+                                   "failed to request/iomap BARs for port %d "
+                                   "(errno=%d)\n", i, rc);
                         if (rc == -EBUSY)
                                 pcim_pin_device(pdev);
-                        return rc;
+                        ap->ops = &ata_dummy_port_ops;
+                        continue;
                 }
                 host->iomap = iomap = pcim_iomap_table(pdev);
 
@@ -641,6 +639,13 @@ int ata_pci_init_native_host(struct ata_host *host, unsigned int port_mask)
                 ap->ioaddr.ctl_addr = (void __iomem *)
                         ((unsigned long)iomap[base + 1] | ATA_PCI_CTL_OFS);
                 ata_std_ports(&ap->ioaddr);
+
+                mask |= 1 << i;
+        }
+
+        if (!mask) {
+                dev_printk(KERN_ERR, gdev, "no available native port\n");
+                return -ENODEV;
         }
 
         return 0;
@@ -649,8 +654,7 @@ int ata_pci_init_native_host(struct ata_host *host, unsigned int port_mask)
 /**
  *      ata_pci_prepare_native_host - helper to prepare native PCI ATA host
  *      @pdev: target PCI device
- *      @ppi: array of port_info
- *      @n_ports: number of ports to allocate
+ *      @ppi: array of port_info, must be enough for two ports
  *      @r_host: out argument for the initialized ATA host
  *
  *      Helper to allocate ATA host for @pdev, acquire all native PCI
@@ -664,10 +668,9 @@ int ata_pci_init_native_host(struct ata_host *host, unsigned int port_mask)
  */
 int ata_pci_prepare_native_host(struct pci_dev *pdev,
                                 const struct ata_port_info * const * ppi,
-                                int n_ports, struct ata_host **r_host)
+                                struct ata_host **r_host)
 {
         struct ata_host *host;
-        unsigned int port_mask;
         int rc;
 
         if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL))
@@ -681,11 +684,7 @@ int ata_pci_prepare_native_host(struct pci_dev *pdev,
                 goto err_out;
         }
 
-        port_mask = ATA_PORT_PRIMARY;
-        if (n_ports > 1)
-                port_mask |= ATA_PORT_SECONDARY;
-
-        rc = ata_pci_init_native_host(host, port_mask);
+        rc = ata_pci_init_native_host(host);
         if (rc)
                 goto err_out;
 
@@ -777,8 +776,11 @@ static int ata_init_legacy_port(struct ata_port *ap,
         /* iomap cmd and ctl ports */
         legacy_dr->cmd_addr[port_no] = ioport_map(cmd_port, 8);
         legacy_dr->ctl_addr[port_no] = ioport_map(ctl_port, 1);
-        if (!legacy_dr->cmd_addr[port_no] || !legacy_dr->ctl_addr[port_no])
+        if (!legacy_dr->cmd_addr[port_no] || !legacy_dr->ctl_addr[port_no]) {
+                dev_printk(KERN_WARNING, host->dev,
+                           "failed to map cmd/ctl ports\n");
                 return -ENOMEM;
+        }
 
         /* init IO addresses */
         ap->ioaddr.cmd_addr = legacy_dr->cmd_addr[port_no];
@@ -792,19 +794,20 @@ static int ata_init_legacy_port(struct ata_port *ap,
 /**
  *      ata_init_legacy_host - acquire legacy ATA resources and init ATA host
  *      @host: target ATA host
- *      @legacy_mask: out parameter, mask indicating ports is in legacy mode
  *      @was_busy: out parameter, indicates whether any port was busy
  *
- *      Acquire legacy ATA resources for ports.
+ *      Acquire legacy ATA resources for the first two ports of @host
+ *      and initialize it accordingly.  Ports marked dummy are skipped
+ *      and resource acquistion failure makes the port dummy.
  *
  *      LOCKING:
  *      Inherited from calling layer (may sleep).
  *
  *      RETURNS:
- *      0 on success, -errno otherwise.
+ *      0 if at least one port is initialized, -ENODEV if no port is
+ *      available.
  */
-static int ata_init_legacy_host(struct ata_host *host,
-                                unsigned int *legacy_mask, int *was_busy)
+static int ata_init_legacy_host(struct ata_host *host, int *was_busy)
 {
         struct device *gdev = host->dev;
         struct ata_legacy_devres *legacy_dr;
@@ -821,22 +824,23 @@ static int ata_init_legacy_host(struct ata_host *host,
         devres_add(gdev, legacy_dr);
 
         for (i = 0; i < 2; i++) {
-                *legacy_mask &= ~(1 << i);
+                if (ata_port_is_dummy(host->ports[i]))
+                        continue;
+
                 rc = ata_init_legacy_port(host->ports[i], legacy_dr);
                 if (rc == 0)
                         legacy_dr->mask |= 1 << i;
-                else if (rc == -EBUSY)
-                        (*was_busy)++;
-        }
-
-        if (!legacy_dr->mask)
-                return -EBUSY;
-
-        for (i = 0; i < 2; i++)
-                if (!(legacy_dr->mask & (1 << i)))
+                else {
+                        if (rc == -EBUSY)
+                                (*was_busy)++;
                         host->ports[i]->ops = &ata_dummy_port_ops;
+                }
+        }
 
-        *legacy_mask |= legacy_dr->mask;
+        if (!legacy_dr->mask) {
+                dev_printk(KERN_ERR, gdev, "no available legacy port\n");
+                return -ENODEV;
+        }
 
         devres_remove_group(gdev, NULL);
         return 0;
@@ -875,7 +879,7 @@ static int ata_request_legacy_irqs(struct ata_host *host,
         legacy_dr = devres_find(host->dev, ata_legacy_release, NULL, NULL);
         BUG_ON(!legacy_dr);
 
-        for (i = 0; i < host->n_ports; i++) {
+        for (i = 0; i < 2; i++) {
                 unsigned int irq;
 
                 /* FIXME: ATA_*_IRQ() should take generic device not pci_dev */
@@ -923,8 +927,7 @@ static int ata_request_legacy_irqs(struct ata_host *host,
 /**
  *      ata_pci_init_one - Initialize/register PCI IDE host controller
  *      @pdev: Controller to be initialized
- *      @port_info: Information from low-level host driver
- *      @n_ports: Number of ports attached to host controller
+ *      @ppi: array of port_info, must be enough for two ports
  *
  *      This is a helper function which can be called from a driver's
  *      xxx_init_one() probe function if the hardware uses traditional
@@ -944,26 +947,34 @@ static int ata_request_legacy_irqs(struct ata_host *host,
  *      RETURNS:
  *      Zero on success, negative on errno-based value on error.
  */
-
-int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
-                      unsigned int n_ports)
+int ata_pci_init_one(struct pci_dev *pdev,
+                     const struct ata_port_info * const * ppi)
 {
         struct device *dev = &pdev->dev;
+        const struct ata_port_info *pi = NULL;
         struct ata_host *host = NULL;
-        const struct ata_port_info *port[2];
         u8 mask;
-        unsigned int legacy_mode = 0;
-        int rc;
+        int legacy_mode = 0;
+        int i, rc;
 
         DPRINTK("ENTER\n");
 
-        if (!devres_open_group(dev, NULL, GFP_KERNEL))
-                return -ENOMEM;
+        /* look up the first valid port_info */
+        for (i = 0; i < 2 && ppi[i]; i++) {
+                if (ppi[i]->port_ops != &ata_dummy_port_ops) {
+                        pi = ppi[i];
+                        break;
+                }
+        }
 
-        BUG_ON(n_ports < 1 || n_ports > 2);
+        if (!pi) {
+                dev_printk(KERN_ERR, &pdev->dev,
+                           "no valid port_info specified\n");
+                return -EINVAL;
+        }
 
-        port[0] = port_info[0];
-        port[1] = (n_ports > 1) ? port_info[1] : NULL;
+        if (!devres_open_group(dev, NULL, GFP_KERNEL))
+                return -ENOMEM;
 
         /* FIXME: Really for ATA it isn't safe because the device may be
            multi-purpose and we want to leave it alone if it was already
@@ -984,7 +995,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                 pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8);
                 mask = (1 << 2) | (1 << 0);
                 if ((tmp8 & mask) != mask)
-                        legacy_mode = (1 << 3);
+                        legacy_mode = 1;
 #if defined(CONFIG_NO_ATA_LEGACY)
                 /* Some platforms with PCI limits cannot address compat
                    port space. In that case we punt if their firmware has
@@ -998,7 +1009,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
         }
 
         /* alloc and init host */
-        host = ata_host_alloc_pinfo(dev, port, n_ports);
+        host = ata_host_alloc_pinfo(dev, ppi, 2);
         if (!host) {
                 dev_printk(KERN_ERR, &pdev->dev,
                            "failed to allocate ATA host\n");
@@ -1007,19 +1018,13 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
         }
 
         if (!legacy_mode) {
-                unsigned int port_mask;
-
-                port_mask = ATA_PORT_PRIMARY;
-                if (n_ports > 1)
-                        port_mask |= ATA_PORT_SECONDARY;
-
-                rc = ata_pci_init_native_host(host, port_mask);
+                rc = ata_pci_init_native_host(host);
                 if (rc)
                         goto err_out;
         } else {
                 int was_busy = 0;
 
-                rc = ata_init_legacy_host(host, &legacy_mode, &was_busy);
+                rc = ata_init_legacy_host(host, &was_busy);
                 if (was_busy)
                         pcim_pin_device(pdev);
                 if (rc)
@@ -1040,8 +1045,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                 goto err_out;
 
         if (!legacy_mode)
-                rc = devm_request_irq(dev, pdev->irq,
-                                      port_info[0]->port_ops->irq_handler,
+                rc = devm_request_irq(dev, pdev->irq, pi->port_ops->irq_handler,
                                       IRQF_SHARED, DRV_NAME, host);
         else {
                 irq_handler_t handler[2] = { host->ops->irq_handler,
@@ -1055,7 +1059,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                 goto err_out;
 
         /* register */
-        rc = ata_host_register(host, port_info[0]->sht);
+        rc = ata_host_register(host, pi->sht);
         if (rc)
                 goto err_out;
 
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 5f4d40cd3288..5e2466658420 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -75,7 +75,8 @@ extern unsigned ata_exec_internal_sg(struct ata_device *dev,
 extern unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd);
 extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                            unsigned int flags, u16 *id);
-extern int ata_dev_revalidate(struct ata_device *dev, unsigned int flags);
+extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags);
+extern int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags);
 extern int ata_dev_configure(struct ata_device *dev);
 extern int sata_down_spd_limit(struct ata_port *ap);
 extern int sata_set_spd_needed(struct ata_port *ap);
@@ -96,15 +97,15 @@ extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);
 extern struct ata_port *ata_port_alloc(struct ata_host *host);
 
 /* libata-acpi.c */
-#ifdef CONFIG_SATA_ACPI
+#ifdef CONFIG_ATA_ACPI
 extern int ata_acpi_exec_tfs(struct ata_port *ap);
-extern int ata_acpi_push_id(struct ata_port *ap, unsigned int ix);
+extern int ata_acpi_push_id(struct ata_device *dev);
 #else
 static inline int ata_acpi_exec_tfs(struct ata_port *ap)
 {
         return 0;
 }
-static inline int ata_acpi_push_id(struct ata_port *ap, unsigned int ix)
+static inline int ata_acpi_push_id(struct ata_device *dev)
 {
         return 0;
 }
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index d40edebb510a..3c55a5ff74c7 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -291,10 +291,6 @@ static struct scsi_host_template ali_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 /*
@@ -522,14 +518,14 @@ static void ali_init_chipset(struct pci_dev *pdev)
 
 static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info_early = {
+        static const struct ata_port_info info_early = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .port_ops = &ali_early_port_ops
         };
         /* Revision 0x20 added DMA */
-        static struct ata_port_info info_20 = {
+        static const struct ata_port_info info_20 = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
@@ -537,7 +533,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &ali_20_port_ops
         };
         /* Revision 0x20 with support logic added UDMA */
-        static struct ata_port_info info_20_udma = {
+        static const struct ata_port_info info_20_udma = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
@@ -546,7 +542,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &ali_20_port_ops
         };
         /* Revision 0xC2 adds UDMA66 */
-        static struct ata_port_info info_c2 = {
+        static const struct ata_port_info info_c2 = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
@@ -555,7 +551,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC3 is UDMA100 */
-        static struct ata_port_info info_c3 = {
+        static const struct ata_port_info info_c3 = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
@@ -564,7 +560,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC4 is UDMA133 */
-        static struct ata_port_info info_c4 = {
+        static const struct ata_port_info info_c4 = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
                 .pio_mask = 0x1f,
@@ -573,7 +569,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &ali_c2_port_ops
         };
         /* Revision 0xC5 is UDMA133 with LBA48 DMA */
-        static struct ata_port_info info_c5 = {
+        static const struct ata_port_info info_c5 = {
                 .sht = &ali_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -582,7 +578,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &ali_c5_port_ops
         };
 
-        static struct ata_port_info *port_info[2];
+        const struct ata_port_info *ppi[] = { NULL, NULL };
         u8 rev, tmp;
         struct pci_dev *isa_bridge;
 
@@ -594,17 +590,17 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
          */
 
         if (rev < 0x20) {
-                port_info[0] = port_info[1] = &info_early;
+                ppi[0] = &info_early;
         } else if (rev < 0xC2) {
-                port_info[0] = port_info[1] = &info_20;
+                ppi[0] = &info_20;
         } else if (rev == 0xC2) {
-                port_info[0] = port_info[1] = &info_c2;
+                ppi[0] = &info_c2;
         } else if (rev == 0xC3) {
-                port_info[0] = port_info[1] = &info_c3;
+                ppi[0] = &info_c3;
         } else if (rev == 0xC4) {
-                port_info[0] = port_info[1] = &info_c4;
+                ppi[0] = &info_c4;
         } else
-                port_info[0] = port_info[1] = &info_c5;
+                ppi[0] = &info_c5;
 
         ali_init_chipset(pdev);
 
@@ -613,10 +609,10 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 /* Are we paired with a UDMA capable chip */
                 pci_read_config_byte(isa_bridge, 0x5E, &tmp);
                 if ((tmp & 0x1E) == 0x12)
-                        port_info[0] = port_info[1] = &info_20_udma;
+                        ppi[0] = &info_20_udma;
                 pci_dev_put(isa_bridge);
         }
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 536ee892ab72..b439351f1fd3 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -121,12 +121,13 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
 /**
  *      amd_probe_init          -       perform reset handling
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Reset sequence checking enable bits to see which ports are
  *      active.
  */
 
-static int amd_pre_reset(struct ata_port *ap)
+static int amd_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits amd_enable_bits[] = {
                 { 0x40, 1, 0x02, 0x02 },
@@ -138,8 +139,7 @@ static int amd_pre_reset(struct ata_port *ap)
         if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(ap);
-
+        return ata_std_prereset(ap, deadline);
 }
 
 static void amd_error_handler(struct ata_port *ap)
@@ -227,7 +227,8 @@ static void amd133_set_dmamode(struct ata_port *ap, struct ata_device *adev)
  *      space for us.
  */
 
-static int nv_pre_reset(struct ata_port *ap) {
+static int nv_pre_reset(struct ata_port *ap, unsigned long deadline)
+{
         static const struct pci_bits nv_enable_bits[] = {
                 { 0x50, 1, 0x02, 0x02 },
                 { 0x50, 1, 0x01, 0x01 }
@@ -238,7 +239,7 @@ static int nv_pre_reset(struct ata_port *ap) {
         if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 static void nv_error_handler(struct ata_port *ap)
@@ -323,10 +324,6 @@ static struct scsi_host_template amd_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations amd33_port_ops = {
@@ -541,7 +538,7 @@ static struct ata_port_operations nv133_port_ops = {
 
 static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info[10] = {
+        static const struct ata_port_info info[10] = {
                 {       /* 0: AMD 7401 */
                         .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -623,7 +620,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd100_port_ops
                 }
         };
-        static struct ata_port_info *port_info[2];
+        const struct ata_port_info *ppi[] = { NULL, NULL };
         static int printed_version;
         int type = id->driver_data;
         u8 rev;
@@ -655,9 +652,8 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ata_pci_clear_simplex(pdev);
 
         /* And fire it up */
-
-        port_info[0] = port_info[1] = &info[type];
-        return ata_pci_init_one(pdev, port_info, 2);
+        ppi[0] = &info[type];
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 00e9ec342db0..7b4810c171b7 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -28,7 +28,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME        "pata_artop"
-#define DRV_VERSION     "0.4.2"
+#define DRV_VERSION     "0.4.3"
 
 /*
  *      The ARTOP has 33 Mhz and "over clocked" timing tables. Until we
@@ -39,7 +39,7 @@
 
 static int clock = 0;
 
-static int artop6210_pre_reset(struct ata_port *ap)
+static int artop6210_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         const struct pci_bits artop_enable_bits[] = {
@@ -49,7 +49,8 @@ static int artop6210_pre_reset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -70,12 +71,13 @@ static void artop6210_error_handler(struct ata_port *ap)
 /**
  *      artop6260_pre_reset     -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      The ARTOP hardware reports the cable detect bits in register 0x49.
  *      Nothing complicated needed here.
  */
 
-static int artop6260_pre_reset(struct ata_port *ap)
+static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits artop_enable_bits[] = {
                 { 0x4AU, 1U, 0x02UL, 0x02UL },  /* port 0 */
@@ -87,7 +89,8 @@ static int artop6260_pre_reset(struct ata_port *ap)
         /* Odd numbered device ids are the units with enable bits (the -R cards) */
         if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -96,7 +99,7 @@ static int artop6260_pre_reset(struct ata_port *ap)
  *
  *      Identify the cable type for the ARTOp interface in question
  */
- 
+
 static int artop6260_cable_detect(struct ata_port *ap)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
@@ -411,7 +414,7 @@ static const struct ata_port_operations artop6260_ops = {
 static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static int printed_version;
-        static struct ata_port_info info_6210 = {
+        static const struct ata_port_info info_6210 = {
                 .sht            = &artop_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -419,7 +422,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask      = ATA_UDMA2,
                 .port_ops       = &artop6210_ops,
         };
-        static struct ata_port_info info_626x = {
+        static const struct ata_port_info info_626x = {
                 .sht            = &artop_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -427,7 +430,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask      = ATA_UDMA4,
                 .port_ops       = &artop6260_ops,
         };
-        static struct ata_port_info info_626x_fast = {
+        static const struct ata_port_info info_626x_fast = {
                 .sht            = &artop_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -435,32 +438,30 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask      = ATA_UDMA5,
                 .port_ops       = &artop6260_ops,
         };
-        struct ata_port_info *port_info[2];
-        struct ata_port_info *info = NULL;
-        int ports = 2;
+        const struct ata_port_info *ppi[] = { NULL, NULL };
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
         if (id->driver_data == 0) {     /* 6210 variant */
-                info = &info_6210;
+                ppi[0] = &info_6210;
+                ppi[1] = &ata_dummy_port_info;
                 /* BIOS may have left us in UDMA, clear it before libata probe */
                 pci_write_config_byte(pdev, 0x54, 0);
                 /* For the moment (also lacks dsc) */
                 printk(KERN_WARNING "ARTOP 6210 requires serialize functionality not yet supported by libata.\n");
                 printk(KERN_WARNING "Secondary ATA ports will not be activated.\n");
-                ports = 1;
         }
         else if (id->driver_data == 1)  /* 6260 */
-                info = &info_626x;
+                ppi[0] = &info_626x;
         else if (id->driver_data == 2)  { /* 6260 or 6260 + fast */
                 unsigned long io = pci_resource_start(pdev, 4);
                 u8 reg;
 
-                info = &info_626x;
+                ppi[0] = &info_626x;
                 if (inb(io) & 0x10)
-                        info = &info_626x_fast;
+                        ppi[0] = &info_626x_fast;
                 /* Mac systems come up with some registers not set as we
                    will need them */
 
@@ -481,10 +482,9 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 
         }
 
-        BUG_ON(info == NULL);
+        BUG_ON(ppi[0] == NULL);
 
-        port_info[0] = port_info[1] = info;
-        return ata_pci_init_one(pdev, port_info, ports);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id artop_pci_tbl[] = {
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 39c871a3ddac..844914681a2a 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -33,7 +33,7 @@ enum {
         ATIIXP_IDE_UDMA_MODE    = 0x56
 };
 
-static int atiixp_pre_reset(struct ata_port *ap)
+static int atiixp_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits atiixp_enable_bits[] = {
                 { 0x48, 1, 0x01, 0x00 },
@@ -44,7 +44,7 @@ static int atiixp_pre_reset(struct ata_port *ap)
         if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 static void atiixp_error_handler(struct ata_port *ap)
@@ -229,10 +229,6 @@ static struct scsi_host_template atiixp_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations atiixp_port_ops = {
@@ -272,7 +268,7 @@ static struct ata_port_operations atiixp_port_ops = {
 
 static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &atiixp_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -280,8 +276,8 @@ static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x3F,
                 .port_ops = &atiixp_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
-        return ata_pci_init_one(dev, port_info, 2);
+        const struct ata_port_info *ppi[] = { &info, NULL };
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id atiixp[] = {
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 2105985a8013..31cbf8daa299 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -107,7 +107,7 @@ static void cmd640_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 pci_write_config_byte(pdev, arttim + 1, (t.active << 4) | t.recover);
         } else {
                 /* Save the shared timings for channel, they will be loaded
-                   by qc_issue_prot. Reloading the setup time is expensive 
+                   by qc_issue_prot. Reloading the setup time is expensive
                    so we keep a merged one loaded */
                 pci_read_config_byte(pdev, ARTIM23, &reg);
                 reg &= 0x3F;
@@ -181,10 +181,6 @@ static struct scsi_host_template cmd640_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations cmd640_port_ops = {
@@ -235,7 +231,7 @@ static void cmd640_hardware_init(struct pci_dev *pdev)
         pci_write_config_byte(pdev, CMDTIM, 0);
         /* 512 byte bursts (sector) */
         pci_write_config_byte(pdev, BRST, 0x40);
-        /* 
+        /*
          * A reporter a long time ago
          * Had problems with the data fifo
          * So don't run the risk
@@ -253,17 +249,16 @@ static void cmd640_hardware_init(struct pci_dev *pdev)
 
 static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &cmd640_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .port_ops = &cmd640_port_ops
         };
-
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         cmd640_hardware_init(pdev);
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static int cmd640_reinit_one(struct pci_dev *pdev)
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 3989cc577fcd..320a5b10aa98 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -31,7 +31,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_cmd64x"
-#define DRV_VERSION "0.2.2"
+#define DRV_VERSION "0.2.3"
 
 /*
  * CMD64x specific registers definition.
@@ -266,10 +266,6 @@ static struct scsi_host_template cmd64x_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations cmd64x_port_ops = {
@@ -381,7 +377,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         u32 class_rev;
 
-        static struct ata_port_info cmd_info[6] = {
+        static const struct ata_port_info cmd_info[6] = {
                 {       /* CMD 643 - no UDMA */
                         .sht = &cmd64x_sht,
                         .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -428,11 +424,9 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &cmd648_port_ops
                 }
         };
-        static struct ata_port_info *port_info[2], *info;
+        const struct ata_port_info *ppi[] = { &cmd_info[id->driver_data], NULL };
         u8 mrdmode;
 
-        info = &cmd_info[id->driver_data];
-
         pci_read_config_dword(pdev, PCI_CLASS_REVISION, &class_rev);
         class_rev &= 0xFF;
 
@@ -442,10 +436,10 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (pdev->device == PCI_DEVICE_ID_CMD_646) {
                 /* Does UDMA work ? */
                 if (class_rev > 4)
-                        info = &cmd_info[2];
+                        ppi[0] = &cmd_info[2];
                 /* Early rev with other problems ? */
                 else if (class_rev == 1)
-                        info = &cmd_info[3];
+                        ppi[0] = &cmd_info[3];
         }
 
         pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 64);
@@ -461,8 +455,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         pci_write_config_byte(pdev, UDIDETCR0, 0xF0);
 #endif
 
-        port_info[0] = port_info[1] = info;
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 79bef0d1fad3..1aabe15ad9d3 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_cs5520"
-#define DRV_VERSION     "0.6.4"
+#define DRV_VERSION     "0.6.5"
 
 struct pio_clocks
 {
@@ -155,10 +155,6 @@ static struct scsi_host_template cs5520_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations cs5520_port_ops = {
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 29642d5ee189..848f0309bf03 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -35,7 +35,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME        "pata_cs5530"
-#define DRV_VERSION     "0.7.2"
+#define DRV_VERSION     "0.7.3"
 
 static void __iomem *cs5530_port_base(struct ata_port *ap)
 {
@@ -176,10 +176,6 @@ static struct scsi_host_template cs5530_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations cs5530_port_ops = {
@@ -339,7 +335,7 @@ fail_put:
 
 static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &cs5530_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -348,23 +344,23 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &cs5530_port_ops
         };
         /* The docking connector doesn't do UDMA, and it seems not MWDMA */
-        static struct ata_port_info info_palmax_secondary = {
+        static const struct ata_port_info info_palmax_secondary = {
                 .sht = &cs5530_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .port_ops = &cs5530_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         /* Chip initialisation */
         if (cs5530_init_chip())
                 return -ENODEV;
 
         if (cs5530_is_palmax())
-                port_info[1] = &info_palmax_secondary;
+                ppi[1] = &info_palmax_secondary;
 
         /* Now kick off ATA set up */
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 08cccc9c659b..aa3256fb9f7a 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -39,7 +39,7 @@
 #include <asm/msr.h>
 
 #define DRV_NAME        "cs5535"
-#define DRV_VERSION     "0.2.11"
+#define DRV_VERSION     "0.2.12"
 
 /*
  *      The Geode (Aka Athlon GX now) uses an internal MSR based
@@ -72,6 +72,7 @@
 /**
  *      cs5535_cable_detect     -       detect cable type
  *      @ap: Port to detect on
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection for ATA66 capable cable. Return a libata
  *      cable type.
@@ -172,10 +173,6 @@ static struct scsi_host_template cs5535_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations cs5535_port_ops = {
@@ -226,7 +223,7 @@ static struct ata_port_operations cs5535_port_ops = {
 
 static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &cs5535_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -234,7 +231,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x1f,
                 .port_ops = &cs5535_port_ops
         };
-        struct ata_port_info *ports[1] = { &info };
+        const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
 
         u32 timings, dummy;
 
@@ -246,7 +243,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         rdmsr(ATAC_CH0D1_PIO, timings, dummy);
         if (CS5535_BAD_PIO(timings))
                 wrmsr(ATAC_CH0D1_PIO, 0xF7F4F7F4UL, 0);
-        return ata_pci_init_one(dev, ports, 1);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id cs5535[] = {
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 6ec049c3b1dc..d41a7691dd8e 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -18,7 +18,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_cypress"
-#define DRV_VERSION "0.1.4"
+#define DRV_VERSION "0.1.5"
 
 /* here are the offset definitions for the registers */
 
@@ -125,10 +125,6 @@ static struct scsi_host_template cy82c693_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations cy82c693_port_ops = {
@@ -169,14 +165,14 @@ static struct ata_port_operations cy82c693_port_ops = {
 
 static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &cy82c693_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &cy82c693_port_ops
         };
-        static struct ata_port_info *port_info[1] = { &info };
+        const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
 
         /* Devfn 1 is the ATA primary. The secondary is magic and on devfn2.
            For the moment we don't handle the secondary. FIXME */
@@ -184,7 +180,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *i
         if (PCI_FUNC(pdev->devfn) != 1)
                 return -ENODEV;
 
-        return ata_pci_init_one(pdev, port_info, 1);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id cy82c693[] = {
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index a3216850bba1..079248a9b460 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -27,12 +27,13 @@
 /**
  *      efar_pre_reset  -       Enable bits
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection for the EFAR ATA interface. This is
  *      different to the PIIX arrangement
  */
 
-static int efar_pre_reset(struct ata_port *ap)
+static int efar_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits efar_enable_bits[] = {
                 { 0x41U, 1U, 0x80UL, 0x80UL },  /* port 0 */
@@ -43,7 +44,7 @@ static int efar_pre_reset(struct ata_port *ap)
         if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -246,10 +247,6 @@ static struct scsi_host_template efar_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations efar_ops = {
@@ -304,7 +301,7 @@ static const struct ata_port_operations efar_ops = {
 static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &efar_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -312,13 +309,13 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 .udma_mask      = 0x0f, /* UDMA 66 */
                 .port_ops       = &efar_ops,
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id efar_pci_tbl[] = {
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 93cfa6d300a5..0c9cb6090711 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -220,32 +220,6 @@ static int hpt36x_cable_detect(struct ata_port *ap)
         return ATA_CBL_PATA80;
 }
 
-static int hpt36x_pre_reset(struct ata_port *ap)
-{
-        static const struct pci_bits hpt36x_enable_bits[] = {
-                { 0x50, 1, 0x04, 0x04 },
-                { 0x54, 1, 0x04, 0x04 }
-        };
-        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-
-        if (!pci_test_config_bits(pdev, &hpt36x_enable_bits[ap->port_no]))
-                return -ENOENT;
-
-        return ata_std_prereset(ap);
-}
-
-/**
- *      hpt36x_error_handler    -       reset the hpt36x bus
- *      @ap: ATA port to reset
- *
- *      Perform the reset handling for the 366/368
- */
-
-static void hpt36x_error_handler(struct ata_port *ap)
-{
-        ata_bmdma_drive_eh(ap, hpt36x_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
-}
-
 /**
  *      hpt366_set_piomode              -       PIO setup
  *      @ap: ATA interface
@@ -331,10 +305,6 @@ static struct scsi_host_template hpt36x_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 /*
@@ -355,7 +325,7 @@ static struct ata_port_operations hpt366_port_ops = {
 
         .freeze         = ata_bmdma_freeze,
         .thaw           = ata_bmdma_thaw,
-        .error_handler  = hpt36x_error_handler,
+        .error_handler  = ata_bmdma_error_handler,
         .post_internal_cmd = ata_bmdma_post_internal_cmd,
         .cable_detect   = hpt36x_cable_detect,
 
@@ -421,7 +391,7 @@ static void hpt36x_init_chipset(struct pci_dev *dev)
 
 static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info_hpt366 = {
+        static const struct ata_port_info info_hpt366 = {
                 .sht = &hpt36x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -429,7 +399,8 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x1f,
                 .port_ops = &hpt366_port_ops
         };
-        struct ata_port_info *port_info[2] = {&info_hpt366, &info_hpt366};
+        struct ata_port_info info = info_hpt366;
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         u32 class_rev;
         u32 reg1;
@@ -450,17 +421,17 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         /* info_hpt366 is safe against re-entry so we can scribble on it */
         switch((reg1 & 0x700) >> 8) {
                 case 5:
-                        info_hpt366.private_data = &hpt366_40;
+                        info.private_data = &hpt366_40;
                         break;
                 case 9:
-                        info_hpt366.private_data = &hpt366_25;
+                        info.private_data = &hpt366_25;
                         break;
                 default:
-                        info_hpt366.private_data = &hpt366_33;
+                        info.private_data = &hpt366_33;
                         break;
         }
         /* Now kick off ATA set up */
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 41d831296347..a54c17433eef 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -307,11 +307,12 @@ static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
 /**
  *      hpt37x_pre_reset        -       reset the hpt37x bus
  *      @ap: ATA port to reset
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform the initial reset handling for the 370/372 and 374 func 0
  */
 
-static int hpt37x_pre_reset(struct ata_port *ap)
+static int hpt37x_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         u8 scr2, ata66;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
@@ -338,7 +339,7 @@ static int hpt37x_pre_reset(struct ata_port *ap)
         pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
         udelay(100);
 
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -353,7 +354,7 @@ static void hpt37x_error_handler(struct ata_port *ap)
         ata_bmdma_drive_eh(ap, hpt37x_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
 }
 
-static int hpt374_pre_reset(struct ata_port *ap)
+static int hpt374_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits hpt37x_enable_bits[] = {
                 { 0x50, 1, 0x04, 0x04 },
@@ -388,7 +389,7 @@ static int hpt374_pre_reset(struct ata_port *ap)
         pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
         udelay(100);
 
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -886,7 +887,7 @@ static int hpt37x_calibrate_dpll(struct pci_dev *dev)
 static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         /* HPT370 - UDMA100 */
-        static struct ata_port_info info_hpt370 = {
+        static const struct ata_port_info info_hpt370 = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -895,7 +896,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .port_ops = &hpt370_port_ops
         };
         /* HPT370A - UDMA100 */
-        static struct ata_port_info info_hpt370a = {
+        static const struct ata_port_info info_hpt370a = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -904,7 +905,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .port_ops = &hpt370a_port_ops
         };
         /* HPT370 - UDMA100 */
-        static struct ata_port_info info_hpt370_33 = {
+        static const struct ata_port_info info_hpt370_33 = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -913,7 +914,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .port_ops = &hpt370_port_ops
         };
         /* HPT370A - UDMA100 */
-        static struct ata_port_info info_hpt370a_33 = {
+        static const struct ata_port_info info_hpt370a_33 = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -922,7 +923,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .port_ops = &hpt370a_port_ops
         };
         /* HPT371, 372 and friends - UDMA133 */
-        static struct ata_port_info info_hpt372 = {
+        static const struct ata_port_info info_hpt372 = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -931,7 +932,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .port_ops = &hpt372_port_ops
         };
         /* HPT371, 372 and friends - UDMA100 at 50MHz clock */
-        static struct ata_port_info info_hpt372_50 = {
+        static const struct ata_port_info info_hpt372_50 = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -940,7 +941,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .port_ops = &hpt372_port_ops
         };
         /* HPT374 - UDMA133 */
-        static struct ata_port_info info_hpt374 = {
+        static const struct ata_port_info info_hpt374 = {
                 .sht = &hpt37x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -950,16 +951,17 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         };
 
         static const int MHz[4] = { 33, 40, 50, 66 };
-
-        struct ata_port_info *port_info[2];
-        struct ata_port_info *port;
+        const struct ata_port_info *port;
+        void *private_data = NULL;
+        struct ata_port_info port_info;
+        const struct ata_port_info *ppi[] = { &port_info, NULL };
 
         u8 irqmask;
         u32 class_rev;
         u8 mcr1;
         u32 freq;
         int prefer_dpll = 1;
-        
+
         unsigned long iobase = pci_resource_start(dev, 4);
 
         const struct hpt_chip *chip_table;
@@ -1053,7 +1055,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
          */
 
         pci_write_config_byte(dev, 0x5b, 0x23);
-        
+
         /*
          * HighPoint does this for HPT372A.
          * NOTE: This register is only writeable via I/O space.
@@ -1086,7 +1088,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
          *      Turn the frequency check into a band and then find a timing
          *      table to match it.
          */
-         
+
         clock_slot = hpt37x_clock_slot(freq, chip_table->base);
         if (chip_table->clocks[clock_slot] == NULL || prefer_dpll) {
                 /*
@@ -1097,11 +1099,11 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                  */
                 unsigned int f_low, f_high;
                 int adjust;
-                
+
                 clock_slot = 2;
                 if (port->udma_mask & 0xE0)
                         clock_slot = 3;
-                
+
                 f_low = (MHz[clock_slot] * chip_table->base) / 192;
                 f_high = f_low + 2;
 
@@ -1123,13 +1125,13 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                         return -ENODEV;
                 }
                 if (clock_slot == 3)
-                        port->private_data = (void *)hpt37x_timings_66;
+                        private_data = (void *)hpt37x_timings_66;
                 else
-                        port->private_data = (void *)hpt37x_timings_50;
+                        private_data = (void *)hpt37x_timings_50;
 
                 printk(KERN_INFO "hpt37x: Bus clock %dMHz, using DPLL.\n", MHz[clock_slot]);
         } else {
-                port->private_data = (void *)chip_table->clocks[clock_slot];
+                private_data = (void *)chip_table->clocks[clock_slot];
                 /*
                  *      Perform a final fixup. Note that we will have used the
                  *      DPLL on the HPT372 which means we don't have to worry
@@ -1143,9 +1145,11 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 printk(KERN_INFO "hpt37x: %s: Bus clock %dMHz.\n", chip_table->name, MHz[clock_slot]);
         }
 
-        port_info[0] = port_info[1] = port;
         /* Now kick off ATA set up */
-        return ata_pci_init_one(dev, port_info, 2);
+        port_info = *port;
+        port_info.private_data = private_data;
+
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id hpt37x[] = {
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 6a34521b9e01..f25154aed75d 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -148,13 +148,14 @@ static int hpt3x2n_cable_detect(struct ata_port *ap)
  *      Reset the hardware and state machine,
  */
 
-static int hpt3xn_pre_reset(struct ata_port *ap)
+static int hpt3xn_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         /* Reset the state machine */
         pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37);
         udelay(100);
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -487,7 +488,7 @@ static int hpt3x2n_pci_clock(struct pci_dev *pdev)
 static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         /* HPT372N and friends - UDMA133 */
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &hpt3x2n_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -495,8 +496,8 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x7f,
                 .port_ops = &hpt3x2n_port_ops
         };
-        struct ata_port_info *port_info[2];
-        struct ata_port_info *port = &info;
+        struct ata_port_info port = info;
+        const struct ata_port_info *ppi[] = { &port, NULL };
 
         u8 irqmask;
         u32 class_rev;
@@ -584,9 +585,9 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 
         /* Set our private data up. We only need a few flags so we use
            it directly */
-        port->private_data = NULL;
+        port.private_data = NULL;
         if (pci_mhz > 60) {
-                port->private_data = (void *)PCI66;
+                port.private_data = (void *)PCI66;
                 /*
                  * On  HPT371N, if ATA clock is 66 MHz we must set bit 2 in
                  * the MISC. register to stretch the UltraDMA Tss timing.
@@ -597,8 +598,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         }
 
         /* Now kick off ATA set up */
-        port_info[0] = port_info[1] = port;
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id hpt3x2n[] = {
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index ac28ec8c50aa..8ce5e23a5f75 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -23,7 +23,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_hpt3x3"
-#define DRV_VERSION     "0.4.2"
+#define DRV_VERSION     "0.4.3"
 
 /**
  *      hpt3x3_set_piomode              -       PIO setup
@@ -100,10 +100,6 @@ static struct scsi_host_template hpt3x3_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations hpt3x3_port_ops = {
@@ -175,7 +171,7 @@ static void hpt3x3_init_chipset(struct pci_dev *dev)
 
 static int hpt3x3_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &hpt3x3_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -183,11 +179,11 @@ static int hpt3x3_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x07,
                 .port_ops = &hpt3x3_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         hpt3x3_init_chipset(dev);
         /* Now kick off ATA set up */
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index dbc8ee2adcf0..c791a46df461 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -60,6 +60,18 @@ struct pata_icside_state {
         struct scatterlist sg[PATA_ICSIDE_MAX_SG];
 };
 
+struct pata_icside_info {
+        struct pata_icside_state *state;
+        struct expansion_card   *ec;
+        void __iomem            *base;
+        void __iomem            *irqaddr;
+        unsigned int            irqmask;
+        const expansioncard_ops_t *irqops;
+        unsigned int            mwdma_mask;
+        unsigned int            nr_ports;
+        const struct portinfo   *port[2];
+};
+
 #define ICS_TYPE_A3IN   0
 #define ICS_TYPE_A3USER 1
 #define ICS_TYPE_V6     3
@@ -269,9 +281,10 @@ static u8 pata_icside_bmdma_status(struct ata_port *ap)
         return readb(irq_port) & 1 ? ATA_DMA_INTR : 0;
 }
 
-static int icside_dma_init(struct ata_probe_ent *ae, struct expansion_card *ec)
+static int icside_dma_init(struct pata_icside_info *info)
 {
-        struct pata_icside_state *state = ae->private_data;
+        struct pata_icside_state *state = info->state;
+        struct expansion_card *ec = info->ec;
         int i;
 
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
@@ -281,7 +294,7 @@ static int icside_dma_init(struct ata_probe_ent *ae, struct expansion_card *ec)
 
         if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
                 state->dma = ec->dma;
-                ae->mwdma_mask = 0x07;  /* MW0..2 */
+                info->mwdma_mask = 0x07;        /* MW0..2 */
         }
 
         return 0;
@@ -371,6 +384,8 @@ static struct ata_port_operations pata_icside_port_ops = {
         .check_status           = ata_check_status,
         .dev_select             = ata_std_dev_select,
 
+        .cable_detect           = ata_cable_40wire,
+
         .bmdma_setup            = pata_icside_bmdma_setup,
         .bmdma_start            = pata_icside_bmdma_start,
 
@@ -385,7 +400,6 @@ static struct ata_port_operations pata_icside_port_ops = {
         .error_handler          = ata_bmdma_error_handler,
         .post_internal_cmd      = pata_icside_bmdma_stop,
 
-        .irq_handler            = ata_interrupt,
         .irq_clear              = ata_dummy_noret,
         .irq_on                 = ata_irq_on,
         .irq_ack                = pata_icside_irq_ack,
@@ -396,11 +410,10 @@ static struct ata_port_operations pata_icside_port_ops = {
         .bmdma_status           = pata_icside_bmdma_status,
 };
 
-static void
-pata_icside_add_port(struct ata_probe_ent *ae, void __iomem *base,
-                     const struct portinfo *info)
+static void __devinit
+pata_icside_setup_ioaddr(struct ata_ioports *ioaddr, void __iomem *base,
+                         const struct portinfo *info)
 {
-        struct ata_ioports *ioaddr = &ae->port[ae->n_ports++];
         void __iomem *cmd = base + info->dataoffset;
 
         ioaddr->cmd_addr        = cmd;
@@ -419,58 +432,44 @@ pata_icside_add_port(struct ata_probe_ent *ae, void __iomem *base,
         ioaddr->altstatus_addr  = ioaddr->ctl_addr;
 }
 
-static int __init
-pata_icside_register_v5(struct ata_probe_ent *ae, struct expansion_card *ec)
+static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
 {
-        struct pata_icside_state *state = ae->private_data;
+        struct pata_icside_state *state = info->state;
         void __iomem *base;
 
-        base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                       ecard_resource_len(ec, ECARD_RES_MEMC));
+        base = ecardm_iomap(info->ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
                 return -ENOMEM;
 
         state->irq_port = base;
 
-        ec->irqaddr = base + ICS_ARCIN_V5_INTRSTAT;
-        ec->irqmask = 1;
-        ec->irq_data = state;
-        ec->ops = &pata_icside_ops_arcin_v5;
-
-        /*
-         * Be on the safe side - disable interrupts
-         */
-        ec->ops->irqdisable(ec, ec->irq);
-
-        pata_icside_add_port(ae, base, &pata_icside_portinfo_v5);
+        info->base = base;
+        info->irqaddr = base + ICS_ARCIN_V5_INTRSTAT;
+        info->irqmask = 1;
+        info->irqops = &pata_icside_ops_arcin_v5;
+        info->nr_ports = 1;
+        info->port[0] = &pata_icside_portinfo_v5;
 
         return 0;
 }
 
-static int __init
-pata_icside_register_v6(struct ata_probe_ent *ae, struct expansion_card *ec)
+static int __devinit pata_icside_register_v6(struct pata_icside_info *info)
 {
-        struct pata_icside_state *state = ae->private_data;
+        struct pata_icside_state *state = info->state;
+        struct expansion_card *ec = info->ec;
         void __iomem *ioc_base, *easi_base;
         unsigned int sel = 0;
-        int ret;
 
-        ioc_base = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                           ecard_resource_len(ec, ECARD_RES_IOCFAST));
-        if (!ioc_base) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
+        if (!ioc_base)
+                return -ENOMEM;
 
         easi_base = ioc_base;
 
         if (ecard_resource_flags(ec, ECARD_RES_EASI)) {
-                easi_base = ioremap(ecard_resource_start(ec, ECARD_RES_EASI),
-                                    ecard_resource_len(ec, ECARD_RES_EASI));
-                if (!easi_base) {
-                        ret = -ENOMEM;
-                        goto unmap_slot;
-                }
+                easi_base = ecardm_iomap(ec, ECARD_RES_EASI, 0, 0);
+                if (!easi_base)
+                        return -ENOMEM;
 
                 /*
                  * Enable access to the EASI region.
@@ -480,45 +479,72 @@ pata_icside_register_v6(struct ata_probe_ent *ae, struct expansion_card *ec)
 
         writeb(sel, ioc_base);
 
-        ec->irq_data = state;
-        ec->ops = &pata_icside_ops_arcin_v6;
-
         state->irq_port = easi_base;
         state->ioc_base = ioc_base;
         state->port[0].port_sel = sel;
         state->port[1].port_sel = sel | 1;
 
         /*
-         * Be on the safe side - disable interrupts
-         */
-        ec->ops->irqdisable(ec, ec->irq);
-
-        /*
-         * Find and register the interfaces.
-         */
-        pata_icside_add_port(ae, easi_base, &pata_icside_portinfo_v6_1);
-        pata_icside_add_port(ae, easi_base, &pata_icside_portinfo_v6_2);
-
-        /*
          * FIXME: work around libata's aversion to calling port_disable.
          * This permanently disables interrupts on port 0 - bad luck if
          * you have a drive on that port.
          */
         state->port[0].disabled = 1;
 
-        return icside_dma_init(ae, ec);
+        info->base = easi_base;
+        info->irqops = &pata_icside_ops_arcin_v6;
+        info->nr_ports = 2;
+        info->port[0] = &pata_icside_portinfo_v6_1;
+        info->port[1] = &pata_icside_portinfo_v6_2;
 
- unmap_slot:
-        iounmap(ioc_base);
- out:
-        return ret;
+        return icside_dma_init(info);
+}
+
+static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
+{
+        struct expansion_card *ec = info->ec;
+        struct ata_host *host;
+        int i;
+
+        if (info->irqaddr) {
+                ec->irqaddr = info->irqaddr;
+                ec->irqmask = info->irqmask;
+        }
+        if (info->irqops)
+                ecard_setirq(ec, info->irqops, info->state);
+
+        /*
+         * Be on the safe side - disable interrupts
+         */
+        ec->ops->irqdisable(ec, ec->irq);
+
+        host = ata_host_alloc(&ec->dev, info->nr_ports);
+        if (!host)
+                return -ENOMEM;
+
+        host->private_data = info->state;
+        host->flags = ATA_HOST_SIMPLEX;
+
+        for (i = 0; i < info->nr_ports; i++) {
+                struct ata_port *ap = host->ports[i];
+
+                ap->pio_mask = 0x1f;
+                ap->mwdma_mask = info->mwdma_mask;
+                ap->flags |= ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
+                ap->ops = &pata_icside_port_ops;
+
+                pata_icside_setup_ioaddr(&ap->ioaddr, info->base, info->port[i]);
+        }
+
+        return ata_host_activate(host, ec->irq, ata_interrupt, 0,
+                                 &pata_icside_sht);
 }
 
 static int __devinit
 pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct pata_icside_state *state;
-        struct ata_probe_ent ae;
+        struct pata_icside_info info;
         void __iomem *idmem;
         int ret;
 
@@ -526,7 +552,7 @@ pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        state = kzalloc(sizeof(struct pata_icside_state), GFP_KERNEL);
+        state = devm_kzalloc(&ec->dev, sizeof(*state), GFP_KERNEL);
         if (!state) {
                 ret = -ENOMEM;
                 goto release;
@@ -535,8 +561,7 @@ pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
         state->type = ICS_TYPE_NOTYPE;
         state->dma = NO_DMA;
 
-        idmem = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                        ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        idmem = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (idmem) {
                 unsigned int type;
 
@@ -544,21 +569,14 @@ pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 4) & 1) << 1;
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 8) & 1) << 2;
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 12) & 1) << 3;
-                iounmap(idmem);
+                ecardm_iounmap(ec, idmem);
 
                 state->type = type;
         }
 
-        memset(&ae, 0, sizeof(ae));
-        INIT_LIST_HEAD(&ae.node);
-        ae.dev          = &ec->dev;
-        ae.port_ops     = &pata_icside_port_ops;
-        ae.sht          = &pata_icside_sht;
-        ae.pio_mask     = 0x1f;
-        ae.irq          = ec->irq;
-        ae.port_flags   = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
-        ae._host_flags  = ATA_HOST_SIMPLEX;
-        ae.private_data = state;
+        memset(&info, 0, sizeof(info));
+        info.state = state;
+        info.ec = ec;
 
         switch (state->type) {
         case ICS_TYPE_A3IN:
@@ -572,11 +590,11 @@ pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
                 break;
 
         case ICS_TYPE_V5:
-                ret = pata_icside_register_v5(&ae, ec);
+                ret = pata_icside_register_v5(&info);
                 break;
 
         case ICS_TYPE_V6:
-                ret = pata_icside_register_v6(&ae, ec);
+                ret = pata_icside_register_v6(&info);
                 break;
 
         default:
@@ -586,12 +604,11 @@ pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id)
         }
 
         if (ret == 0)
-                ret = ata_device_add(&ae) == 0 ? -ENODEV : 0;
+                ret = pata_icside_add_ports(&info);
 
         if (ret == 0)
                 goto out;
 
-        kfree(state);
  release:
         ecard_release_resources(ec);
  out:
@@ -609,8 +626,7 @@ static void pata_icside_shutdown(struct expansion_card *ec)
          * this register via that region.
          */
         local_irq_save(flags);
-        if (ec->ops)
-                ec->ops->irqdisable(ec, ec->irq);
+        ec->ops->irqdisable(ec, ec->irq);
         local_irq_restore(flags);
 
         /*
@@ -638,17 +654,9 @@ static void __devexit pata_icside_remove(struct expansion_card *ec)
          * don't NULL out the drvdata - devres/libata wants it
          * to free the ata_host structure.
          */
-        ec->ops = NULL;
-        ec->irq_data = NULL;
-
         if (state->dma != NO_DMA)
                 free_dma(state->dma);
-        if (state->ioc_base)
-                iounmap(state->ioc_base);
-        if (state->ioc_base != state->irq_port)
-                iounmap(state->irq_port);
 
-        kfree(state);
         ecard_release_resources(ec);
 }
 
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index d042efdfbac4..1f647b648204 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -17,7 +17,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_isapnp"
-#define DRV_VERSION "0.2.0"
+#define DRV_VERSION "0.2.1"
 
 static struct scsi_host_template isapnp_sht = {
         .module                 = THIS_MODULE,
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index 011306ef8334..95b0bb61788b 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -19,17 +19,18 @@
 #include <linux/ata.h>
 
 #define DRV_NAME        "pata_it8213"
-#define DRV_VERSION     "0.0.2"
+#define DRV_VERSION     "0.0.3"
 
 /**
  *      it8213_pre_reset        -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Filter out ports by the enable bits before doing the normal reset
  *      and probe.
  */
 
-static int it8213_pre_reset(struct ata_port *ap)
+static int it8213_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits it8213_enable_bits[] = {
                 { 0x41U, 1U, 0x80UL, 0x80UL },  /* port 0 */
@@ -37,7 +38,8 @@ static int it8213_pre_reset(struct ata_port *ap)
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         if (!pci_test_config_bits(pdev, &it8213_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -255,10 +257,6 @@ static struct scsi_host_template it8213_sht = {
         .dma_boundary           = ATA_DMA_BOUNDARY,
         .slave_configure        = ata_scsi_slave_config,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations it8213_ops = {
@@ -313,7 +311,7 @@ static const struct ata_port_operations it8213_ops = {
 static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &it8213_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -321,14 +319,14 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en
                 .udma_mask      = 0x1f, /* UDMA 100 */
                 .port_ops       = &it8213_ops,
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        /* Current IT8213 stuff is single port */
+        const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
-        /* Current IT8213 stuff is single port */
-        return ata_pci_init_one(pdev, port_info, 1);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id it8213_pci_tbl[] = {
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index f1f8cec8c224..ff9a6fd36657 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -620,10 +620,6 @@ static struct scsi_host_template it821x_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations it821x_smart_port_ops = {
@@ -722,14 +718,14 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         u8 conf;
 
-        static struct ata_port_info info_smart = {
+        static const struct ata_port_info info_smart = {
                 .sht = &it821x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &it821x_smart_port_ops
         };
-        static struct ata_port_info info_passthru = {
+        static const struct ata_port_info info_passthru = {
                 .sht = &it821x_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -737,8 +733,8 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask = 0x7f,
                 .port_ops = &it821x_passthru_port_ops
         };
-        static struct ata_port_info *port_info[2];
 
+        const struct ata_port_info *ppi[] = { NULL, NULL };
         static char *mode[2] = { "pass through", "smart" };
 
         /* Force the card into bypass mode if so requested */
@@ -751,11 +747,11 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         printk(KERN_INFO DRV_NAME ": controller in %s mode.\n", mode[conf]);
         if (conf == 0)
-                port_info[0] = port_info[1] = &info_passthru;
+                ppi[0] = &info_passthru;
         else
-                port_info[0] = port_info[1] = &info_smart;
+                ppi[0] = &info_smart;
 
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 420c343e5711..8d2bc1e9e871 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -23,7 +23,7 @@
 #include <scsi/scsi_host.h>
 
 #define DRV_NAME        "pata_ixp4xx_cf"
-#define DRV_VERSION     "0.1.2"
+#define DRV_VERSION     "0.1.3"
 
 static int ixp4xx_set_mode(struct ata_port *ap, struct ata_device **error)
 {
@@ -31,7 +31,7 @@ static int ixp4xx_set_mode(struct ata_port *ap, struct ata_device **error)
 
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
                 struct ata_device *dev = &ap->device[i];
-                if (ata_dev_ready(dev)) {
+                if (ata_dev_enabled(dev)) {
                         ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n");
                         dev->pio_mode = XFER_PIO_0;
                         dev->xfer_mode = XFER_PIO_0;
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 43763c99ea02..2af7ff8256ca 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -19,7 +19,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME        "pata_jmicron"
-#define DRV_VERSION     "0.1.4"
+#define DRV_VERSION     "0.1.5"
 
 typedef enum {
         PORT_PATA0 = 0,
@@ -30,16 +30,17 @@ typedef enum {
 /**
  *      jmicron_pre_reset       -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform the PATA port setup we need.
-
+ *
  *      On the Jmicron 361/363 there is a single PATA port that can be mapped
  *      either as primary or secondary (or neither). We don't do any policy
  *      and setup here. We assume that has been done by init_one and the
  *      BIOS.
  */
 
-static int jmicron_pre_reset(struct ata_port *ap)
+static int jmicron_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         u32 control;
@@ -102,7 +103,7 @@ static int jmicron_pre_reset(struct ata_port *ap)
                 ap->cbl = ATA_CBL_SATA;
                 break;
         }
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -137,10 +138,6 @@ static struct scsi_host_template jmicron_sht = {
         .slave_destroy          = ata_scsi_slave_destroy,
         /* Use standard CHS mapping rules */
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static const struct ata_port_operations jmicron_ops = {
@@ -194,7 +191,7 @@ static const struct ata_port_operations jmicron_ops = {
 
 static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &jmicron_sht,
                 .flags  = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
 
@@ -204,9 +201,9 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 
                 .port_ops       = &jmicron_ops,
         };
-        struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id jmicron_pci_tbl[] = {
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 707099291e01..edffc25d2d3f 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -64,7 +64,7 @@
 #include <linux/platform_device.h>
 
 #define DRV_NAME "pata_legacy"
-#define DRV_VERSION "0.5.4"
+#define DRV_VERSION "0.5.5"
 
 #define NR_HOST 6
 
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index d9b94a1b6954..edbfe0dbbf78 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -25,11 +25,12 @@
 /**
  *      marvell_pre_reset       -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform the PATA port setup we need.
  */
 
-static int marvell_pre_reset(struct ata_port *ap)
+static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         u32 devices;
@@ -52,7 +53,8 @@ static int marvell_pre_reset(struct ata_port *ap)
         if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
             (!(devices & 0x10)))        /* PATA enable ? */
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 static int marvell_cable_detect(struct ata_port *ap)
@@ -67,6 +69,7 @@ static int marvell_cable_detect(struct ata_port *ap)
         case 1: /* Legacy SATA port */
                 return ATA_CBL_SATA;
         }
+
         BUG();
         return 0;       /* Our BUG macro needs the right markup */
 }
@@ -104,10 +107,6 @@ static struct scsi_host_template marvell_sht = {
         .slave_destroy          = ata_scsi_slave_destroy,
         /* Use standard CHS mapping rules */
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations marvell_ops = {
@@ -162,7 +161,7 @@ static const struct ata_port_operations marvell_ops = {
 
 static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &marvell_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
 
@@ -172,7 +171,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 
                 .port_ops       = &marvell_ops,
         };
-        static struct ata_port_info info_sata = {
+        static const struct ata_port_info info_sata = {
                 .sht            = &marvell_sht,
                 /* Slave possible as its magically mapped not real */
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -183,13 +182,12 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 
                 .port_ops       = &marvell_ops,
         };
-        struct ata_port_info *port_info[2] = { &info, &info_sata };
-        int n_port = 2;
+        const struct ata_port_info *ppi[] = { &info, &info_sata };
 
         if (pdev->device == 0x6101)
-                n_port = 1;
+                ppi[1] = &ata_dummy_port_info;
 
-        return ata_pci_init_one(pdev, port_info, n_port);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id marvell_pci_tbl[] = {
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 9587a89f9683..368fac7d168b 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -280,10 +280,6 @@ static struct scsi_host_template mpc52xx_ata_sht = {
         .dma_boundary           = ATA_DMA_BOUNDARY,
         .slave_configure        = ata_scsi_slave_config,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static struct ata_port_operations mpc52xx_ata_port_ops = {
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 987c5fafab08..4ea42838297e 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -46,14 +46,15 @@ enum {
         SECONDARY = (1 << 14)
 };
 
-static int mpiix_pre_reset(struct ata_port *ap)
+static int mpiix_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const struct pci_bits mpiix_enable_bits = { 0x6D, 1, 0x80, 0x80 };
 
         if (!pci_test_config_bits(pdev, &mpiix_enable_bits))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -164,10 +165,6 @@ static struct scsi_host_template mpiix_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations mpiix_port_ops = {
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index dbba5b77d79c..81f563458666 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -37,10 +37,6 @@ static struct scsi_host_template netcell_sht = {
         .slave_destroy          = ata_scsi_slave_destroy,
         /* Use standard CHS mapping rules */
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations netcell_ops = {
@@ -96,7 +92,7 @@ static const struct ata_port_operations netcell_ops = {
 static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &netcell_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 /* Actually we don't really care about these as the
@@ -106,7 +102,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                 .udma_mask      = 0x3f, /* UDMA 133 */
                 .port_ops       = &netcell_ops,
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *port_info[] = { &info, NULL };
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
@@ -116,7 +112,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         ata_pci_clear_simplex(pdev);
 
         /* And let the library code do the work */
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, port_info);
 }
 
 static const struct pci_device_id netcell_pci_tbl[] = {
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 078aeda9cf8d..ea70ec744879 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -33,11 +33,12 @@
 /**
  *      ns87410_pre_reset               -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Check enabled ports
  */
 
-static int ns87410_pre_reset(struct ata_port *ap)
+static int ns87410_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const struct pci_bits ns87410_enable_bits[] = {
@@ -47,7 +48,8 @@ static int ns87410_pre_reset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -156,10 +158,6 @@ static struct scsi_host_template ns87410_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations ns87410_port_ops = {
@@ -193,14 +191,14 @@ static struct ata_port_operations ns87410_port_ops = {
 
 static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &ns87410_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x0F,
                 .port_ops = &ns87410_port_ops
         };
-        static struct ata_port_info *port_info[2] = {&info, &info};
-        return ata_pci_init_one(dev, port_info, 2);
+        const struct ata_port_info *ppi[] = { &info, NULL };
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id ns87410[] = {
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index dea4690340d1..29c23ddd6550 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -30,11 +30,12 @@
 /**
  *      oldpiix_pre_reset               -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Set up cable type and use generic probe init
  */
 
-static int oldpiix_pre_reset(struct ata_port *ap)
+static int oldpiix_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const struct pci_bits oldpiix_enable_bits[] = {
@@ -44,7 +45,8 @@ static int oldpiix_pre_reset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -232,10 +234,6 @@ static struct scsi_host_template oldpiix_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations oldpiix_pata_ops = {
@@ -291,20 +289,20 @@ static const struct ata_port_operations oldpiix_pata_ops = {
 static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &oldpiix_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
                 .mwdma_mask     = 0x07, /* mwdma1-2 */
                 .port_ops       = &oldpiix_pata_ops,
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id oldpiix_pci_tbl[] = {
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 13b63e21838d..1c44653e1e06 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -47,11 +47,12 @@ enum {
 /**
  *      opti_pre_reset          -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Set up cable type and use generic probe init
  */
 
-static int opti_pre_reset(struct ata_port *ap)
+static int opti_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const struct pci_bits opti_enable_bits[] = {
@@ -61,7 +62,8 @@ static int opti_pre_reset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &opti_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -177,10 +179,6 @@ static struct scsi_host_template opti_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations opti_port_ops = {
@@ -218,19 +216,19 @@ static struct ata_port_operations opti_port_ops = {
 
 static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &opti_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .port_ops = &opti_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
         static int printed_version;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id opti[] = {
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index b70e04c144df..3093b02286ce 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -48,11 +48,12 @@ static int pci_clock;	/* 0 = 33 1 = 25 */
 /**
  *      optidma_pre_reset               -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Set up cable type and use generic probe init
  */
 
-static int optidma_pre_reset(struct ata_port *ap)
+static int optidma_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const struct pci_bits optidma_enable_bits = {
@@ -62,7 +63,7 @@ static int optidma_pre_reset(struct ata_port *ap)
         if (ap->port_no && !pci_test_config_bits(pdev, &optidma_enable_bits))
                 return -ENOENT;
 
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -362,10 +363,6 @@ static struct scsi_host_template optidma_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations optidma_port_ops = {
@@ -485,14 +482,14 @@ done_nomsg:		/* Wrong chip revision */
 
 static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info_82c700 = {
+        static const struct ata_port_info info_82c700 = {
                 .sht = &optidma_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &optidma_port_ops
         };
-        static struct ata_port_info info_82c700_udma = {
+        static const struct ata_port_info info_82c700_udma = {
                 .sht = &optidma_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -500,8 +497,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x07,
                 .port_ops = &optiplus_port_ops
         };
-        static struct ata_port_info *port_info[2];
-        struct ata_port_info *info = &info_82c700;
+        const struct ata_port_info *ppi[] = { &info_82c700, NULL };
         static int printed_version;
 
         if (!printed_version++)
@@ -513,10 +509,9 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         pci_clock = inb(0x1F5) & 1;             /* 0 = 33Mhz, 1 = 25Mhz */
 
         if (optiplus_with_udma(dev))
-                info = &info_82c700_udma;
+                ppi[0] = &info_82c700_udma;
 
-        port_info[0] = port_info[1] = info;
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id optidma[] = {
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 75dc84797ff3..4d44c7555db1 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -357,6 +357,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
         PCMCIA_DEVICE_MANF_CARD(0x000a, 0x0000),        /* I-O Data CFA */
         PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),        /* Mitsubishi CFA */
         PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
+        PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),
         PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),        /* SanDisk CFA */
         PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),        /* Toshiba */
         PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
@@ -396,6 +397,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
         PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
         PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
         PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
+        PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
         PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
         PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
         PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index a61cbc110688..0d2cc49fde4b 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -301,6 +301,7 @@ static inline int pdc2027x_port_enabled(struct ata_port *ap)
 /**
  *      pdc2027x_prereset - prereset for PATA host controller
  *      @ap: Target port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Probeinit including cable detection.
  *
@@ -308,12 +309,12 @@ static inline int pdc2027x_port_enabled(struct ata_port *ap)
  *      None (inherited from caller).
  */
 
-static int pdc2027x_prereset(struct ata_port *ap)
+static int pdc2027x_prereset(struct ata_port *ap, unsigned long deadline)
 {
         /* Check whether port enabled */
         if (!pdc2027x_port_enabled(ap))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index ee636beb05e1..edbaf9d653b8 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -244,10 +244,6 @@ static struct scsi_host_template pdc202xx_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations pdc2024x_port_ops = {
@@ -321,7 +317,7 @@ static struct ata_port_operations pdc2026x_port_ops = {
 
 static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info[3] = {
+        static const struct ata_port_info info[3] = {
                 {
                         .sht = &pdc202xx_sht,
                         .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -348,9 +344,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id
                 }
 
         };
-        static struct ata_port_info *port_info[2];
-
-        port_info[0] = port_info[1] = &info[id->driver_data];
+        const struct ata_port_info *ppi[] = { &info[id->driver_data], NULL };
 
         if (dev->device == PCI_DEVICE_ID_PROMISE_20265) {
                 struct pci_dev *bridge = dev->bus->self;
@@ -362,7 +356,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id
                                 return -ENODEV;
                 }
         }
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id pdc202xx[] = {
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index a0a650c7f272..cbb7866940d6 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -22,7 +22,7 @@
 #include <linux/pata_platform.h>
 
 #define DRV_NAME "pata_platform"
-#define DRV_VERSION "0.1.2"
+#define DRV_VERSION "1.0"
 
 static int pio_mask = 1;
 
@@ -48,6 +48,8 @@ static int pata_platform_set_mode(struct ata_port *ap, struct ata_device **unuse
         return 0;
 }
 
+static int ata_dummy_ret0(struct ata_port *ap)  { return 0; }
+
 static struct scsi_host_template pata_platform_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -91,7 +93,7 @@ static struct ata_port_operations pata_platform_port_ops = {
         .irq_on                 = ata_irq_on,
         .irq_ack                = ata_irq_ack,
 
-        .port_start             = ata_port_start,
+        .port_start             = ata_dummy_ret0,
 };
 
 static void pata_platform_setup_port(struct ata_ioports *ioaddr,
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 27685ce63ceb..1998c19e8743 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 
 #define DRV_NAME "pata_qdi"
-#define DRV_VERSION "0.3.0"
+#define DRV_VERSION "0.3.1"
 
 #define NR_HOST 4       /* Two 6580s */
 
@@ -375,7 +375,7 @@ static __init int qdi_init(void)
                                 res = inb(port + 3);
                                 if (res & 1) {
                                         /* Single channel mode */
-                                        if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04))
+                                        if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04) == 0)
                                                 ct++;
                                 } else {
                                         /* Dual channel mode */
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 1c54673e008d..ba96b54f5b87 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -200,10 +200,6 @@ static struct scsi_host_template radisys_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations radisys_pata_ops = {
@@ -259,7 +255,7 @@ static const struct ata_port_operations radisys_pata_ops = {
 static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht            = &radisys_sht,
                 .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -267,13 +263,13 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                 .udma_mask      = 0x14, /* UDMA33/66 only */
                 .port_ops       = &radisys_pata_ops,
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id radisys_pci_tbl[] = {
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 85c45290eeee..a3488b41ad26 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -21,7 +21,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_rz1000"
-#define DRV_VERSION     "0.2.3"
+#define DRV_VERSION     "0.2.4"
 
 
 /**
@@ -40,7 +40,7 @@ static int rz1000_set_mode(struct ata_port *ap, struct ata_device **unused)
 
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
                 struct ata_device *dev = &ap->device[i];
-                if (ata_dev_ready(dev)) {
+                if (ata_dev_enabled(dev)) {
                         /* We don't really care */
                         dev->pio_mode = XFER_PIO_0;
                         dev->xfer_mode = XFER_PIO_0;
@@ -69,10 +69,6 @@ static struct scsi_host_template rz1000_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations rz1000_port_ops = {
@@ -135,22 +131,20 @@ static int rz1000_fifo_disable(struct pci_dev *pdev)
 static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        struct ata_port_info *port_info[2];
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &rz1000_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .port_ops = &rz1000_port_ops
         };
+        const struct ata_port_info *ppi[] = { &info, NULL };
 
         if (!printed_version++)
                 printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
 
-        if (rz1000_fifo_disable(pdev) == 0) {
-                port_info[0] = &info;
-                port_info[1] = &info;
-                return ata_pci_init_one(pdev, port_info, 2);
-        }
+        if (rz1000_fifo_disable(pdev) == 0)
+                return ata_pci_init_one(pdev, ppi);
+
         printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n");
         /* Not safe to use so skip */
         return -ENODEV;
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 66e8ff467c8d..1233063ab9a8 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -40,7 +40,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sc1200"
-#define DRV_VERSION     "0.2.4"
+#define DRV_VERSION     "0.2.5"
 
 #define SC1200_REV_A    0x00
 #define SC1200_REV_B1   0x01
@@ -194,10 +194,6 @@ static struct scsi_host_template sc1200_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations sc1200_port_ops = {
@@ -247,7 +243,7 @@ static struct ata_port_operations sc1200_port_ops = {
 
 static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &sc1200_sht,
                 .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -255,10 +251,10 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = 0x07,
                 .port_ops = &sc1200_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
-
         /* Can't enable port 2 yet, see top comments */
-        return ata_pci_init_one(dev, port_info, 1);
+        const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
+
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id sc1200[] = {
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 5df354d573e8..aa138d211b09 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -43,7 +43,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                "pata_scc"
-#define DRV_VERSION             "0.1"
+#define DRV_VERSION             "0.2"
 
 #define PCI_DEVICE_ID_TOSHIBA_SCC_ATA           0x01b4
 
@@ -864,10 +864,10 @@ static void scc_bmdma_freeze (struct ata_port *ap)
  *      @ap: ATA port to be reset
  */
 
-static int scc_pata_prereset (struct ata_port *ap)
+static int scc_pata_prereset (struct ata_port *ap, unsigned long deadline)
 {
         ap->cbl = ATA_CBL_PATA80;
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 /**
@@ -984,10 +984,6 @@ static struct scsi_host_template scc_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations scc_pata_ops = {
@@ -1142,14 +1138,14 @@ static int scc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int printed_version;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         const struct ata_port_info *ppi[] = { &scc_port_info[board_idx], NULL };
-        struct device *dev = &pdev->dev;
+        struct ata_host *host;
         int rc;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev,
                            "version " DRV_VERSION "\n");
 
-        host = ata_port_alloc_pinfo(&pdev->dev, ppi, 1);
+        host = ata_host_alloc_pinfo(&pdev->dev, ppi, 1);
         if (!host)
                 return -ENOMEM;
 
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 3956ef26936d..1e8f421963c7 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_serverworks"
-#define DRV_VERSION "0.4.0"
+#define DRV_VERSION "0.4.1"
 
 #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
 #define SVWKS_CSB6_REVISION     0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
@@ -139,12 +139,14 @@ static struct sv_cable_table cable_detect[] = {
 /**
  *      serverworks_cable_detect        -       cable detection
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection according to the device and subvendor
  *      identifications
  */
 
-static int serverworks_cable_detect(struct ata_port *ap) {
+static int serverworks_cable_detect(struct ata_port *ap)
+{
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         struct sv_cable_table *cb = cable_detect;
 
@@ -313,10 +315,6 @@ static struct scsi_host_template serverworks_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations serverworks_osb4_port_ops = {
@@ -477,8 +475,7 @@ static void serverworks_fixup_ht1000(struct pci_dev *pdev)
 
 static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        int ports = 2;
-        static struct ata_port_info info[4] = {
+        static const struct ata_port_info info[4] = {
                 { /* OSB4 */
                         .sht = &serverworks_sht,
                         .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -509,8 +506,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
                         .port_ops = &serverworks_csb_port_ops
                 }
         };
-        static struct ata_port_info *port_info[2];
-        struct ata_port_info *devinfo = &info[id->driver_data];
+        const struct ata_port_info *ppi[] = { &info[id->driver_data], NULL };
 
         /* Force master latency timer to 64 PCI clocks */
         pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x40);
@@ -519,7 +515,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
         if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
                 /* Select non UDMA capable OSB4 if we can't do fixups */
                 if ( serverworks_fixup_osb4(pdev) < 0)
-                        devinfo = &info[1];
+                        ppi[0] = &info[1];
         }
         /* setup CSB5/CSB6 : South Bridge and IDE option RAID */
         else if ((pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE) ||
@@ -529,11 +525,11 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
                  /* If the returned btr is the newer revision then
                     select the right info block */
                  if (serverworks_fixup_csb(pdev) == 3)
-                        devinfo = &info[3];
+                        ppi[0] = &info[3];
 
                 /* Is this the 3rd channel CSB6 IDE ? */
                 if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2)
-                        ports = 1;
+                        ppi[1] = &ata_dummy_port_info;
         }
         /* setup HT1000E */
         else if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE)
@@ -542,8 +538,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
         if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
                 ata_pci_clear_simplex(pdev);
 
-        port_info[0] = port_info[1] = devinfo;
-        return ata_pci_init_one(pdev, port_info, ports);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 6770820cfca9..440e2cb6ee75 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -94,11 +94,13 @@ static int sil680_cable_detect(struct ata_port *ap) {
 /**
  *      sil680_bus_reset        -       reset the SIL680 bus
  *      @ap: ATA port to reset
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform the SIL680 housekeeping when doing an ATA bus reset
  */
 
-static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes)
+static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes,
+                            unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         unsigned long addr = sil680_selreg(ap, 0);
@@ -108,7 +110,7 @@ static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes)
         pci_write_config_byte(pdev, addr, reset | 0x03);
         udelay(25);
         pci_write_config_byte(pdev, addr, reset);
-        return ata_std_softreset(ap, classes);
+        return ata_std_softreset(ap, classes, deadline);
 }
 
 static void sil680_error_handler(struct ata_port *ap)
@@ -230,10 +232,6 @@ static struct scsi_host_template sil680_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static struct ata_port_operations sil680_port_ops = {
@@ -343,7 +341,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
 
 static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &sil680_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -351,7 +349,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask = 0x7f,
                 .port_ops = &sil680_port_ops
         };
-        static struct ata_port_info info_slow = {
+        static const struct ata_port_info info_slow = {
                 .sht = &sil680_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
@@ -359,7 +357,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask = 0x3f,
                 .port_ops = &sil680_port_ops
         };
-        static struct ata_port_info *port_info[2] = {&info, &info};
+        const struct ata_port_info *ppi[] = { &info, NULL };
         static int printed_version;
 
         if (!printed_version++)
@@ -368,12 +366,12 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         switch(sil680_init_chip(pdev))
         {
                 case 0:
-                        port_info[0] = port_info[1] = &info_slow;
+                        ppi[0] = &info_slow;
                         break;
                 case 0x30:
                         return -ENODEV;
         }
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index a3fbcee6fb33..f2231267e011 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -38,8 +38,8 @@
 #define DRV_VERSION     "0.5.1"
 
 struct sis_chipset {
-        u16 device;                     /* PCI host ID */
-        struct ata_port_info *info;     /* Info block */
+        u16 device;                             /* PCI host ID */
+        const struct ata_port_info *info;       /* Info block */
         /* Probably add family, cable detect type etc here to clean
            up code later */
 };
@@ -88,6 +88,7 @@ static int sis_port_base(struct ata_device *adev)
 /**
  *      sis_133_cable_detect    -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection for the later UDMA133 capable
  *      SiS chipset.
@@ -108,6 +109,7 @@ static int sis_133_cable_detect(struct ata_port *ap)
 /**
  *      sis_66_cable_detect     -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection on the UDMA66, UDMA100 and early UDMA133
  *      SiS IDE controllers.
@@ -130,11 +132,12 @@ static int sis_66_cable_detect(struct ata_port *ap)
 /**
  *      sis_pre_reset           -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Set up cable type and use generic probe init
  */
 
-static int sis_pre_reset(struct ata_port *ap)
+static int sis_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits sis_enable_bits[] = {
                 { 0x4aU, 1U, 0x02UL, 0x02UL },  /* port 0 */
@@ -145,7 +148,8 @@ static int sis_pre_reset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 
@@ -520,10 +524,6 @@ static struct scsi_host_template sis_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static const struct ata_port_operations sis_133_ops = {
@@ -696,7 +696,7 @@ static const struct ata_port_operations sis_old_ops = {
         .port_start             = ata_port_start,
 };
 
-static struct ata_port_info sis_info = {
+static const struct ata_port_info sis_info = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
@@ -704,7 +704,7 @@ static struct ata_port_info sis_info = {
         .udma_mask      = 0,
         .port_ops       = &sis_old_ops,
 };
-static struct ata_port_info sis_info33 = {
+static const struct ata_port_info sis_info33 = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
@@ -712,35 +712,35 @@ static struct ata_port_info sis_info33 = {
         .udma_mask      = ATA_UDMA2,    /* UDMA 33 */
         .port_ops       = &sis_old_ops,
 };
-static struct ata_port_info sis_info66 = {
+static const struct ata_port_info sis_info66 = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
         .udma_mask      = ATA_UDMA4,    /* UDMA 66 */
         .port_ops       = &sis_66_ops,
 };
-static struct ata_port_info sis_info100 = {
+static const struct ata_port_info sis_info100 = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
         .udma_mask      = ATA_UDMA5,
         .port_ops       = &sis_100_ops,
 };
-static struct ata_port_info sis_info100_early = {
+static const struct ata_port_info sis_info100_early = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .udma_mask      = ATA_UDMA5,
         .pio_mask       = 0x1f, /* pio0-4 */
         .port_ops       = &sis_66_ops,
 };
-struct ata_port_info sis_info133 = {
+const struct ata_port_info sis_info133 = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
         .udma_mask      = ATA_UDMA6,
         .port_ops       = &sis_133_ops,
 };
-static struct ata_port_info sis_info133_early = {
+static const struct ata_port_info sis_info133_early = {
         .sht            = &sis_sht,
         .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
         .pio_mask       = 0x1f, /* pio0-4 */
@@ -823,8 +823,8 @@ static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)
 static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
-        static struct ata_port_info *port_info[2];
-        struct ata_port_info *port;
+        struct ata_port_info port;
+        const struct ata_port_info *ppi[] = { &port, NULL };
         struct pci_dev *host = NULL;
         struct sis_chipset *chipset = NULL;
         struct sis_chipset *sets;
@@ -964,13 +964,12 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (chipset == NULL)
                 return -ENODEV;
 
-        port = chipset->info;
-        port->private_data = chipset;
+        port = *chipset->info;
+        port.private_data = chipset;
 
         sis_fixup(pdev, chipset);
 
-        port_info[0] = port_info[1] = port;
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 static const struct pci_device_id sis_pci_tbl[] = {
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index da9e22b25753..e5aaec43694d 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sl82c105"
-#define DRV_VERSION "0.3.0"
+#define DRV_VERSION "0.3.1"
 
 enum {
         /*
@@ -44,11 +44,12 @@ enum {
 /**
  *      sl82c105_pre_reset              -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Set up cable type and use generic probe init
  */
 
-static int sl82c105_pre_reset(struct ata_port *ap)
+static int sl82c105_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits sl82c105_enable_bits[] = {
                 { 0x40, 1, 0x01, 0x01 },
@@ -58,7 +59,7 @@ static int sl82c105_pre_reset(struct ata_port *ap)
 
         if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+        return ata_std_prereset(ap, deadline);
 }
 
 
@@ -300,20 +301,22 @@ static int sl82c105_bridge_revision(struct pci_dev *pdev)
 
 static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info_dma = {
+        static const struct ata_port_info info_dma = {
                 .sht = &sl82c105_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &sl82c105_port_ops
         };
-        static struct ata_port_info info_early = {
+        static const struct ata_port_info info_early = {
                 .sht = &sl82c105_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .port_ops = &sl82c105_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info_early, &info_early };
+        /* for now use only the first port */
+        const struct ata_port_info *ppi[] = { &info_early,
+                                               &ata_dummy_port_info };
         u32 val;
         int rev;
 
@@ -323,17 +326,14 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id
                 dev_printk(KERN_WARNING, &dev->dev, "pata_sl82c105: Unable to find bridge, disabling DMA.\n");
         else if (rev <= 5)
                 dev_printk(KERN_WARNING, &dev->dev, "pata_sl82c105: Early bridge revision, no DMA available.\n");
-        else {
-                port_info[0] = &info_dma;
-                port_info[1] = &info_dma;
-        }
+        else
+                ppi[0] = &info_dma;
 
         pci_read_config_dword(dev, 0x40, &val);
         val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16;
         pci_write_config_dword(dev, 0x40, val);
 
-
-        return ata_pci_init_one(dev, port_info, 1); /* For now */
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id sl82c105[] = {
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index e618ffd6e944..b1d3076dfe51 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -48,11 +48,12 @@
 /**
  *      triflex_prereset                -       probe begin
  *      @ap: ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Set up cable type and use generic probe init
  */
 
-static int triflex_prereset(struct ata_port *ap)
+static int triflex_prereset(struct ata_port *ap, unsigned long deadline)
 {
         static const struct pci_bits triflex_enable_bits[] = {
                 { 0x80, 1, 0x01, 0x01 },
@@ -63,7 +64,8 @@ static int triflex_prereset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no]))
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 
@@ -192,10 +194,6 @@ static struct scsi_host_template triflex_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations triflex_port_ops = {
@@ -235,20 +233,20 @@ static struct ata_port_operations triflex_port_ops = {
 
 static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct ata_port_info info = {
+        static const struct ata_port_info info = {
                 .sht = &triflex_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
                 .port_ops = &triflex_port_ops
         };
-        static struct ata_port_info *port_info[2] = { &info, &info };
+        const struct ata_port_info *ppi[] = { &info, NULL };
         static int printed_version;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &dev->dev, "version " DRV_VERSION "\n");
 
-        return ata_pci_init_one(dev, port_info, 2);
+        return ata_pci_init_one(dev, ppi);
 }
 
 static const struct pci_device_id triflex[] = {
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 96b71791d2f4..e4c71f76bd55 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -154,7 +154,7 @@ static int via_cable_detect(struct ata_port *ap) {
         return ATA_CBL_PATA40;
 }
 
-static int via_pre_reset(struct ata_port *ap)
+static int via_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         const struct via_isa_bridge *config = ap->host->private_data;
 
@@ -167,7 +167,8 @@ static int via_pre_reset(struct ata_port *ap)
                 if (!pci_test_config_bits(pdev, &via_enable_bits[ap->port_no]))
                         return -ENOENT;
         }
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 
@@ -300,10 +301,6 @@ static struct scsi_host_template via_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .resume                 = ata_scsi_device_resume,
-        .suspend                = ata_scsi_device_suspend,
-#endif
 };
 
 static struct ata_port_operations via_port_ops = {
@@ -424,7 +421,7 @@ static void via_config_fifo(struct pci_dev *pdev, unsigned int flags)
 static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         /* Early VIA without UDMA support */
-        static struct ata_port_info via_mwdma_info = {
+        static const struct ata_port_info via_mwdma_info = {
                 .sht = &via_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
                 .pio_mask = 0x1f,
@@ -432,7 +429,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &via_port_ops
         };
         /* Ditto with IRQ masking required */
-        static struct ata_port_info via_mwdma_info_borked = {
+        static const struct ata_port_info via_mwdma_info_borked = {
                 .sht = &via_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
                 .pio_mask = 0x1f,
@@ -440,7 +437,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &via_port_ops_noirq,
         };
         /* VIA UDMA 33 devices (and borked 66) */
-        static struct ata_port_info via_udma33_info = {
+        static const struct ata_port_info via_udma33_info = {
                 .sht = &via_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
                 .pio_mask = 0x1f,
@@ -449,7 +446,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &via_port_ops
         };
         /* VIA UDMA 66 devices */
-        static struct ata_port_info via_udma66_info = {
+        static const struct ata_port_info via_udma66_info = {
                 .sht = &via_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
                 .pio_mask = 0x1f,
@@ -458,7 +455,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &via_port_ops
         };
         /* VIA UDMA 100 devices */
-        static struct ata_port_info via_udma100_info = {
+        static const struct ata_port_info via_udma100_info = {
                 .sht = &via_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
                 .pio_mask = 0x1f,
@@ -467,7 +464,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .port_ops = &via_port_ops
         };
         /* UDMA133 with bad AST (All current 133) */
-        static struct ata_port_info via_udma133_info = {
+        static const struct ata_port_info via_udma133_info = {
                 .sht = &via_sht,
                 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SETXFER_POLLING,
                 .pio_mask = 0x1f,
@@ -475,7 +472,8 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask = 0x7f,      /* FIXME: should check north bridge */
                 .port_ops = &via_port_ops
         };
-        struct ata_port_info *port_info[2], *type;
+        struct ata_port_info type;
+        const struct ata_port_info *ppi[] = { &type, NULL };
         struct pci_dev *isa = NULL;
         const struct via_isa_bridge *config;
         static int printed_version;
@@ -520,25 +518,25 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         switch(config->flags & VIA_UDMA) {
                 case VIA_UDMA_NONE:
                         if (config->flags & VIA_NO_UNMASK)
-                                type = &via_mwdma_info_borked;
+                                type = via_mwdma_info_borked;
                         else
-                                type = &via_mwdma_info;
+                                type = via_mwdma_info;
                         break;
                 case VIA_UDMA_33:
-                        type = &via_udma33_info;
+                        type = via_udma33_info;
                         break;
                 case VIA_UDMA_66:
-                        type = &via_udma66_info;
+                        type = via_udma66_info;
                         /* The 66 MHz devices require we enable the clock */
                         pci_read_config_dword(pdev, 0x50, &timing);
                         timing |= 0x80008;
                         pci_write_config_dword(pdev, 0x50, timing);
                         break;
                 case VIA_UDMA_100:
-                        type = &via_udma100_info;
+                        type = via_udma100_info;
                         break;
                 case VIA_UDMA_133:
-                        type = &via_udma133_info;
+                        type = via_udma133_info;
                         break;
                 default:
                         WARN_ON(1);
@@ -553,10 +551,9 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* We have established the device type, now fire it up */
-        type->private_data = (void *)config;
+        type.private_data = (void *)config;
 
-        port_info[0] = port_info[1] = type;
-        return ata_pci_init_one(pdev, port_info, 2);
+        return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index cc4ad271afb5..83abfeca4057 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 
 #define DRV_NAME "pata_winbond"
-#define DRV_VERSION "0.0.2"
+#define DRV_VERSION "0.0.3"
 
 #define NR_HOST 4       /* Two winbond controllers, two channels each */
 
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 52b69530ab29..f12c2b6ac08e 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -44,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pdc_adma"
-#define DRV_VERSION     "0.05"
+#define DRV_VERSION     "0.06"
 
 /* macro to calculate base address for ATA regs */
 #define ADMA_ATA_REGS(base,port_no)     ((base) + ((port_no) * 0x40))
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index f099a1d83a00..2d80c9d95e95 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -28,7 +28,7 @@
 #include <scsi/scsi_device.h>
 
 #define DRV_NAME        "sata_inic162x"
-#define DRV_VERSION     "0.1"
+#define DRV_VERSION     "0.2"
 
 enum {
         MMIO_BAR                = 5,
@@ -135,10 +135,6 @@ static struct scsi_host_template inic_sht = {
         .slave_configure        = inic_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static const int scr_map[] = {
@@ -420,7 +416,8 @@ static void inic_thaw(struct ata_port *ap)
  * SRST and SControl hardreset don't give valid signature on this
  * controller.  Only controller specific hardreset mechanism works.
  */
-static int inic_hardreset(struct ata_port *ap, unsigned int *class)
+static int inic_hardreset(struct ata_port *ap, unsigned int *class,
+                          unsigned long deadline)
 {
         void __iomem *port_base = inic_port_base(ap);
         void __iomem *idma_ctl = port_base + PORT_IDMA_CTL;
@@ -437,7 +434,7 @@ static int inic_hardreset(struct ata_port *ap, unsigned int *class)
         msleep(1);
         writew(val & ~IDMA_CTL_RST_ATA, idma_ctl);
 
-        rc = sata_phy_resume(ap, timing);
+        rc = sata_phy_resume(ap, timing, deadline);
         if (rc) {
                 ata_port_printk(ap, KERN_WARNING, "failed to resume "
                                 "link after reset (errno=%d)\n", rc);
@@ -451,10 +448,12 @@ static int inic_hardreset(struct ata_port *ap, unsigned int *class)
                 /* wait a while before checking status */
                 msleep(150);
 
-                if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
-                        ata_port_printk(ap, KERN_WARNING,
-                                        "device busy after hardreset\n");
-                        return -EIO;
+                rc = ata_wait_ready(ap, deadline);
+                /* link occupied, -ENODEV too is an error */
+                if (rc) {
+                        ata_port_printk(ap, KERN_WARNING, "device not ready "
+                                        "after hardreset (errno=%d)\n", rc);
+                        return rc;
                 }
 
                 ata_tf_read(ap, &tf);
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index cb9b9ac12b4c..705a020e1597 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -35,7 +35,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_mv"
-#define DRV_VERSION     "0.8"
+#define DRV_VERSION     "0.81"
 
 enum {
         /* BAR's are enumerated in terms of pci_resource_start() terms */
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 02169740ed24..adfa693db53d 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -49,7 +49,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                        "sata_nv"
-#define DRV_VERSION                     "3.3"
+#define DRV_VERSION                     "3.4"
 
 #define NV_ADMA_DMA_BOUNDARY            0xffffffffUL
 
@@ -229,7 +229,6 @@ struct nv_host_priv {
 #define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & ( 1 << (19 + (12 * (PORT)))))
 
 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
-static void nv_remove_one (struct pci_dev *pdev);
 #ifdef CONFIG_PM
 static int nv_pci_device_resume(struct pci_dev *pdev);
 #endif
@@ -257,6 +256,8 @@ static void nv_adma_port_stop(struct ata_port *ap);
 static int nv_adma_port_suspend(struct ata_port *ap, pm_message_t mesg);
 static int nv_adma_port_resume(struct ata_port *ap);
 #endif
+static void nv_adma_freeze(struct ata_port *ap);
+static void nv_adma_thaw(struct ata_port *ap);
 static void nv_adma_error_handler(struct ata_port *ap);
 static void nv_adma_host_stop(struct ata_host *host);
 static void nv_adma_post_internal_cmd(struct ata_queued_cmd *qc);
@@ -286,12 +287,6 @@ static const struct pci_device_id nv_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },
-        { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
-                PCI_ANY_ID, PCI_ANY_ID,
-                PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
-        { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
-                PCI_ANY_ID, PCI_ANY_ID,
-                PCI_CLASS_STORAGE_RAID<<8, 0xffff00, GENERIC },
 
         { } /* terminate list */
 };
@@ -304,7 +299,7 @@ static struct pci_driver nv_pci_driver = {
         .suspend                = ata_pci_device_suspend,
         .resume                 = nv_pci_device_resume,
 #endif
-        .remove                 = nv_remove_one,
+        .remove                 = ata_pci_remove_one,
 };
 
 static struct scsi_host_template nv_sht = {
@@ -323,10 +318,6 @@ static struct scsi_host_template nv_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static struct scsi_host_template nv_adma_sht = {
@@ -345,10 +336,6 @@ static struct scsi_host_template nv_adma_sht = {
         .slave_configure        = nv_adma_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static const struct ata_port_operations nv_generic_ops = {
@@ -444,8 +431,8 @@ static const struct ata_port_operations nv_adma_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = nv_adma_qc_prep,
         .qc_issue               = nv_adma_qc_issue,
-        .freeze                 = nv_ck804_freeze,
-        .thaw                   = nv_ck804_thaw,
+        .freeze                 = nv_adma_freeze,
+        .thaw                   = nv_adma_thaw,
         .error_handler          = nv_adma_error_handler,
         .post_internal_cmd      = nv_adma_post_internal_cmd,
         .data_xfer              = ata_data_xfer,
@@ -463,7 +450,7 @@ static const struct ata_port_operations nv_adma_ops = {
         .host_stop              = nv_adma_host_stop,
 };
 
-static struct ata_port_info nv_port_info[] = {
+static const struct ata_port_info nv_port_info[] = {
         /* generic */
         {
                 .sht            = &nv_sht,
@@ -816,7 +803,15 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
                         u32 gen_ctl;
                         u32 notifier, notifier_error;
 
-                        /* if in ATA register mode, use standard ata interrupt handler */
+                        /* if ADMA is disabled, use standard ata interrupt handler */
+                        if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) {
+                                u8 irq_stat = readb(host->iomap[NV_MMIO_BAR] + NV_INT_STATUS_CK804)
+                                        >> (NV_INT_PORT_SHIFT * i);
+                                handled += nv_host_intr(ap, irq_stat);
+                                continue;
+                        }
+
+                        /* if in ATA register mode, check for standard interrupts */
                         if (pp->flags & NV_ADMA_PORT_REGISTER_MODE) {
                                 u8 irq_stat = readb(host->iomap[NV_MMIO_BAR] + NV_INT_STATUS_CK804)
                                         >> (NV_INT_PORT_SHIFT * i);
@@ -826,7 +821,6 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
                                             command is active, to prevent losing interrupts. */
                                         irq_stat |= NV_INT_DEV;
                                 handled += nv_host_intr(ap, irq_stat);
-                                continue;
                         }
 
                         notifier = readl(mmio + NV_ADMA_NOTIFIER);
@@ -912,22 +906,77 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
         return IRQ_RETVAL(handled);
 }
 
+static void nv_adma_freeze(struct ata_port *ap)
+{
+        struct nv_adma_port_priv *pp = ap->private_data;
+        void __iomem *mmio = pp->ctl_block;
+        u16 tmp;
+
+        nv_ck804_freeze(ap);
+
+        if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE)
+                return;
+
+        /* clear any outstanding CK804 notifications */
+        writeb( NV_INT_ALL << (ap->port_no * NV_INT_PORT_SHIFT),
+                ap->host->iomap[NV_MMIO_BAR] + NV_INT_STATUS_CK804);
+
+        /* Disable interrupt */
+        tmp = readw(mmio + NV_ADMA_CTL);
+        writew( tmp & ~(NV_ADMA_CTL_AIEN | NV_ADMA_CTL_HOTPLUG_IEN),
+                mmio + NV_ADMA_CTL);
+        readw( mmio + NV_ADMA_CTL );    /* flush posted write */
+}
+
+static void nv_adma_thaw(struct ata_port *ap)
+{
+        struct nv_adma_port_priv *pp = ap->private_data;
+        void __iomem *mmio = pp->ctl_block;
+        u16 tmp;
+
+        nv_ck804_thaw(ap);
+
+        if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE)
+                return;
+
+        /* Enable interrupt */
+        tmp = readw(mmio + NV_ADMA_CTL);
+        writew( tmp | (NV_ADMA_CTL_AIEN | NV_ADMA_CTL_HOTPLUG_IEN),
+                mmio + NV_ADMA_CTL);
+        readw( mmio + NV_ADMA_CTL );    /* flush posted write */
+}
+
 static void nv_adma_irq_clear(struct ata_port *ap)
 {
         struct nv_adma_port_priv *pp = ap->private_data;
         void __iomem *mmio = pp->ctl_block;
-        u16 status = readw(mmio + NV_ADMA_STAT);
-        u32 notifier = readl(mmio + NV_ADMA_NOTIFIER);
-        u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR);
-        void __iomem *dma_stat_addr = ap->ioaddr.bmdma_addr + ATA_DMA_STATUS;
+        u32 notifier_clears[2];
+
+        if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) {
+                ata_bmdma_irq_clear(ap);
+                return;
+        }
+
+        /* clear any outstanding CK804 notifications */
+        writeb( NV_INT_ALL << (ap->port_no * NV_INT_PORT_SHIFT),
+                ap->host->iomap[NV_MMIO_BAR] + NV_INT_STATUS_CK804);
 
         /* clear ADMA status */
-        writew(status, mmio + NV_ADMA_STAT);
-        writel(notifier | notifier_error,
-               pp->notifier_clear_block);
+        writew(0xffff, mmio + NV_ADMA_STAT);
 
-        /** clear legacy status */
-        iowrite8(ioread8(dma_stat_addr), dma_stat_addr);
+        /* clear notifiers - note both ports need to be written with
+           something even though we are only clearing on one */
+        if (ap->port_no == 0) {
+                notifier_clears[0] = 0xFFFFFFFF;
+                notifier_clears[1] = 0;
+        } else {
+                notifier_clears[0] = 0;
+                notifier_clears[1] = 0xFFFFFFFF;
+        }
+        pp = ap->host->ports[0]->private_data;
+        writel(notifier_clears[0], pp->notifier_clear_block);
+        pp = ap->host->ports[1]->private_data;
+        writel(notifier_clears[1], pp->notifier_clear_block);
 }
 
 static void nv_adma_post_internal_cmd(struct ata_queued_cmd *qc)
@@ -1405,7 +1454,8 @@ static void nv_ck804_thaw(struct ata_port *ap)
         writeb(mask, mmio_base + NV_INT_ENABLE_CK804);
 }
 
-static int nv_hardreset(struct ata_port *ap, unsigned int *class)
+static int nv_hardreset(struct ata_port *ap, unsigned int *class,
+                        unsigned long deadline)
 {
         unsigned int dummy;
 
@@ -1413,7 +1463,7 @@ static int nv_hardreset(struct ata_port *ap, unsigned int *class)
          * some controllers.  Don't classify on hardreset.  For more
          * info, see http://bugme.osdl.org/show_bug.cgi?id=3352
          */
-        return sata_std_hardreset(ap, &dummy);
+        return sata_std_hardreset(ap, &dummy, deadline);
 }
 
 static void nv_error_handler(struct ata_port *ap)
@@ -1480,7 +1530,7 @@ static void nv_adma_error_handler(struct ata_port *ap)
 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version = 0;
-        const struct ata_port_info *ppi[2];
+        const struct ata_port_info *ppi[] = { NULL, NULL };
         struct ata_host *host;
         struct nv_host_priv *hpriv;
         int rc;
@@ -1508,8 +1558,8 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 type = ADMA;
         }
 
-        ppi[0] = ppi[1] = &nv_port_info[type];
-        rc = ata_pci_prepare_native_host(pdev, ppi, 2, &host);
+        ppi[0] = &nv_port_info[type];
+        rc = ata_pci_prepare_native_host(pdev, ppi, &host);
         if (rc)
                 return rc;
 
@@ -1556,15 +1606,6 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                                  IRQF_SHARED, ppi[0]->sht);
 }
 
-static void nv_remove_one (struct pci_dev *pdev)
-{
-        struct ata_host *host = dev_get_drvdata(&pdev->dev);
-        struct nv_host_priv *hpriv = host->private_data;
-
-        ata_pci_remove_one(pdev);
-        kfree(hpriv);
-}
-
 #ifdef CONFIG_PM
 static int nv_pci_device_resume(struct pci_dev *pdev)
 {
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f56549b90aa6..3a7d9b5332af 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -45,7 +45,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "2.05"
+#define DRV_VERSION     "2.07"
 
 
 enum {
@@ -653,6 +653,8 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,
         qc->err_mask |= ac_err_mask;
 
         pdc_reset_port(ap);
+
+        ata_port_abort(ap);
 }
 
 static inline unsigned int pdc_host_intr( struct ata_port *ap,
@@ -924,6 +926,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         struct ata_host *host;
         void __iomem *base;
         int n_ports, i, rc;
+        int is_sataii_tx4;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
@@ -962,10 +965,23 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         }
         host->iomap = pcim_iomap_table(pdev);
 
-        for (i = 0; i < host->n_ports; i++)
+        is_sataii_tx4 = 0;
+        if ((pi->flags & (PDC_FLAG_GEN_II|PDC_FLAG_4_PORTS)) == (PDC_FLAG_GEN_II|PDC_FLAG_4_PORTS)) {
+                is_sataii_tx4 = 1;
+                dev_printk(KERN_INFO, &pdev->dev, "applying SATAII TX4 port numbering workaround\n");
+        }
+        for (i = 0; i < host->n_ports; i++) {
+                static const unsigned char sataii_tx4_port_remap[4] = { 3, 1, 0, 2};
+                int ata_nr;
+
+                ata_nr = i;
+                if (is_sataii_tx4)
+                        ata_nr = sataii_tx4_port_remap[i];
+
                 pdc_ata_setup_port(host->ports[i],
-                                   base + 0x200 + i * 0x80,
-                                   base + 0x400 + i * 0x100);
+                                   base + 0x200 + ata_nr * 0x80,
+                                   base + 0x400 + ata_nr * 0x100);
+        }
 
         /* initialize adapter */
         pdc_host_init(host);
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index f5a05de0093d..6688ccb66320 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -39,7 +39,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_qstor"
-#define DRV_VERSION     "0.07"
+#define DRV_VERSION     "0.08"
 
 enum {
         QS_MMIO_BAR             = 4,
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 0a1e417f309c..a3b339bcf3cf 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -182,10 +182,6 @@ static struct scsi_host_template sil_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static const struct ata_port_operations sil_ops = {
@@ -309,7 +305,7 @@ static int sil_set_mode (struct ata_port *ap, struct ata_device **r_failed)
         u32 tmp, dev_mode[2];
         unsigned int i;
         int rc;
-        
+
         rc = ata_do_set_mode(ap, r_failed);
         if (rc)
                 return rc;
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index e6223ba667da..0ddfae9911cd 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -30,7 +30,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sil24"
-#define DRV_VERSION     "0.8"
+#define DRV_VERSION     "0.9"
 
 /*
  * Port request block (PRB) 32 bytes
@@ -237,7 +237,8 @@ enum {
         /* host flags */
         SIL24_COMMON_FLAGS      = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                                  ATA_FLAG_NCQ | ATA_FLAG_SKIP_D2H_BSY,
+                                  ATA_FLAG_NCQ | ATA_FLAG_SKIP_D2H_BSY |
+                                  ATA_FLAG_ACPI_SATA,
         SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */
 
         IRQ_STAT_4PORTS         = 0xf,
@@ -380,10 +381,6 @@ static struct scsi_host_template sil24_sht = {
         .slave_configure        = ata_scsi_slave_config,
         .slave_destroy          = ata_scsi_slave_destroy,
         .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-        .suspend                = ata_scsi_device_suspend,
-        .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static const struct ata_port_operations sil24_ops = {
@@ -534,7 +531,8 @@ static int sil24_init_port(struct ata_port *ap)
         return 0;
 }
 
-static int sil24_softreset(struct ata_port *ap, unsigned int *class)
+static int sil24_softreset(struct ata_port *ap, unsigned int *class,
+                           unsigned long deadline)
 {
         void __iomem *port = ap->ioaddr.cmd_addr;
         struct sil24_port_priv *pp = ap->private_data;
@@ -566,7 +564,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
 
         mask = (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR) << PORT_IRQ_RAW_SHIFT;
         irq_stat = ata_wait_register(port + PORT_IRQ_STAT, mask, 0x0,
-                                     100, ATA_TMOUT_BOOT / HZ * 1000);
+                                     100, jiffies_to_msecs(deadline - jiffies));
 
         writel(irq_stat, port + PORT_IRQ_STAT); /* clear IRQs */
         irq_stat >>= PORT_IRQ_RAW_SHIFT;
@@ -594,7 +592,8 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
         return -EIO;
 }
 
-static int sil24_hardreset(struct ata_port *ap, unsigned int *class)
+static int sil24_hardreset(struct ata_port *ap, unsigned int *class,
+                           unsigned long deadline)
 {
         void __iomem *port = ap->ioaddr.cmd_addr;
         const char *reason;
@@ -615,7 +614,7 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class)
         /* SStatus oscillates between zero and valid status after
          * DEV_RST, debounce it.
          */
-        rc = sata_phy_debounce(ap, sata_deb_timing_long);
+        rc = sata_phy_debounce(ap, sata_deb_timing_long, deadline);
         if (rc) {
                 reason = "PHY debouncing failed";
                 goto err;
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index d8ee062e82fc..51d9251b0898 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -43,7 +43,7 @@
 #include "sis.h"
 
 #define DRV_NAME        "sata_sis"
-#define DRV_VERSION     "0.7"
+#define DRV_VERSION     "0.8"
 
 enum {
         sis_180                 = 0,
@@ -129,7 +129,7 @@ static const struct ata_port_operations sis_ops = {
         .port_start             = ata_port_start,
 };
 
-static struct ata_port_info sis_port_info = {
+static const struct ata_port_info sis_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
         .pio_mask       = 0x1f,
         .mwdma_mask     = 0x7,
@@ -255,7 +255,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
         struct ata_port_info pi = sis_port_info;
-        const struct ata_port_info *ppi[2] = { &pi, &pi };
+        const struct ata_port_info *ppi[] = { &pi, NULL };
         struct ata_host *host;
         u32 genctl, val;
         u8 pmr;
@@ -335,7 +335,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 break;
         }
 
-        rc = ata_pci_prepare_native_host(pdev, ppi, 2, &host);
+        rc = ata_pci_prepare_native_host(pdev, ppi, &host);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index cc07aac10e8c..bcb2cd8b063d 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -53,7 +53,7 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME        "sata_svw"
-#define DRV_VERSION     "2.1"
+#define DRV_VERSION     "2.2"
 
 enum {
         /* ap->flags bits */
@@ -288,7 +288,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
         /* Match it to a port node */
         index = (ap == ap->host->ports[0]) ? 0 : 1;
         for (np = np->child; np != NULL; np = np->sibling) {
-                const u32 *reg = get_property(np, "reg", NULL);
+                const u32 *reg = of_get_property(np, "reg", NULL);
                 if (!reg)
                         continue;
                 if (index == *reg)
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 3a4f44559d0a..2d14f3d56d92 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -44,7 +44,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_sx4"
-#define DRV_VERSION     "0.10"
+#define DRV_VERSION     "0.11"
 
 
 enum {
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index f74e383de083..6815de7cca79 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -36,7 +36,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_uli"
-#define DRV_VERSION     "1.1"
+#define DRV_VERSION     "1.2"
 
 enum {
         uli_5289                = 0,
@@ -125,7 +125,7 @@ static const struct ata_port_operations uli_ops = {
         .port_start             = ata_port_start,
 };
 
-static struct ata_port_info uli_port_info = {
+static const struct ata_port_info uli_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                           ATA_FLAG_IGN_SIMPLEX,
         .pio_mask       = 0x1f,         /* pio0-4 */
@@ -201,19 +201,33 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         n_ports = 2;
         if (board_idx == uli_5287)
                 n_ports = 4;
-        rc = ata_pci_prepare_native_host(pdev, ppi, n_ports, &host);
-        if (rc)
-                return rc;
+
+        /* allocate the host */
+        host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
+        if (!host)
+                return -ENOMEM;
 
         hpriv = devm_kzalloc(&pdev->dev, sizeof(*hpriv), GFP_KERNEL);
         if (!hpriv)
                 return -ENOMEM;
         host->private_data = hpriv;
 
+        /* the first two ports are standard SFF */
+        rc = ata_pci_init_native_host(host);
+        if (rc)
+                return rc;
+
+        rc = ata_pci_init_bmdma(host);
+        if (rc)
+                return rc;
+
         iomap = host->iomap;
 
         switch (board_idx) {
         case uli_5287:
+                /* If there are four, the last two live right after
+                 * the standard SFF ports.
+                 */
                 hpriv->scr_cfg_addr[0] = ULI5287_BASE;
                 hpriv->scr_cfg_addr[1] = ULI5287_BASE + ULI5287_OFFS;
 
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 1d855f55f5f7..01bba26d8d1a 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.1"
+#define DRV_VERSION     "2.2"
 
 enum board_ids_enum {
         vt6420,
@@ -93,6 +93,10 @@ static struct pci_driver svia_pci_driver = {
         .name                   = DRV_NAME,
         .id_table               = svia_pci_tbl,
         .probe                  = svia_init_one,
+#ifdef CONFIG_PM
+        .suspend                = ata_pci_device_suspend,
+        .resume                 = ata_pci_device_resume,
+#endif
         .remove                 = ata_pci_remove_one,
 };
 
@@ -268,6 +272,7 @@ static void svia_noop_freeze(struct ata_port *ap)
 /**
  *      vt6420_prereset - prereset for vt6420
  *      @ap: target ATA port
+ *      @deadline: deadline jiffies for the operation
  *
  *      SCR registers on vt6420 are pieces of shit and may hang the
  *      whole machine completely if accessed with the wrong timing.
@@ -284,7 +289,7 @@ static void svia_noop_freeze(struct ata_port *ap)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-static int vt6420_prereset(struct ata_port *ap)
+static int vt6420_prereset(struct ata_port *ap, unsigned long deadline)
 {
         struct ata_eh_context *ehc = &ap->eh_context;
         unsigned long timeout = jiffies + (HZ * 5);
@@ -329,7 +334,7 @@ static int vt6420_prereset(struct ata_port *ap)
 
  skip_scr:
         /* wait for !BSY */
-        ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+        ata_wait_ready(ap, deadline);
 
         return 0;
 }
@@ -406,7 +411,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
         struct ata_host *host;
         int rc;
 
-        rc = ata_pci_prepare_native_host(pdev, ppi, 2, &host);
+        rc = ata_pci_prepare_native_host(pdev, ppi, &host);
         if (rc)
                 return rc;
         *r_host = host;
@@ -436,7 +441,7 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
                 return -ENOMEM;
         }
 
-        rc = pcim_iomap_regions(pdev, 0x1f, DRV_NAME);
+        rc = pcim_iomap_regions(pdev, 0x3f, DRV_NAME);
         if (rc) {
                 dev_printk(KERN_ERR, &pdev->dev, "failed to request/iomap "
                            "PCI BARs (errno=%d)\n", rc);
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 80126f835d32..81330175fc89 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -47,7 +47,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_vsc"
-#define DRV_VERSION     "2.1"
+#define DRV_VERSION     "2.2"
 
 enum {
         VSC_MMIO_BAR                    = 0,
diff --git a/drivers/ata/sis.h b/drivers/ata/sis.h
index 231da8fc2200..0f2208d8d5ef 100644
--- a/drivers/ata/sis.h
+++ b/drivers/ata/sis.h
@@ -2,4 +2,4 @@
 struct ata_port_info;
 
 /* pata_sis.c */
-extern struct ata_port_info sis_info133;
+extern const struct ata_port_info sis_info133;
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 33687454eb32..f5a47a48c3b4 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -2,19 +2,22 @@
 # ATM device configuration
 #
 
-menu "ATM drivers"
+menuconfig ATM_DRIVERS
+        bool "ATM drivers"
         depends on NETDEVICES && ATM
+        default y
+
+if ATM_DRIVERS
 
 config ATM_DUMMY
         tristate "Dummy ATM driver"
-        depends on ATM
         help
           Dummy ATM driver. Useful for proxy signalling, testing,
           and development.  If unsure, say N.
 
 config ATM_TCP
         tristate "ATM over TCP"
-        depends on INET && ATM
+        depends on INET
         help
           ATM over TCP driver. Useful mainly for development and for
           experiments. If unsure, say N.
@@ -30,7 +33,7 @@ config ATM_LANAI
 
 config ATM_ENI
         tristate "Efficient Networks ENI155P"
-        depends on PCI && ATM
+        depends on PCI
         ---help---
           Driver for the Efficient Networks ENI155p series and SMC ATM
           Power155 155 Mbps ATM adapters. Both, the versions with 512KB and
@@ -139,7 +142,7 @@ config ATM_ENI_BURST_RX_2W
 
 config ATM_FIRESTREAM
         tristate "Fujitsu FireStream (FS50/FS155) "
-        depends on PCI && ATM
+        depends on PCI
         help
           Driver for the Fujitsu FireStream 155 (MB86697) and
           FireStream 50 (MB86695) ATM PCI chips.
@@ -149,7 +152,7 @@ config ATM_FIRESTREAM
 
 config ATM_ZATM
         tristate "ZeitNet ZN1221/ZN1225"
-        depends on PCI && ATM
+        depends on PCI
         help
           Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
           adapters.
@@ -169,7 +172,7 @@ config ATM_ZATM_DEBUG
 
 config ATM_NICSTAR
         tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
-        depends on PCI && ATM && !64BIT
+        depends on PCI && !64BIT
         help
           The NICStAR chipset family is used in a large number of ATM NICs for
           25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE
@@ -202,7 +205,7 @@ config ATM_NICSTAR_USE_IDT77105
 
 config ATM_IDT77252
         tristate "IDT 77252 (NICStAR II)"
-        depends on PCI && ATM
+        depends on PCI
         help
           Driver for the IDT 77252 ATM PCI chips.
 
@@ -237,7 +240,7 @@ config ATM_IDT77252_USE_SUNI
 
 config ATM_AMBASSADOR
         tristate "Madge Ambassador (Collage PCI 155 Server)"
-        depends on PCI && ATM
+        depends on PCI
         select BITREVERSE
         help
           This is a driver for ATMizer based ATM card produced by Madge
@@ -262,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG
 
 config ATM_HORIZON
         tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
-        depends on PCI && ATM
+        depends on PCI
         help
           This is a driver for the Horizon chipset ATM adapter cards once
           produced by Madge Networks Ltd. Say Y (or M to compile as a module
@@ -286,7 +289,7 @@ config ATM_HORIZON_DEBUG
 
 config ATM_IA
         tristate "Interphase ATM PCI x575/x525/x531"
-        depends on PCI && ATM && !64BIT
+        depends on PCI && !64BIT
         ---help---
           This is a driver for the Interphase (i)ChipSAR adapter cards
           which include a variety of variants in term of the size of the
@@ -319,7 +322,7 @@ config ATM_IA_DEBUG
 
 config ATM_FORE200E_MAYBE
         tristate "FORE Systems 200E-series"
-        depends on (PCI || SBUS) && ATM
+        depends on PCI || SBUS
         ---help---
           This is a driver for the FORE Systems 200E-series ATM adapter
           cards. It simultaneously supports PCA-200E and SBA-200E models
@@ -436,7 +439,7 @@ config ATM_FORE200E
 
 config ATM_HE
         tristate "ForeRunner HE Series"
-        depends on PCI && ATM
+        depends on PCI
         help
           This is a driver for the Marconi ForeRunner HE-series ATM adapter
           cards. It simultaneously supports the 155 and 622 versions.
@@ -448,5 +451,4 @@ config ATM_HE_USE_SUNI
           Support for the S/UNI-Ultra and S/UNI-622 found in the ForeRunner
           HE cards.  This driver provides carrier detection some statistics.
 
-endmenu
-
+endif # ATM
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 0300e7f54cc4..2e18a63ead36 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -6,6 +6,7 @@
 #
 
 menu "Auxiliary Display support"
+        depends on PARPORT
 
 config KS0108
         tristate "KS0108 LCD Controller"
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index e177c9533b6c..e1c0730a3b99 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -101,19 +101,6 @@ static void add_dr(struct device *dev, struct devres_node *node)
         list_add_tail(&node->entry, &dev->devres_head);
 }
 
-/**
- * devres_alloc - Allocate device resource data
- * @release: Release function devres will be associated with
- * @size: Allocation size
- * @gfp: Allocation flags
- *
- * allocate devres of @size bytes.  The allocated area is zeroed, then
- * associated with @release.  The returned pointer can be passed to
- * other devres_*() functions.
- *
- * RETURNS:
- * Pointer to allocated devres on success, NULL on failure.
- */
 #ifdef CONFIG_DEBUG_DEVRES
 void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp,
                       const char *name)
@@ -128,6 +115,19 @@ void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp,
 }
 EXPORT_SYMBOL_GPL(__devres_alloc);
 #else
+/**
+ * devres_alloc - Allocate device resource data
+ * @release: Release function devres will be associated with
+ * @size: Allocation size
+ * @gfp: Allocation flags
+ *
+ * Allocate devres of @size bytes.  The allocated area is zeroed, then
+ * associated with @release.  The returned pointer can be passed to
+ * other devres_*() functions.
+ *
+ * RETURNS:
+ * Pointer to allocated devres on success, NULL on failure.
+ */
 void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp)
 {
         struct devres *dr;
@@ -416,7 +416,7 @@ static int release_nodes(struct device *dev, struct list_head *first,
 }
 
 /**
- * devres_release_all - Release all resources
+ * devres_release_all - Release all managed resources
  * @dev: Device to release resources for
  *
  * Release all resources associated with @dev.  This function is
@@ -600,7 +600,7 @@ static int devm_kzalloc_match(struct device *dev, void *res, void *data)
 }
 
 /**
- * devm_kzalloc - Managed kzalloc
+ * devm_kzalloc - Resource-managed kzalloc
  * @dev: Device to allocate memory for
  * @size: Allocation size
  * @gfp: Allocation gfp flags
@@ -628,7 +628,7 @@ void * devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
 EXPORT_SYMBOL_GPL(devm_kzalloc);
 
 /**
- * devm_kfree - Managed kfree
+ * devm_kfree - Resource-managed kfree
  * @dev: Device this memory belongs to
  * @p: Memory to free
  *
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index 9406259754ad..91970e9bb05e 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -8,6 +8,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/poison.h>
+#include <linux/sched.h>
 
 /*
  * Pool allocator ... wraps the dma_alloc_coherent page allocator, so
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 17b5ece8f82c..869ff8c00146 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -160,6 +160,11 @@ static void platform_device_release(struct device *dev)
  *
  *      Create a platform device object which can have other objects attached
  *      to it, and which will have attached objects freed when it is released.
+ *
+ *      This device will be marked as not supporting hotpluggable drivers; no
+ *      device add/remove uevents will be generated.  In the unusual case that
+ *      the device isn't being dynamically allocated as a legacy "probe the
+ *      hardware" driver, infrastructure code should reverse this marking.
  */
 struct platform_device *platform_device_alloc(const char *name, unsigned int id)
 {
@@ -172,6 +177,12 @@ struct platform_device *platform_device_alloc(const char *name, unsigned int id)
                 pa->pdev.id = id;
                 device_initialize(&pa->pdev.dev);
                 pa->pdev.dev.release = platform_device_release;
+
+                /* prevent hotplug "modprobe $(MODALIAS)" from causing trouble in
+                 * legacy probe-the-hardware drivers, which don't properly split
+                 * out device enumeration logic from drivers.
+                 */
+                pa->pdev.dev.uevent_suppress = 1;
         }
 
         return pa ? &pa->pdev : NULL;
@@ -349,8 +360,15 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);
  *      This function creates a simple platform device that requires minimal
  *      resource and memory management. Canned release function freeing
  *      memory allocated for the device allows drivers using such devices
- *      to be unloaded iwithout waiting for the last reference to the device
+ *      to be unloaded without waiting for the last reference to the device
  *      to be dropped.
+ *
+ *      This interface is primarily intended for use with legacy drivers
+ *      which probe hardware directly.  Because such drivers create sysfs
+ *      device nodes themselves, rather than letting system infrastructure
+ *      handle such device enumeration tasks, they don't fully conform to
+ *      the Linux driver model.  In particular, when such drivers are built
+ *      as modules, they can't be "hotplugged".
  */
 struct platform_device *platform_device_register_simple(char *name, unsigned int id,
                                                         struct resource *res, unsigned int num)
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 067a9e8bc377..8d8cdfec6529 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -126,10 +126,13 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
                 rc = topology_add_dev(cpu);
                 break;
         case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
                 topology_remove_dev(cpu);
                 break;
         }
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 17ee97f3a99b..b4c8319138b2 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -444,8 +444,6 @@ config CDROM_PKTCDVD_WCACHE
           this option is dangerous unless the CD-RW media is known good, as we
           don't do deferred write error handling yet.
 
-source "drivers/s390/block/Kconfig"
-
 config ATA_OVER_ETH
         tristate "ATA over Ethernet support"
         depends on NET
@@ -453,6 +451,8 @@ config ATA_OVER_ETH
         This driver provides Support for ATA over Ethernet block
         devices like the Coraid EtherDrive (R) Storage Blade.
 
+source "drivers/s390/block/Kconfig"
+
 endmenu
 
 endif
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index e2e043290963..1d9d9b4f48cc 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -65,7 +65,6 @@ not be guaranteed. There are several ways to assure this:
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 65a725cd3422..5acc6c44aead 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -45,6 +45,10 @@
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <linux/completion.h>
+#include <scsi/scsi.h>
+#include <scsi/sg.h>
+#include <scsi/scsi_ioctl.h>
+#include <linux/cdrom.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
 #define DRIVER_NAME "HP CISS Driver (v 3.6.14)"
@@ -1152,6 +1156,30 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                         kfree(ioc);
                         return status;
                 }
+
+        /* scsi_cmd_ioctl handles these, below, though some are not */
+        /* very meaningful for cciss.  SG_IO is the main one people want. */
+
+        case SG_GET_VERSION_NUM:
+        case SG_SET_TIMEOUT:
+        case SG_GET_TIMEOUT:
+        case SG_GET_RESERVED_SIZE:
+        case SG_SET_RESERVED_SIZE:
+        case SG_EMULATED_HOST:
+        case SG_IO:
+        case SCSI_IOCTL_SEND_COMMAND:
+                return scsi_cmd_ioctl(filep, disk, cmd, argp);
+
+        /* scsi_cmd_ioctl would normally handle these, below, but */
+        /* they aren't a good fit for cciss, as CD-ROMs are */
+        /* not supported, and we don't have any bus/target/lun */
+        /* which we present to the kernel. */
+
+        case CDROM_SEND_PACKET:
+        case CDROMCLOSETRAY:
+        case CDROMEJECT:
+        case SCSI_IOCTL_GET_IDLUN:
+        case SCSI_IOCTL_GET_BUS_NUMBER:
         default:
                 return -ENOTTY;
         }
@@ -1234,7 +1262,7 @@ static void cciss_softirq_done(struct request *rq)
                 pci_unmap_page(h->pdev, temp64.val, cmd->SG[i].Len, ddir);
         }
 
-        complete_buffers(rq->bio, rq->errors);
+        complete_buffers(rq->bio, (rq->errors == 0));
 
         if (blk_fs_request(rq)) {
                 const int rw = rq_data_dir(rq);
@@ -1248,7 +1276,7 @@ static void cciss_softirq_done(struct request *rq)
 
         add_disk_randomness(rq->rq_disk);
         spin_lock_irqsave(&h->lock, flags);
-        end_that_request_last(rq, rq->errors);
+        end_that_request_last(rq, (rq->errors == 0));
         cmd_free(h, cmd, 1);
         cciss_check_queues(h);
         spin_unlock_irqrestore(&h->lock, flags);
@@ -2336,6 +2364,44 @@ static inline void resend_cciss_cmd(ctlr_info_t *h, CommandList_struct *c)
         start_io(h);
 }
 
+static inline int evaluate_target_status(CommandList_struct *cmd)
+{
+        unsigned char sense_key;
+        int error_count = 1;
+
+        if (cmd->err_info->ScsiStatus != 0x02) { /* not check condition? */
+                if (!blk_pc_request(cmd->rq))
+                        printk(KERN_WARNING "cciss: cmd %p "
+                               "has SCSI Status 0x%x\n",
+                               cmd, cmd->err_info->ScsiStatus);
+                return error_count;
+        }
+
+        /* check the sense key */
+        sense_key = 0xf & cmd->err_info->SenseInfo[2];
+        /* no status or recovered error */
+        if ((sense_key == 0x0) || (sense_key == 0x1))
+                error_count = 0;
+
+        if (!blk_pc_request(cmd->rq)) { /* Not SG_IO or similar? */
+                if (error_count != 0)
+                        printk(KERN_WARNING "cciss: cmd %p has CHECK CONDITION"
+                               " sense key = 0x%x\n", cmd, sense_key);
+                return error_count;
+        }
+
+        /* SG_IO or similar, copy sense data back */
+        if (cmd->rq->sense) {
+                if (cmd->rq->sense_len > cmd->err_info->SenseLen)
+                        cmd->rq->sense_len = cmd->err_info->SenseLen;
+                memcpy(cmd->rq->sense, cmd->err_info->SenseInfo,
+                        cmd->rq->sense_len);
+        } else
+                cmd->rq->sense_len = 0;
+
+        return error_count;
+}
+
 /* checks the status of the job and calls complete buffers to mark all
  * buffers for the completed job. Note that this function does not need
  * to hold the hba/queue lock.
@@ -2343,109 +2409,99 @@ static inline void resend_cciss_cmd(ctlr_info_t *h, CommandList_struct *c)
 static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,
                                     int timeout)
 {
-        int status = 1;
         int retry_cmd = 0;
+        struct request *rq = cmd->rq;
+
+        rq->errors = 0;
 
         if (timeout)
-                status = 0;
+                rq->errors = 1;
 
-        if (cmd->err_info->CommandStatus != 0) {        /* an error has occurred */
-                switch (cmd->err_info->CommandStatus) {
-                        unsigned char sense_key;
-                case CMD_TARGET_STATUS:
-                        status = 0;
+        if (cmd->err_info->CommandStatus == 0)  /* no error has occurred */
+                goto after_error_processing;
 
-                        if (cmd->err_info->ScsiStatus == 0x02) {
-                                printk(KERN_WARNING "cciss: cmd %p "
-                                       "has CHECK CONDITION "
-                                       " byte 2 = 0x%x\n", cmd,
-                                       cmd->err_info->SenseInfo[2]
-                                    );
-                                /* check the sense key */
-                                sense_key = 0xf & cmd->err_info->SenseInfo[2];
-                                /* no status or recovered error */
-                                if ((sense_key == 0x0) || (sense_key == 0x1)) {
-                                        status = 1;
-                                }
-                        } else {
-                                printk(KERN_WARNING "cciss: cmd %p "
-                                       "has SCSI Status 0x%x\n",
-                                       cmd, cmd->err_info->ScsiStatus);
-                        }
-                        break;
-                case CMD_DATA_UNDERRUN:
+        switch (cmd->err_info->CommandStatus) {
+        case CMD_TARGET_STATUS:
+                rq->errors = evaluate_target_status(cmd);
+                break;
+        case CMD_DATA_UNDERRUN:
+                if (blk_fs_request(cmd->rq)) {
                         printk(KERN_WARNING "cciss: cmd %p has"
                                " completed with data underrun "
                                "reported\n", cmd);
-                        break;
-                case CMD_DATA_OVERRUN:
+                        cmd->rq->data_len = cmd->err_info->ResidualCnt;
+                }
+                break;
+        case CMD_DATA_OVERRUN:
+                if (blk_fs_request(cmd->rq))
                         printk(KERN_WARNING "cciss: cmd %p has"
                                " completed with data overrun "
                                "reported\n", cmd);
-                        break;
-                case CMD_INVALID:
-                        printk(KERN_WARNING "cciss: cmd %p is "
-                               "reported invalid\n", cmd);
-                        status = 0;
-                        break;
-                case CMD_PROTOCOL_ERR:
-                        printk(KERN_WARNING "cciss: cmd %p has "
-                               "protocol error \n", cmd);
-                        status = 0;
-                        break;
-                case CMD_HARDWARE_ERR:
-                        printk(KERN_WARNING "cciss: cmd %p had "
-                               " hardware error\n", cmd);
-                        status = 0;
-                        break;
-                case CMD_CONNECTION_LOST:
-                        printk(KERN_WARNING "cciss: cmd %p had "
-                               "connection lost\n", cmd);
-                        status = 0;
-                        break;
-                case CMD_ABORTED:
-                        printk(KERN_WARNING "cciss: cmd %p was "
-                               "aborted\n", cmd);
-                        status = 0;
-                        break;
-                case CMD_ABORT_FAILED:
-                        printk(KERN_WARNING "cciss: cmd %p reports "
-                               "abort failed\n", cmd);
-                        status = 0;
-                        break;
-                case CMD_UNSOLICITED_ABORT:
-                        printk(KERN_WARNING "cciss%d: unsolicited "
-                               "abort %p\n", h->ctlr, cmd);
-                        if (cmd->retry_count < MAX_CMD_RETRIES) {
-                                retry_cmd = 1;
-                                printk(KERN_WARNING
-                                       "cciss%d: retrying %p\n", h->ctlr, cmd);
-                                cmd->retry_count++;
-                        } else
-                                printk(KERN_WARNING
-                                       "cciss%d: %p retried too "
-                                       "many times\n", h->ctlr, cmd);
-                        status = 0;
-                        break;
-                case CMD_TIMEOUT:
-                        printk(KERN_WARNING "cciss: cmd %p timedout\n", cmd);
-                        status = 0;
-                        break;
-                default:
-                        printk(KERN_WARNING "cciss: cmd %p returned "
-                               "unknown status %x\n", cmd,
-                               cmd->err_info->CommandStatus);
-                        status = 0;
-                }
+                break;
+        case CMD_INVALID:
+                printk(KERN_WARNING "cciss: cmd %p is "
+                       "reported invalid\n", cmd);
+                rq->errors = 1;
+                break;
+        case CMD_PROTOCOL_ERR:
+                printk(KERN_WARNING "cciss: cmd %p has "
+                       "protocol error \n", cmd);
+                rq->errors = 1;
+                break;
+        case CMD_HARDWARE_ERR:
+                printk(KERN_WARNING "cciss: cmd %p had "
+                       " hardware error\n", cmd);
+                rq->errors = 1;
+                break;
+        case CMD_CONNECTION_LOST:
+                printk(KERN_WARNING "cciss: cmd %p had "
+                       "connection lost\n", cmd);
+                rq->errors = 1;
+                break;
+        case CMD_ABORTED:
+                printk(KERN_WARNING "cciss: cmd %p was "
+                       "aborted\n", cmd);
+                rq->errors = 1;
+                break;
+        case CMD_ABORT_FAILED:
+                printk(KERN_WARNING "cciss: cmd %p reports "
+                       "abort failed\n", cmd);
+                rq->errors = 1;
+                break;
+        case CMD_UNSOLICITED_ABORT:
+                printk(KERN_WARNING "cciss%d: unsolicited "
+                       "abort %p\n", h->ctlr, cmd);
+                if (cmd->retry_count < MAX_CMD_RETRIES) {
+                        retry_cmd = 1;
+                        printk(KERN_WARNING
+                               "cciss%d: retrying %p\n", h->ctlr, cmd);
+                        cmd->retry_count++;
+                } else
+                        printk(KERN_WARNING
+                               "cciss%d: %p retried too "
+                               "many times\n", h->ctlr, cmd);
+                rq->errors = 1;
+                break;
+        case CMD_TIMEOUT:
+                printk(KERN_WARNING "cciss: cmd %p timedout\n", cmd);
+                rq->errors = 1;
+                break;
+        default:
+                printk(KERN_WARNING "cciss: cmd %p returned "
+                       "unknown status %x\n", cmd,
+                       cmd->err_info->CommandStatus);
+                rq->errors = 1;
         }
+
+after_error_processing:
+
         /* We need to return this command */
         if (retry_cmd) {
                 resend_cciss_cmd(h, cmd);
                 return;
         }
-
+        cmd->rq->data_len = 0;
         cmd->rq->completion_data = cmd;
-        cmd->rq->errors = status;
         blk_add_trace_rq(cmd->rq->q, cmd->rq, BLK_TA_COMPLETE);
         blk_complete_request(cmd->rq);
 }
@@ -2539,32 +2595,40 @@ static void do_cciss_request(request_queue_t *q)
 #endif                          /* CCISS_DEBUG */
 
         c->Header.SGList = c->Header.SGTotal = seg;
-        if(h->cciss_read == CCISS_READ_10) {
-                c->Request.CDB[1] = 0;
-                c->Request.CDB[2] = (start_blk >> 24) & 0xff;   //MSB
-                c->Request.CDB[3] = (start_blk >> 16) & 0xff;
-                c->Request.CDB[4] = (start_blk >> 8) & 0xff;
-                c->Request.CDB[5] = start_blk & 0xff;
-                c->Request.CDB[6] = 0;  // (sect >> 24) & 0xff; MSB
-                c->Request.CDB[7] = (creq->nr_sectors >> 8) & 0xff;
-                c->Request.CDB[8] = creq->nr_sectors & 0xff;
-                c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
+        if (likely(blk_fs_request(creq))) {
+                if(h->cciss_read == CCISS_READ_10) {
+                        c->Request.CDB[1] = 0;
+                        c->Request.CDB[2] = (start_blk >> 24) & 0xff;   //MSB
+                        c->Request.CDB[3] = (start_blk >> 16) & 0xff;
+                        c->Request.CDB[4] = (start_blk >> 8) & 0xff;
+                        c->Request.CDB[5] = start_blk & 0xff;
+                        c->Request.CDB[6] = 0;  // (sect >> 24) & 0xff; MSB
+                        c->Request.CDB[7] = (creq->nr_sectors >> 8) & 0xff;
+                        c->Request.CDB[8] = creq->nr_sectors & 0xff;
+                        c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
+                } else {
+                        c->Request.CDBLen = 16;
+                        c->Request.CDB[1]= 0;
+                        c->Request.CDB[2]= (start_blk >> 56) & 0xff;    //MSB
+                        c->Request.CDB[3]= (start_blk >> 48) & 0xff;
+                        c->Request.CDB[4]= (start_blk >> 40) & 0xff;
+                        c->Request.CDB[5]= (start_blk >> 32) & 0xff;
+                        c->Request.CDB[6]= (start_blk >> 24) & 0xff;
+                        c->Request.CDB[7]= (start_blk >> 16) & 0xff;
+                        c->Request.CDB[8]= (start_blk >>  8) & 0xff;
+                        c->Request.CDB[9]= start_blk & 0xff;
+                        c->Request.CDB[10]= (creq->nr_sectors >>  24) & 0xff;
+                        c->Request.CDB[11]= (creq->nr_sectors >>  16) & 0xff;
+                        c->Request.CDB[12]= (creq->nr_sectors >>  8) & 0xff;
+                        c->Request.CDB[13]= creq->nr_sectors & 0xff;
+                        c->Request.CDB[14] = c->Request.CDB[15] = 0;
+                }
+        } else if (blk_pc_request(creq)) {
+                c->Request.CDBLen = creq->cmd_len;
+                memcpy(c->Request.CDB, creq->cmd, BLK_MAX_CDB);
         } else {
-                c->Request.CDBLen = 16;
-                c->Request.CDB[1]= 0;
-                c->Request.CDB[2]= (start_blk >> 56) & 0xff;    //MSB
-                c->Request.CDB[3]= (start_blk >> 48) & 0xff;
-                c->Request.CDB[4]= (start_blk >> 40) & 0xff;
-                c->Request.CDB[5]= (start_blk >> 32) & 0xff;
-                c->Request.CDB[6]= (start_blk >> 24) & 0xff;
-                c->Request.CDB[7]= (start_blk >> 16) & 0xff;
-                c->Request.CDB[8]= (start_blk >>  8) & 0xff;
-                c->Request.CDB[9]= start_blk & 0xff;
-                c->Request.CDB[10]= (creq->nr_sectors >>  24) & 0xff;
-                c->Request.CDB[11]= (creq->nr_sectors >>  16) & 0xff;
-                c->Request.CDB[12]= (creq->nr_sectors >>  8) & 0xff;
-                c->Request.CDB[13]= creq->nr_sectors & 0xff;
-                c->Request.CDB[14] = c->Request.CDB[15] = 0;
+                printk(KERN_WARNING "cciss%d: bad request type %d\n", h->ctlr, creq->cmd_type);
+                BUG();
         }
 
         spin_lock_irq(q->queue_lock);
@@ -3405,13 +3469,39 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         return -1;
 }
 
-static void cciss_remove_one(struct pci_dev *pdev)
+static void cciss_shutdown(struct pci_dev *pdev)
 {
         ctlr_info_t *tmp_ptr;
-        int i, j;
+        int i;
         char flush_buf[4];
         int return_code;
 
+        tmp_ptr = pci_get_drvdata(pdev);
+        if (tmp_ptr == NULL)
+                return;
+        i = tmp_ptr->ctlr;
+        if (hba[i] == NULL)
+                return;
+
+        /* Turn board interrupts off  and send the flush cache command */
+        /* sendcmd will turn off interrupt, and send the flush...
+         * To write all data in the battery backed cache to disks */
+        memset(flush_buf, 0, 4);
+        return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,
+                              TYPE_CMD);
+        if (return_code == IO_OK) {
+                printk(KERN_INFO "Completed flushing cache on controller %d\n", i);
+        } else {
+                printk(KERN_WARNING "Error flushing cache on controller %d\n", i);
+        }
+        free_irq(hba[i]->intr[2], hba[i]);
+}
+
+static void __devexit cciss_remove_one(struct pci_dev *pdev)
+{
+        ctlr_info_t *tmp_ptr;
+        int i, j;
+
         if (pci_get_drvdata(pdev) == NULL) {
                 printk(KERN_ERR "cciss: Unable to remove device \n");
                 return;
@@ -3442,18 +3532,7 @@ static void cciss_remove_one(struct pci_dev *pdev)
 
         cciss_unregister_scsi(i);       /* unhook from SCSI subsystem */
 
-        /* Turn board interrupts off  and send the flush cache command */
-        /* sendcmd will turn off interrupt, and send the flush...
-         * To write all data in the battery backed cache to disks */
-        memset(flush_buf, 0, 4);
-        return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,
-                              TYPE_CMD);
-        if (return_code == IO_OK) {
-                printk(KERN_INFO "Completed flushing cache on controller %d\n", i);
-        } else {
-                printk(KERN_WARNING "Error flushing cache on controller %d\n", i);
-        }
-        free_irq(hba[i]->intr[2], hba[i]);
+        cciss_shutdown(pdev);
 
 #ifdef CONFIG_PCI_MSI
         if (hba[i]->msix_vector)
@@ -3486,7 +3565,7 @@ static struct pci_driver cciss_pci_driver = {
         .probe = cciss_init_one,
         .remove = __devexit_p(cciss_remove_one),
         .id_table = cciss_pci_device_id,        /* id_table */
-        .shutdown = cciss_remove_one,
+        .shutdown = cciss_shutdown,
 };
 
 /*
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index bb15051ffbe0..90961a8ea895 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -35,7 +35,6 @@
 
 #include <asm/atomic.h>
 
-#include <scsi/scsi.h> 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h> 
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5231ed7e723f..3587cb434371 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4334,7 +4334,10 @@ static int __init floppy_init(void)
                 if (err)
                         goto out_flush_work;
 
-                device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
+                err = device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
+                if (err)
+                        goto out_unreg_platform_dev;
+
                 /* to be cleaned up... */
                 disks[drive]->private_data = (void *)(long)drive;
                 disks[drive]->queue = floppy_queue;
@@ -4345,6 +4348,8 @@ static int __init floppy_init(void)
 
         return 0;
 
+out_unreg_platform_dev:
+        platform_device_unregister(&floppy_device[drive]);
 out_flush_work:
         flush_scheduled_work();
         if (usage_count)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 0d4ccd4a0957..5526eadb6592 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -77,9 +77,8 @@
 
 #include <asm/uaccess.h>
 
-static int max_loop = 8;
-static struct loop_device *loop_dev;
-static struct gendisk **disks;
+static LIST_HEAD(loop_devices);
+static DEFINE_MUTEX(loop_devices_mutex);
 
 /*
  * Transfer functions
@@ -183,7 +182,7 @@ figure_loop_size(struct loop_device *lo)
         if (unlikely((loff_t)x != size))
                 return -EFBIG;
 
-        set_capacity(disks[lo->lo_number], x);
+        set_capacity(lo->lo_disk, x);
         return 0;                                       
 }
 
@@ -244,17 +243,13 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
                 transfer_result = lo_do_transfer(lo, WRITE, page, offset,
                                 bvec->bv_page, bv_offs, size, IV);
                 if (unlikely(transfer_result)) {
-                        char *kaddr;
-
                         /*
                          * The transfer failed, but we still write the data to
                          * keep prepare/commit calls balanced.
                          */
                         printk(KERN_ERR "loop: transfer error block %llu\n",
                                (unsigned long long)index);
-                        kaddr = kmap_atomic(page, KM_USER0);
-                        memset(kaddr + offset, 0, size);
-                        kunmap_atomic(kaddr, KM_USER0);
+                        zero_user_page(page, offset, size, KM_USER0);
                 }
                 flush_dcache_page(page);
                 ret = aops->commit_write(file, page, offset,
@@ -812,7 +807,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
         lo->lo_queue->queuedata = lo;
         lo->lo_queue->unplug_fn = loop_unplug;
 
-        set_capacity(disks[lo->lo_number], size);
+        set_capacity(lo->lo_disk, size);
         bd_set_size(bdev, size << 9);
 
         set_blocksize(bdev, lo_blocksize);
@@ -832,7 +827,7 @@ out_clr:
         lo->lo_device = NULL;
         lo->lo_backing_file = NULL;
         lo->lo_flags = 0;
-        set_capacity(disks[lo->lo_number], 0);
+        set_capacity(lo->lo_disk, 0);
         invalidate_bdev(bdev);
         bd_set_size(bdev, 0);
         mapping_set_gfp_mask(mapping, lo->old_gfp_mask);
@@ -918,7 +913,7 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
         memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
         memset(lo->lo_file_name, 0, LO_NAME_SIZE);
         invalidate_bdev(bdev);
-        set_capacity(disks[lo->lo_number], 0);
+        set_capacity(lo->lo_disk, 0);
         bd_set_size(bdev, 0);
         mapping_set_gfp_mask(filp->f_mapping, gfp);
         lo->lo_state = Lo_unbound;
@@ -1357,8 +1352,9 @@ static struct block_device_operations lo_fops = {
 /*
  * And now the modules code and kernel interface.
  */
+static int max_loop;
 module_param(max_loop, int, 0);
-MODULE_PARM_DESC(max_loop, "Maximum number of loop devices (1-256)");
+MODULE_PARM_DESC(max_loop, "obsolete, loop device is created on-demand");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_BLOCKDEV_MAJOR(LOOP_MAJOR);
 
@@ -1383,7 +1379,7 @@ int loop_unregister_transfer(int number)
 
         xfer_funcs[n] = NULL;
 
-        for (lo = &loop_dev[0]; lo < &loop_dev[max_loop]; lo++) {
+        list_for_each_entry(lo, &loop_devices, lo_list) {
                 mutex_lock(&lo->lo_ctl_mutex);
 
                 if (lo->lo_encryption == xfer)
@@ -1398,91 +1394,100 @@ int loop_unregister_transfer(int number)
 EXPORT_SYMBOL(loop_register_transfer);
 EXPORT_SYMBOL(loop_unregister_transfer);
 
-static int __init loop_init(void)
+static struct loop_device *loop_init_one(int i)
 {
-        int     i;
+        struct loop_device *lo;
+        struct gendisk *disk;
 
-        if (max_loop < 1 || max_loop > 256) {
-                printk(KERN_WARNING "loop: invalid max_loop (must be between"
-                                    " 1 and 256), using default (8)\n");
-                max_loop = 8;
+        list_for_each_entry(lo, &loop_devices, lo_list) {
+                if (lo->lo_number == i)
+                        return lo;
         }
 
-        if (register_blkdev(LOOP_MAJOR, "loop"))
-                return -EIO;
-
-        loop_dev = kmalloc(max_loop * sizeof(struct loop_device), GFP_KERNEL);
-        if (!loop_dev)
-                goto out_mem1;
-        memset(loop_dev, 0, max_loop * sizeof(struct loop_device));
+        lo = kzalloc(sizeof(*lo), GFP_KERNEL);
+        if (!lo)
+                goto out;
 
-        disks = kmalloc(max_loop * sizeof(struct gendisk *), GFP_KERNEL);
-        if (!disks)
-                goto out_mem2;
+        lo->lo_queue = blk_alloc_queue(GFP_KERNEL);
+        if (!lo->lo_queue)
+                goto out_free_dev;
+
+        disk = lo->lo_disk = alloc_disk(1);
+        if (!disk)
+                goto out_free_queue;
+
+        mutex_init(&lo->lo_ctl_mutex);
+        lo->lo_number           = i;
+        lo->lo_thread           = NULL;
+        init_waitqueue_head(&lo->lo_event);
+        spin_lock_init(&lo->lo_lock);
+        disk->major             = LOOP_MAJOR;
+        disk->first_minor       = i;
+        disk->fops              = &lo_fops;
+        disk->private_data      = lo;
+        disk->queue             = lo->lo_queue;
+        sprintf(disk->disk_name, "loop%d", i);
+        add_disk(disk);
+        list_add_tail(&lo->lo_list, &loop_devices);
+        return lo;
+
+out_free_queue:
+        blk_cleanup_queue(lo->lo_queue);
+out_free_dev:
+        kfree(lo);
+out:
+        return NULL;
+}
 
-        for (i = 0; i < max_loop; i++) {
-                disks[i] = alloc_disk(1);
-                if (!disks[i])
-                        goto out_mem3;
-        }
+static void loop_del_one(struct loop_device *lo)
+{
+        del_gendisk(lo->lo_disk);
+        blk_cleanup_queue(lo->lo_queue);
+        put_disk(lo->lo_disk);
+        list_del(&lo->lo_list);
+        kfree(lo);
+}
 
-        for (i = 0; i < max_loop; i++) {
-                struct loop_device *lo = &loop_dev[i];
-                struct gendisk *disk = disks[i];
-
-                memset(lo, 0, sizeof(*lo));
-                lo->lo_queue = blk_alloc_queue(GFP_KERNEL);
-                if (!lo->lo_queue)
-                        goto out_mem4;
-                mutex_init(&lo->lo_ctl_mutex);
-                lo->lo_number = i;
-                lo->lo_thread = NULL;
-                init_waitqueue_head(&lo->lo_event);
-                spin_lock_init(&lo->lo_lock);
-                disk->major = LOOP_MAJOR;
-                disk->first_minor = i;
-                disk->fops = &lo_fops;
-                sprintf(disk->disk_name, "loop%d", i);
-                disk->private_data = lo;
-                disk->queue = lo->lo_queue;
-        }
+static struct kobject *loop_probe(dev_t dev, int *part, void *data)
+{
+        struct loop_device *lo;
+        struct kobject *kobj;
 
-        /* We cannot fail after we call this, so another loop!*/
-        for (i = 0; i < max_loop; i++)
-                add_disk(disks[i]);
-        printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop);
-        return 0;
+        mutex_lock(&loop_devices_mutex);
+        lo = loop_init_one(dev & MINORMASK);
+        kobj = lo ? get_disk(lo->lo_disk) : ERR_PTR(-ENOMEM);
+        mutex_unlock(&loop_devices_mutex);
 
-out_mem4:
-        while (i--)
-                blk_cleanup_queue(loop_dev[i].lo_queue);
-        i = max_loop;
-out_mem3:
-        while (i--)
-                put_disk(disks[i]);
-        kfree(disks);
-out_mem2:
-        kfree(loop_dev);
-out_mem1:
-        unregister_blkdev(LOOP_MAJOR, "loop");
-        printk(KERN_ERR "loop: ran out of memory\n");
-        return -ENOMEM;
+        *part = 0;
+        return kobj;
 }
 
-static void loop_exit(void)
+static int __init loop_init(void)
 {
-        int i;
+        if (register_blkdev(LOOP_MAJOR, "loop"))
+                return -EIO;
+        blk_register_region(MKDEV(LOOP_MAJOR, 0), 1UL << MINORBITS,
+                                  THIS_MODULE, loop_probe, NULL, NULL);
+
+        if (max_loop) {
+                printk(KERN_INFO "loop: the max_loop option is obsolete "
+                                 "and will be removed in March 2008\n");
 
-        for (i = 0; i < max_loop; i++) {
-                del_gendisk(disks[i]);
-                blk_cleanup_queue(loop_dev[i].lo_queue);
-                put_disk(disks[i]);
         }
+        printk(KERN_INFO "loop: module loaded\n");
+        return 0;
+}
+
+static void __exit loop_exit(void)
+{
+        struct loop_device *lo, *next;
+
+        list_for_each_entry_safe(lo, next, &loop_devices, lo_list)
+                loop_del_one(lo);
+
+        blk_unregister_region(MKDEV(LOOP_MAJOR, 0), 1UL << MINORBITS);
         if (unregister_blkdev(LOOP_MAJOR, "loop"))
                 printk(KERN_WARNING "loop: cannot unregister blkdev\n");
-
-        kfree(disks);
-        kfree(loop_dev);
 }
 
 module_init(loop_init);
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 090796bef78f..069ae39a9cd9 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -366,20 +366,25 @@ static struct disk_attribute pid_attr = {
         .show = pid_show,
 };
 
-static void nbd_do_it(struct nbd_device *lo)
+static int nbd_do_it(struct nbd_device *lo)
 {
         struct request *req;
+        int ret;
 
         BUG_ON(lo->magic != LO_MAGIC);
 
         lo->pid = current->pid;
-        sysfs_create_file(&lo->disk->kobj, &pid_attr.attr);
+        ret = sysfs_create_file(&lo->disk->kobj, &pid_attr.attr);
+        if (ret) {
+                printk(KERN_ERR "nbd: sysfs_create_file failed!");
+                return ret;
+        }
 
         while ((req = nbd_read_stat(lo)) != NULL)
                 nbd_end_request(req);
 
         sysfs_remove_file(&lo->disk->kobj, &pid_attr.attr);
-        return;
+        return 0;
 }
 
 static void nbd_clear_que(struct nbd_device *lo)
@@ -569,7 +574,9 @@ static int nbd_ioctl(struct inode *inode, struct file *file,
         case NBD_DO_IT:
                 if (!lo->file)
                         return -EINVAL;
-                nbd_do_it(lo);
+                error = nbd_do_it(lo);
+                if (error)
+                        return error;
                 /* on return tidy up in case we have a signal */
                 /* Forcibly shutdown the socket causing all listeners
                  * to error
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 43d4ebcb3b44..a1512da32410 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -151,7 +151,7 @@ static int ramdisk_commit_write(struct file *file, struct page *page,
 }
 
 /*
- * ->writepage to the the blockdev's mapping has to redirty the page so that the
+ * ->writepage to the blockdev's mapping has to redirty the page so that the
  * VM doesn't go and steal it.  We return AOP_WRITEPAGE_ACTIVATE so that the VM
  * won't try to (pointlessly) write the page again for a while.
  *
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 5872036e8ae6..6f5d6203d725 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -44,7 +44,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 0f4203b499af..6055b9c0ac0f 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -307,7 +307,9 @@ static void hci_uart_tty_close(struct tty_struct *tty)
 
         if (hu) {
                 struct hci_dev *hdev = hu->hdev;
-                hci_uart_close(hdev);
+
+                if (hdev)
+                        hci_uart_close(hdev);
 
                 if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
                         hu->proto->close(hu);
@@ -473,12 +475,18 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
                         tty->low_latency = 1;
                 } else
                         return -EBUSY;
+                break;
 
         case HCIUARTGETPROTO:
                 if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
                         return hu->proto->id;
                 return -EUNATCH;
 
+        case HCIUARTGETDEVICE:
+                if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
+                        return hu->hdev->id;
+                return -EUNATCH;
+
         default:
                 err = n_tty_ioctl(tty, file, cmd, arg);
                 break;
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index b250e6789dee..1097ce72393f 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -28,8 +28,9 @@
 #endif
 
 /* Ioctls */
-#define HCIUARTSETPROTO _IOW('U', 200, int)
-#define HCIUARTGETPROTO _IOR('U', 201, int)
+#define HCIUARTSETPROTO         _IOW('U', 200, int)
+#define HCIUARTGETPROTO         _IOR('U', 201, int)
+#define HCIUARTGETDEVICE        _IOR('U', 202, int)
 
 /* UART protocols */
 #define HCI_UART_MAX_PROTO      4
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a26d91743b24..ef683ebd367c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -6,6 +6,7 @@ menu "Character devices"
 
 config VT
         bool "Virtual terminal" if EMBEDDED
+        depends on !S390
         select INPUT
         default y if !VIOCONS
         ---help---
@@ -81,6 +82,7 @@ config VT_HW_CONSOLE_BINDING
 
 config SERIAL_NONSTANDARD
         bool "Non-standard serial port support"
+        depends on HAS_IOMEM
         ---help---
           Say Y here if you have any non-standard serial boards -- boards
           which aren't supported using the standard "dumb" serial driver.
@@ -127,7 +129,7 @@ config ROCKETPORT
 
 config CYCLADES
         tristate "Cyclades async mux support"
-        depends on SERIAL_NONSTANDARD
+        depends on SERIAL_NONSTANDARD && (PCI || ISA)
         ---help---
           This driver supports Cyclades Z and Y multiserial boards.
           You would need something like this to connect more than two modems to
@@ -631,7 +633,8 @@ config HVC_CONSOLE
 
 config HVC_ISERIES
         bool "iSeries Hypervisor Virtual Console support"
-        depends on PPC_ISERIES && !VIOCONS
+        depends on PPC_ISERIES
+        default y
         select HVC_DRIVER
         help
           iSeries machines support a hypervisor virtual console.
@@ -764,7 +767,7 @@ config NVRAM
 
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH
+        depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -812,7 +815,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV
+        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 && !SUPERH
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -857,6 +860,7 @@ config COBALT_LCD
 
 config DTLK
         tristate "Double Talk PC internal speech card support"
+        depends on ISA
         help
           This driver is for the DoubleTalk PC, a speech synthesizer
           manufactured by RC Systems (<http://www.rcsys.com/>).  It is also
@@ -1042,7 +1046,7 @@ config HPET_MMAP
 
 config HANGCHECK_TIMER
         tristate "Hangcheck timer"
-        depends on X86 || IA64 || PPC64
+        depends on X86 || IA64 || PPC64 || S390
         help
           The hangcheck-timer module detects when the system has gone
           out to lunch past a certain margin.  It can reboot the system
@@ -1071,5 +1075,13 @@ config TELCLOCK
           /sys/devices/platform/telco_clock, with a number of files for
           controlling the behavior of this hardware.
 
+config DEVPORT
+        bool
+        depends on !M68K
+        depends on ISA || PCI
+        default y
+
+source "drivers/s390/char/Kconfig"
+
 endmenu
 
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index c9f0f250d78f..801abdd29066 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -268,7 +268,7 @@ static int __devinit aperture_valid(u64 aper, u32 size)
                 printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20);
                 return 0;
         }
-        if (aper + size > 0xffffffff) {
+       if ((u64)aper + size > 0x100000000ULL) {
                 printk(KERN_ERR PFX "Aperture out of bounds\n");
                 return 0;
         }
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 679d7f972439..c7ed617aa7ff 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -37,6 +37,7 @@
 #include <linux/agpgart.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/sched.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include "agp.h"
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 45aeb917ec63..d535c406b319 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -37,6 +37,7 @@
 #include <linux/vmalloc.h>
 #include <linux/dma-mapping.h>
 #include <linux/mm.h>
+#include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 91b062126a68..42c0a600b1ac 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -613,7 +613,7 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
                 uninorth_node = of_find_node_by_name(NULL, "u3");
         }
         if (uninorth_node) {
-                const int *revprop = get_property(uninorth_node,
+                const int *revprop = of_get_property(uninorth_node,
                                 "device-rev", NULL);
                 if (revprop != NULL)
                         uninorth_rev = *revprop & 0x3f;
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index a2bb4eccaab4..9aaf401a8975 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -384,9 +384,9 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                 .device_id      = PCI_DEVICE_ID_VIA_P4M800CE,
                 .chipset_name   = "VT3314",
         },
-        /* CX700 */
+        /* VT3324 / CX700 */
         {
-                .device_id  = PCI_DEVICE_ID_VIA_CX700,
+                .device_id  = PCI_DEVICE_ID_VIA_VT3324,
                 .chipset_name   = "CX700",
         },
         /* VT3336 */
@@ -540,7 +540,7 @@ static const struct pci_device_id agp_via_pci_table[] = {
         ID(PCI_DEVICE_ID_VIA_83_87XX_1),
         ID(PCI_DEVICE_ID_VIA_3296_0),
         ID(PCI_DEVICE_ID_VIA_P4M800CE),
-        ID(PCI_DEVICE_ID_VIA_CX700),
+        ID(PCI_DEVICE_ID_VIA_VT3324),
         ID(PCI_DEVICE_ID_VIA_VT3336),
         ID(PCI_DEVICE_ID_VIA_P4M890),
         { }
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 0e2b72f2b887..4eaceabd8cea 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1574,7 +1574,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
                 if (timeout && time_after(jiffies, orig_jiffies + timeout))
                         break;
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
 #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
         printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
 #endif
@@ -1700,7 +1700,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 #endif
                 schedule();
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
         if (extra_count)
                 state->count++;
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index c70d52ace8b2..ed53f541d9e8 100644
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -206,7 +206,7 @@ static int __init briq_panel_init(void)
         const char *machine;
         int i;
 
-        machine = get_property(root, "model", NULL);
+        machine = of_get_property(root, "model", NULL);
         if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) {
                 of_node_put(root);
                 return -ENODEV;
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index b99b7561260d..fd40b959afdd 100644
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -626,10 +626,10 @@ conv_uni_to_pc(struct vc_data *conp, long ucs)
   
         /* Only 16-bit codes supported at this time */
         if (ucs > 0xffff)
-                ucs = 0xfffd;           /* U+FFFD: REPLACEMENT CHARACTER */
-        else if (ucs < 0x20 || ucs >= 0xfffe)
+                return -4;              /* Not found */
+        else if (ucs < 0x20)
                 return -1;              /* Not a printable character */
-        else if (ucs == 0xfeff || (ucs >= 0x200a && ucs <= 0x200f))
+        else if (ucs == 0xfeff || (ucs >= 0x200b && ucs <= 0x200f))
                 return -2;                      /* Zero-width space */
         /*
          * UNI_DIRECT_BASE indicates the start of the region in the User Zone
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
index c02d9e99e050..fe6d2407baed 100644
--- a/drivers/char/cs5535_gpio.c
+++ b/drivers/char/cs5535_gpio.c
@@ -44,6 +44,7 @@ static struct pci_device_id divil_pci[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
         { } /* NULL entry */
 };
+MODULE_DEVICE_TABLE(pci, divil_pci);
 
 static struct cdev cs5535_gpio_cdev;
 
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 16dc5d1d3cb4..c72ee97d3892 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -10,15 +10,14 @@
  *
  * Initially written by Randolph Bentson <bentson@grieg.seaslug.org>.
  * Modified and maintained by Marcio Saito <marcio@cyclades.com>.
- * Currently maintained by Cyclades team <async@cyclades.com>.
  *
- * For Technical support and installation problems, please send e-mail
- * to support@cyclades.com.
+ * Copyright (C) 2007 Jiri Slaby <jirislaby@gmail.com>
  *
  * Much of the design and some of the code came from serial.c
  * which was copyright (C) 1991, 1992  Linus Torvalds.  It was
  * extensively rewritten by Theodore Ts'o, 8/16/92 -- 9/14/92,
  * and then fixed as suggested by Michael K. Johnson 12/12/92.
+ * Converted to pci probing and cleaned up by Jiri Slaby.
  *
  * This version supports shared IRQ's (only for PCI boards).
  *
@@ -591,7 +590,7 @@
  *
  */
 
-#define CY_VERSION      "2.4"
+#define CY_VERSION      "2.5"
 
 /* If you need to install more boards than NR_CARDS, change the constant
    in the definition below. No other change is necessary to support up to
@@ -624,12 +623,6 @@
 #undef  CY_ENABLE_MONITORING
 #undef  CY_PCI_DEBUG
 
-#if 0
-#define PAUSE __asm__("nop")
-#else
-#define PAUSE do {} while (0)
-#endif
-
 /*
  * Include section 
  */
@@ -659,17 +652,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-#define CY_LOCK(info,flags)                                     \
-                do {                                            \
-                spin_lock_irqsave(&cy_card[info->card].card_lock, flags); \
-                } while (0)
-
-#define CY_UNLOCK(info,flags)                                   \
-                do {                                            \
-                spin_unlock_irqrestore(&cy_card[info->card].card_lock, flags); \
-                } while (0)
-
-#include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 
@@ -682,13 +664,13 @@ static void cy_send_xchar(struct tty_struct *tty, char ch);
 #define IS_CYC_Z(card) ((card).num_chips == -1)
 
 #define Z_FPGA_CHECK(card) \
-        ((cy_readl(&((struct RUNTIME_9060 __iomem *) \
+        ((readl(&((struct RUNTIME_9060 __iomem *) \
                 ((card).ctl_addr))->init_ctrl) & (1<<17)) != 0)
 
-#define ISZLOADED(card) (((ZO_V1==cy_readl(&((struct RUNTIME_9060 __iomem *) \
+#define ISZLOADED(card) (((ZO_V1==readl(&((struct RUNTIME_9060 __iomem *) \
                         ((card).ctl_addr))->mail_box_0)) || \
                         Z_FPGA_CHECK(card)) && \
-                        (ZFIRM_ID==cy_readl(&((struct FIRM_ID __iomem *) \
+                        (ZFIRM_ID==readl(&((struct FIRM_ID __iomem *) \
                         ((card).base_addr+ID_ADDRESS))->signature)))
 
 #ifndef SERIAL_XMIT_SIZE
@@ -725,8 +707,8 @@ static unsigned int cy_isa_addresses[] = {
 #define NR_ISA_ADDRS ARRAY_SIZE(cy_isa_addresses)
 
 #ifdef MODULE
-static long maddr[NR_CARDS] = { 0, };
-static int irq[NR_CARDS] = { 0, };
+static long maddr[NR_CARDS];
+static int irq[NR_CARDS];
 
 module_param_array(maddr, long, NULL, 0);
 module_param_array(irq, int, NULL, 0);
@@ -739,11 +721,6 @@ module_param_array(irq, int, NULL, 0);
 */
 static struct cyclades_card cy_card[NR_CARDS];
 
-/* This is the per-channel data structure containing pointers, flags
- and variables for the port. This driver supports a maximum of NR_PORTS.
-*/
-static struct cyclades_port cy_port[NR_PORTS];
-
 static int cy_next_channel;     /* next minor available */
 
 /*
@@ -825,9 +802,6 @@ static int cy_chip_offset[] = { 0x0000,
 
 /* PCI related definitions */
 
-static unsigned short cy_pci_nboard;
-static unsigned short cy_isa_nboard;
-static unsigned short cy_nboard;
 #ifdef CONFIG_PCI
 static struct pci_device_id cy_pci_dev_id[] __devinitdata = {
         { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) },      /* PCI < 1Mb */
@@ -845,7 +819,7 @@ MODULE_DEVICE_TABLE(pci, cy_pci_dev_id);
 
 static void cy_start(struct tty_struct *);
 static void set_line_char(struct cyclades_port *);
-static int cyz_issue_cmd(struct cyclades_card *, uclong, ucchar, uclong);
+static int cyz_issue_cmd(struct cyclades_card *, __u32, __u8, __u32);
 #ifdef CONFIG_ISA
 static unsigned detect_isa_irq(void __iomem *);
 #endif                          /* CONFIG_ISA */
@@ -858,7 +832,6 @@ static void cyz_poll(unsigned long);
 /* The Cyclades-Z polling cycle is defined by this variable */
 static long cyz_polling_cycle = CZ_DEF_POLL;
 
-static int cyz_timeron = 0;
 static DEFINE_TIMER(cyz_timerlist, cyz_poll, 0, 0);
 
 #else                           /* CONFIG_CYZ_INTR */
@@ -871,21 +844,14 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
 {
 #ifdef SERIAL_PARANOIA_CHECK
         if (!info) {
-                printk("cyc Warning: null cyclades_port for (%s) in %s\n",
-                                name, routine);
-                return 1;
-        }
-
-        if ((long)info < (long)(&cy_port[0]) ||
-                        (long)(&cy_port[NR_PORTS]) < (long)info) {
-                printk("cyc Warning: cyclades_port out of range for (%s) in "
-                                "%s\n", name, routine);
+                printk(KERN_WARNING "cyc Warning: null cyclades_port for (%s) "
+                                "in %s\n", name, routine);
                 return 1;
         }
 
         if (info->magic != CYCLADES_MAGIC) {
-                printk("cyc Warning: bad magic number for serial struct (%s) "
-                                "in %s\n", name, routine);
+                printk(KERN_WARNING "cyc Warning: bad magic number for serial "
+                                "struct (%s) in %s\n", name, routine);
                 return 1;
         }
 #endif
@@ -943,22 +909,16 @@ do_softint(struct work_struct *work)
         if (test_and_clear_bit(Cy_EVENT_OPEN_WAKEUP, &info->event))
                 wake_up_interruptible(&info->open_wait);
 #ifdef CONFIG_CYZ_INTR
-        if (test_and_clear_bit(Cy_EVENT_Z_RX_FULL, &info->event)) {
-                if (cyz_rx_full_timer[info->line].function == NULL) {
-                        cyz_rx_full_timer[info->line].expires = jiffies + 1;
-                        cyz_rx_full_timer[info->line].function = cyz_rx_restart;
-                        cyz_rx_full_timer[info->line].data =
-                                                (unsigned long)info;
-                        add_timer(&cyz_rx_full_timer[info->line]);
-                }
-        }
+        if (test_and_clear_bit(Cy_EVENT_Z_RX_FULL, &info->event) &&
+                        !timer_pending(&cyz_rx_full_timer[info->line]))
+                mod_timer(&cyz_rx_full_timer[info->line], jiffies + 1);
 #endif
         if (test_and_clear_bit(Cy_EVENT_DELTA_WAKEUP, &info->event))
                 wake_up_interruptible(&info->delta_msr_wait);
         tty_wakeup(tty);
 #ifdef Z_WAKE
         if (test_and_clear_bit(Cy_EVENT_SHUTDOWN_WAKEUP, &info->event))
-                wake_up_interruptible(&info->shutdown_wait);
+                complete(&info->shutdown_wait);
 #endif
 } /* do_softint */
 
@@ -975,11 +935,11 @@ do_softint(struct work_struct *work)
  */
 static int cyy_issue_cmd(void __iomem * base_addr, u_char cmd, int index)
 {
-        volatile int i;
+        unsigned int i;
 
         /* Check to see that the previous command has completed */
         for (i = 0; i < 100; i++) {
-                if (cy_readb(base_addr + (CyCCR << index)) == 0) {
+                if (readb(base_addr + (CyCCR << index)) == 0) {
                         break;
                 }
                 udelay(10L);
@@ -1022,7 +982,7 @@ static unsigned detect_isa_irq(void __iomem * address)
 
         cy_writeb(address + (CyCAR << index), 0);
         cy_writeb(address + (CySRER << index),
-                  cy_readb(address + (CySRER << index)) | CyTxRdy);
+                  readb(address + (CySRER << index)) | CyTxRdy);
         local_irq_restore(flags);
 
         /* Wait ... */
@@ -1032,11 +992,11 @@ static unsigned detect_isa_irq(void __iomem * address)
         irq = probe_irq_off(irqs);
 
         /* Clean up */
-        save_xir = (u_char) cy_readb(address + (CyTIR << index));
-        save_car = cy_readb(address + (CyCAR << index));
+        save_xir = (u_char) readb(address + (CyTIR << index));
+        save_car = readb(address + (CyCAR << index));
         cy_writeb(address + (CyCAR << index), (save_xir & 0x3));
         cy_writeb(address + (CySRER << index),
-                  cy_readb(address + (CySRER << index)) & ~CyTxRdy);
+                  readb(address + (CySRER << index)) & ~CyTxRdy);
         cy_writeb(address + (CyTIR << index), (save_xir & 0x3f));
         cy_writeb(address + (CyCAR << index), (save_car));
         cy_writeb(address + (Cy_ClrIntr << index), 0);
@@ -1051,45 +1011,43 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
 {
         struct cyclades_port *info;
         struct tty_struct *tty;
-        volatile int char_count;
-        int i, j, len, mdm_change, mdm_status, outch;
+        int char_count;
+        int j, len, mdm_change, mdm_status, outch;
         int save_xir, channel, save_car;
         char data;
 
         if (status & CySRReceive) {     /* reception interrupt */
 #ifdef CY_DEBUG_INTERRUPTS
-                printk("cyy_interrupt: rcvd intr, chip %d\n\r", chip);
+                printk(KERN_DEBUG "cyy_interrupt: rcvd intr, chip %d\n", chip);
 #endif
                 /* determine the channel & change to that context */
                 spin_lock(&cinfo->card_lock);
-                save_xir = (u_char) cy_readb(base_addr + (CyRIR << index));
+                save_xir = (u_char) readb(base_addr + (CyRIR << index));
                 channel = (u_short) (save_xir & CyIRChannel);
-                i = channel + chip * 4 + cinfo->first_line;
-                info = &cy_port[i];
-                info->last_active = jiffies;
-                save_car = cy_readb(base_addr + (CyCAR << index));
+                info = &cinfo->ports[channel + chip * 4];
+                save_car = readb(base_addr + (CyCAR << index));
                 cy_writeb(base_addr + (CyCAR << index), save_xir);
 
                 /* if there is nowhere to put the data, discard it */
-                if (info->tty == 0) {
-                        j = (cy_readb(base_addr + (CyRIVR << index)) &
+                if (info->tty == NULL) {
+                        j = (readb(base_addr + (CyRIVR << index)) &
                                 CyIVRMask);
                         if (j == CyIVRRxEx) {   /* exception */
-                                data = cy_readb(base_addr + (CyRDSR << index));
+                                data = readb(base_addr + (CyRDSR << index));
                         } else {        /* normal character reception */
-                                char_count = cy_readb(base_addr +
+                                char_count = readb(base_addr +
                                                 (CyRDCR << index));
                                 while (char_count--) {
-                                        data = cy_readb(base_addr +
+                                        data = readb(base_addr +
                                                 (CyRDSR << index));
                                 }
                         }
                 } else {        /* there is an open port for this data */
                         tty = info->tty;
-                        j = (cy_readb(base_addr + (CyRIVR << index)) &
+                        j = (readb(base_addr + (CyRIVR << index)) &
                                         CyIVRMask);
                         if (j == CyIVRRxEx) {   /* exception */
-                                data = cy_readb(base_addr + (CyRDSR << index));
+                                data = readb(base_addr + (CyRDSR << index));
 
                                 /* For statistics only */
                                 if (data & CyBREAK)
@@ -1110,7 +1068,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                                                 if (data & CyBREAK) {
                                                         tty_insert_flip_char(
                                                                 tty,
-                                                                cy_readb(
+                                                                readb(
                                                                 base_addr +
                                                                 (CyRDSR <<
                                                                         index)),
@@ -1123,7 +1081,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                                                 } else if (data & CyFRAME) {
                                                         tty_insert_flip_char(
                                                                 tty,
-                                                                cy_readb(
+                                                                readb(
                                                                 base_addr +
                                                                 (CyRDSR <<
                                                                         index)),
@@ -1135,7 +1093,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                                                         /* Pieces of seven... */
                                                         tty_insert_flip_char(
                                                                 tty,
-                                                                cy_readb(
+                                                                readb(
                                                                 base_addr +
                                                                 (CyRDSR <<
                                                                         index)),
@@ -1154,7 +1112,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                                                  */
                                                         tty_insert_flip_char(
                                                                 tty,
-                                                                cy_readb(
+                                                                readb(
                                                                 base_addr +
                                                                 (CyRDSR <<
                                                                         index)),
@@ -1186,7 +1144,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                                 }
                         } else {        /* normal character reception */
                                 /* load # chars available from the chip */
-                                char_count = cy_readb(base_addr +
+                                char_count = readb(base_addr +
                                                 (CyRDCR << index));
 
 #ifdef CY_ENABLE_MONITORING
@@ -1198,7 +1156,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
 #endif
                                 len = tty_buffer_request_room(tty, char_count);
                                 while (len--) {
-                                        data = cy_readb(base_addr +
+                                        data = readb(base_addr +
                                                         (CyRDSR << index));
                                         tty_insert_flip_char(tty, data,
                                                         TTY_NORMAL);
@@ -1223,29 +1181,27 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                    is empty, we know we can always stuff a dozen
                    characters. */
 #ifdef CY_DEBUG_INTERRUPTS
-                printk("cyy_interrupt: xmit intr, chip %d\n\r", chip);
+                printk(KERN_DEBUG "cyy_interrupt: xmit intr, chip %d\n", chip);
 #endif
 
                 /* determine the channel & change to that context */
                 spin_lock(&cinfo->card_lock);
-                save_xir = (u_char) cy_readb(base_addr + (CyTIR << index));
+                save_xir = (u_char) readb(base_addr + (CyTIR << index));
                 channel = (u_short) (save_xir & CyIRChannel);
-                i = channel + chip * 4 + cinfo->first_line;
-                save_car = cy_readb(base_addr + (CyCAR << index));
+                save_car = readb(base_addr + (CyCAR << index));
                 cy_writeb(base_addr + (CyCAR << index), save_xir);
 
                 /* validate the port# (as configured and open) */
-                if ((i < 0) || (NR_PORTS <= i)) {
+                if (channel + chip * 4 >= cinfo->nports) {
                         cy_writeb(base_addr + (CySRER << index),
-                                  cy_readb(base_addr + (CySRER << index)) &
+                                  readb(base_addr + (CySRER << index)) &
                                   ~CyTxRdy);
                         goto txend;
                 }
-                info = &cy_port[i];
-                info->last_active = jiffies;
-                if (info->tty == 0) {
+                info = &cinfo->ports[channel + chip * 4];
+                if (info->tty == NULL) {
                         cy_writeb(base_addr + (CySRER << index),
-                                  cy_readb(base_addr + (CySRER << index)) &
+                                  readb(base_addr + (CySRER << index)) &
                                   ~CyTxRdy);
                         goto txdone;
                 }
@@ -1278,29 +1234,29 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
 
                 while (char_count-- > 0) {
                         if (!info->xmit_cnt) {
-                                if (cy_readb(base_addr + (CySRER << index)) &
+                                if (readb(base_addr + (CySRER << index)) &
                                                 CyTxMpty) {
                                         cy_writeb(base_addr + (CySRER << index),
-                                                cy_readb(base_addr +
+                                                readb(base_addr +
                                                         (CySRER << index)) &
                                                 ~CyTxMpty);
                                 } else {
                                         cy_writeb(base_addr + (CySRER << index),
-                                                (cy_readb(base_addr +
+                                                (readb(base_addr +
                                                         (CySRER << index)) &
                                                 ~CyTxRdy) | CyTxMpty);
                                 }
                                 goto txdone;
                         }
-                        if (info->xmit_buf == 0) {
+                        if (info->xmit_buf == NULL) {
                                 cy_writeb(base_addr + (CySRER << index),
-                                        cy_readb(base_addr + (CySRER << index))&
+                                        readb(base_addr + (CySRER << index)) &
                                         ~CyTxRdy);
                                 goto txdone;
                         }
                         if (info->tty->stopped || info->tty->hw_stopped) {
                                 cy_writeb(base_addr + (CySRER << index),
-                                        cy_readb(base_addr + (CySRER << index))&
+                                        readb(base_addr + (CySRER << index)) &
                                         ~CyTxRdy);
                                 goto txdone;
                         }
@@ -1333,7 +1289,6 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
                                                 0);
                                         info->icount.tx++;
                                         char_count--;
-                                } else {
                                 }
                         }
                 }
@@ -1353,19 +1308,16 @@ txend:
 
                 /* determine the channel & change to that context */
                 spin_lock(&cinfo->card_lock);
-                save_xir = (u_char) cy_readb(base_addr + (CyMIR << index));
+                save_xir = (u_char) readb(base_addr + (CyMIR << index));
                 channel = (u_short) (save_xir & CyIRChannel);
-                info = &cy_port[channel + chip * 4 + cinfo->first_line];
-                info->last_active = jiffies;
-                save_car = cy_readb(base_addr + (CyCAR << index));
+                info = &cinfo->ports[channel + chip * 4];
+                save_car = readb(base_addr + (CyCAR << index));
                 cy_writeb(base_addr + (CyCAR << index), save_xir);
 
-                mdm_change = cy_readb(base_addr + (CyMISR << index));
-                mdm_status = cy_readb(base_addr + (CyMSVR1 << index));
+                mdm_change = readb(base_addr + (CyMISR << index));
+                mdm_status = readb(base_addr + (CyMSVR1 << index));
 
-                if (info->tty == 0) {   /* no place for data, ignore it */
-                        ;
-                } else {
+                if (info->tty) {
                         if (mdm_change & CyANY_DELTA) {
                                 /* For statistics only */
                                 if (mdm_change & CyDCD)
@@ -1398,7 +1350,7 @@ txend:
                                                 info->tty->hw_stopped = 0;
                                                 cy_writeb(base_addr +
                                                         (CySRER << index),
-                                                        cy_readb(base_addr +
+                                                        readb(base_addr +
                                                                 (CySRER <<
                                                                         index))|
                                                         CyTxRdy);
@@ -1412,17 +1364,17 @@ txend:
                                                 info->tty->hw_stopped = 1;
                                                 cy_writeb(base_addr +
                                                         (CySRER << index),
-                                                        cy_readb(base_addr +
+                                                        readb(base_addr +
                                                                 (CySRER <<
                                                                 index)) &
                                                         ~CyTxRdy);
                                         }
                                 }
                         }
-                        if (mdm_change & CyDSR) {
+/*                      if (mdm_change & CyDSR) {
                         }
                         if (mdm_change & CyRI) {
-                        }
+                        }*/
                 }
                 /* end of service */
                 cy_writeb(base_addr + (CyMIR << index), (save_xir & 0x3f));
@@ -1438,16 +1390,16 @@ txend:
 static irqreturn_t cyy_interrupt(int irq, void *dev_id)
 {
         int status;
-        struct cyclades_card *cinfo;
+        struct cyclades_card *cinfo = dev_id;
         void __iomem *base_addr, *card_base_addr;
         int chip;
         int index;
         int too_many;
         int had_work;
 
-        if ((cinfo = (struct cyclades_card *)dev_id) == 0) {
+        if (unlikely(cinfo == NULL)) {
 #ifdef CY_DEBUG_INTERRUPTS
-                printk("cyy_interrupt: spurious interrupt %d\n\r", irq);
+                printk(KERN_DEBUG "cyy_interrupt: spurious interrupt %d\n",irq);
 #endif
                 return IRQ_NONE;        /* spurious interrupt */
         }
@@ -1455,6 +1407,10 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
         card_base_addr = cinfo->base_addr;
         index = cinfo->bus_index;
 
+        /* card was not initialized yet (e.g. DEBUG_SHIRQ) */
+        if (unlikely(card_base_addr == NULL))
+                return IRQ_HANDLED;
+
         /* This loop checks all chips in the card.  Make a note whenever
            _any_ chip had some work to do, as this is considered an
            indication that there will be more to do.  Only when no chip
@@ -1466,7 +1422,7 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
                         base_addr = cinfo->base_addr +
                                         (cy_chip_offset[chip] << index);
                         too_many = 0;
-                        while ((status = cy_readb(base_addr +
+                        while ((status = readb(base_addr +
                                                 (CySVRR << index))) != 0x00) {
                                 had_work++;
                         /* The purpose of the following test is to ensure that
@@ -1498,7 +1454,7 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
 
 static int
 cyz_fetch_msg(struct cyclades_card *cinfo,
-                uclong * channel, ucchar * cmd, uclong * param)
+                __u32 * channel, __u8 * cmd, __u32 * param)
 {
         struct FIRM_ID __iomem *firm_id;
         struct ZFW_CTRL __iomem *zfw_ctrl;
@@ -1509,16 +1465,15 @@ cyz_fetch_msg(struct cyclades_card *cinfo,
         if (!ISZLOADED(*cinfo)) {
                 return -1;
         }
-        zfw_ctrl = cinfo->base_addr + (cy_readl(&firm_id->zfwctrl_addr) &
-                        0xfffff);
+        zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
         board_ctrl = &zfw_ctrl->board_ctrl;
 
-        loc_doorbell = cy_readl(&((struct RUNTIME_9060 __iomem *)
+        loc_doorbell = readl(&((struct RUNTIME_9060 __iomem *)
                                   (cinfo->ctl_addr))->loc_doorbell);
         if (loc_doorbell) {
                 *cmd = (char)(0xff & loc_doorbell);
-                *channel = cy_readl(&board_ctrl->fwcmd_channel);
-                *param = (uclong) cy_readl(&board_ctrl->fwcmd_param);
+                *channel = readl(&board_ctrl->fwcmd_channel);
+                *param = (__u32) readl(&board_ctrl->fwcmd_param);
                 cy_writel(&((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->
                           loc_doorbell, 0xffffffff);
                 return 1;
@@ -1528,28 +1483,27 @@ cyz_fetch_msg(struct cyclades_card *cinfo,
 
 static int
 cyz_issue_cmd(struct cyclades_card *cinfo,
-                uclong channel, ucchar cmd, uclong param)
+                __u32 channel, __u8 cmd, __u32 param)
 {
         struct FIRM_ID __iomem *firm_id;
         struct ZFW_CTRL __iomem *zfw_ctrl;
         struct BOARD_CTRL __iomem *board_ctrl;
-        unsigned long __iomem *pci_doorbell;
+        __u32 __iomem *pci_doorbell;
         int index;
 
         firm_id = cinfo->base_addr + ID_ADDRESS;
         if (!ISZLOADED(*cinfo)) {
                 return -1;
         }
-        zfw_ctrl = cinfo->base_addr + (cy_readl(&firm_id->zfwctrl_addr) &
-                        0xfffff);
+        zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
         board_ctrl = &zfw_ctrl->board_ctrl;
 
         index = 0;
         pci_doorbell =
             &((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->pci_doorbell;
-        while ((cy_readl(pci_doorbell) & 0xff) != 0) {
+        while ((readl(pci_doorbell) & 0xff) != 0) {
                 if (index++ == 1000) {
-                        return (int)(cy_readl(pci_doorbell) & 0xff);
+                        return (int)(readl(pci_doorbell) & 0xff);
                 }
                 udelay(50L);
         }
@@ -1561,34 +1515,30 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
 }                               /* cyz_issue_cmd */
 
 static void
-cyz_handle_rx(struct cyclades_port *info,
-                volatile struct CH_CTRL __iomem * ch_ctrl,
-                volatile struct BUF_CTRL __iomem * buf_ctrl)
+cyz_handle_rx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
+                struct BUF_CTRL __iomem *buf_ctrl)
 {
-        struct cyclades_card *cinfo = &cy_card[info->card];
+        struct cyclades_card *cinfo = info->card;
         struct tty_struct *tty = info->tty;
-        volatile int char_count;
+        int char_count;
         int len;
 #ifdef BLOCKMOVE
-        int small_count;
+        unsigned char *buf;
 #else
         char data;
 #endif
-        volatile uclong rx_put, rx_get, new_rx_get, rx_bufsize, rx_bufaddr;
+        __u32 rx_put, rx_get, new_rx_get, rx_bufsize, rx_bufaddr;
 
-        rx_get = new_rx_get = cy_readl(&buf_ctrl->rx_get);
-        rx_put = cy_readl(&buf_ctrl->rx_put);
-        rx_bufsize = cy_readl(&buf_ctrl->rx_bufsize);
-        rx_bufaddr = cy_readl(&buf_ctrl->rx_bufaddr);
+        rx_get = new_rx_get = readl(&buf_ctrl->rx_get);
+        rx_put = readl(&buf_ctrl->rx_put);
+        rx_bufsize = readl(&buf_ctrl->rx_bufsize);
+        rx_bufaddr = readl(&buf_ctrl->rx_bufaddr);
         if (rx_put >= rx_get)
                 char_count = rx_put - rx_get;
         else
                 char_count = rx_put - rx_get + rx_bufsize;
 
         if (char_count) {
-                info->last_active = jiffies;
-                info->jiffies[1] = jiffies;
-
 #ifdef CY_ENABLE_MONITORING
                 info->mon.int_count++;
                 info->mon.char_count += char_count;
@@ -1596,7 +1546,7 @@ cyz_handle_rx(struct cyclades_port *info,
                         info->mon.char_max = char_count;
                 info->mon.char_last = char_count;
 #endif
-                if (tty == 0) {
+                if (tty == NULL) {
                         /* flush received characters */
                         new_rx_get = (new_rx_get + char_count) &
                                         (rx_bufsize - 1);
@@ -1606,30 +1556,28 @@ cyz_handle_rx(struct cyclades_port *info,
                 /* we'd like to use memcpy(t, f, n) and memset(s, c, count)
                    for performance, but because of buffer boundaries, there
                    may be several steps to the operation */
-                        while (0 < (small_count = min_t(unsigned int,
-                                        rx_bufsize - new_rx_get,
-                                        min_t(unsigned int, TTY_FLIPBUF_SIZE -
-                                                tty->flip.count, char_count)))){
-                                memcpy_fromio(tty->flip.char_buf_ptr,
-                                        (char *)(cinfo->base_addr + rx_bufaddr +
-                                                new_rx_get),
-                                        small_count);
+                        while (1) {
+                                len = tty_prepare_flip_string(tty, &buf,
+                                                char_count);
+                                if (!len)
+                                        break;
 
-                                tty->flip.char_buf_ptr += small_count;
-                                memset(tty->flip.flag_buf_ptr, TTY_NORMAL,
-                                        small_count);
-                                tty->flip.flag_buf_ptr += small_count;
-                                new_rx_get = (new_rx_get + small_count) &
+                                len = min_t(unsigned int, min(len, char_count),
+                                                rx_bufsize - new_rx_get);
+
+                                memcpy_fromio(buf, cinfo->base_addr +
+                                                rx_bufaddr + new_rx_get, len);
+
+                                new_rx_get = (new_rx_get + len) &
                                                 (rx_bufsize - 1);
-                                char_count -= small_count;
-                                info->icount.rx += small_count;
-                                info->idle_stats.recv_bytes += small_count;
-                                tty->flip.count += small_count;
+                                char_count -= len;
+                                info->icount.rx += len;
+                                info->idle_stats.recv_bytes += len;
                         }
 #else
                         len = tty_buffer_request_room(tty, char_count);
                         while (len--) {
-                                data = cy_readb(cinfo->base_addr + rx_bufaddr +
+                                data = readb(cinfo->base_addr + rx_bufaddr +
                                                 new_rx_get);
                                 new_rx_get = (new_rx_get + 1)& (rx_bufsize - 1);
                                 tty_insert_flip_char(tty, data, TTY_NORMAL);
@@ -1640,13 +1588,12 @@ cyz_handle_rx(struct cyclades_port *info,
 #ifdef CONFIG_CYZ_INTR
                 /* Recalculate the number of chars in the RX buffer and issue
                    a cmd in case it's higher than the RX high water mark */
-                        rx_put = cy_readl(&buf_ctrl->rx_put);
+                        rx_put = readl(&buf_ctrl->rx_put);
                         if (rx_put >= rx_get)
                                 char_count = rx_put - rx_get;
                         else
                                 char_count = rx_put - rx_get + rx_bufsize;
-                        if (char_count >= (int)cy_readl(&buf_ctrl->
-                                        rx_threshold)) {
+                        if (char_count >= (int)readl(&buf_ctrl->rx_threshold)) {
                                 cy_sched_event(info, Cy_EVENT_Z_RX_FULL);
                         }
 #endif
@@ -1659,26 +1606,25 @@ cyz_handle_rx(struct cyclades_port *info,
 }
 
 static void
-cyz_handle_tx(struct cyclades_port *info,
-                volatile struct CH_CTRL __iomem * ch_ctrl,
-                volatile struct BUF_CTRL __iomem * buf_ctrl)
+cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
+                struct BUF_CTRL __iomem *buf_ctrl)
 {
-        struct cyclades_card *cinfo = &cy_card[info->card];
+        struct cyclades_card *cinfo = info->card;
         struct tty_struct *tty = info->tty;
         char data;
-        volatile int char_count;
+        int char_count;
 #ifdef BLOCKMOVE
         int small_count;
 #endif
-        volatile uclong tx_put, tx_get, tx_bufsize, tx_bufaddr;
+        __u32 tx_put, tx_get, tx_bufsize, tx_bufaddr;
 
         if (info->xmit_cnt <= 0)        /* Nothing to transmit */
                 return;
 
-        tx_get = cy_readl(&buf_ctrl->tx_get);
-        tx_put = cy_readl(&buf_ctrl->tx_put);
-        tx_bufsize = cy_readl(&buf_ctrl->tx_bufsize);
-        tx_bufaddr = cy_readl(&buf_ctrl->tx_bufaddr);
+        tx_get = readl(&buf_ctrl->tx_get);
+        tx_put = readl(&buf_ctrl->tx_put);
+        tx_bufsize = readl(&buf_ctrl->tx_bufsize);
+        tx_bufaddr = readl(&buf_ctrl->tx_bufaddr);
         if (tx_put >= tx_get)
                 char_count = tx_get - tx_put - 1 + tx_bufsize;
         else
@@ -1686,9 +1632,8 @@ cyz_handle_tx(struct cyclades_port *info,
 
         if (char_count) {
 
-                if (tty == 0) {
+                if (tty == NULL)
                         goto ztxdone;
-                }
 
                 if (info->x_char) {     /* send special char */
                         data = info->x_char;
@@ -1698,8 +1643,6 @@ cyz_handle_tx(struct cyclades_port *info,
                         info->x_char = 0;
                         char_count--;
                         info->icount.tx++;
-                        info->last_active = jiffies;
-                        info->jiffies[2] = jiffies;
                 }
 #ifdef BLOCKMOVE
                 while (0 < (small_count = min_t(unsigned int,
@@ -1719,8 +1662,6 @@ cyz_handle_tx(struct cyclades_port *info,
                         info->xmit_cnt -= small_count;
                         info->xmit_tail = (info->xmit_tail + small_count) &
                                         (SERIAL_XMIT_SIZE - 1);
-                        info->last_active = jiffies;
-                        info->jiffies[2] = jiffies;
                 }
 #else
                 while (info->xmit_cnt && char_count) {
@@ -1733,8 +1674,6 @@ cyz_handle_tx(struct cyclades_port *info,
                         tx_put = (tx_put + 1) & (tx_bufsize - 1);
                         char_count--;
                         info->icount.tx++;
-                        info->last_active = jiffies;
-                        info->jiffies[2] = jiffies;
                 }
 #endif
 ztxdone:
@@ -1750,33 +1689,32 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
 {
         struct tty_struct *tty;
         struct cyclades_port *info;
-        static volatile struct FIRM_ID __iomem *firm_id;
-        static volatile struct ZFW_CTRL __iomem *zfw_ctrl;
-        static volatile struct BOARD_CTRL __iomem *board_ctrl;
-        static volatile struct CH_CTRL __iomem *ch_ctrl;
-        static volatile struct BUF_CTRL __iomem *buf_ctrl;
-        uclong channel;
-        ucchar cmd;
-        uclong param;
-        uclong hw_ver, fw_ver;
+        static struct FIRM_ID __iomem *firm_id;
+        static struct ZFW_CTRL __iomem *zfw_ctrl;
+        static struct BOARD_CTRL __iomem *board_ctrl;
+        static struct CH_CTRL __iomem *ch_ctrl;
+        static struct BUF_CTRL __iomem *buf_ctrl;
+        __u32 channel;
+        __u8 cmd;
+        __u32 param;
+        __u32 hw_ver, fw_ver;
         int special_count;
         int delta_count;
 
         firm_id = cinfo->base_addr + ID_ADDRESS;
-        zfw_ctrl = cinfo->base_addr + (cy_readl(&firm_id->zfwctrl_addr) &
-                        0xfffff);
+        zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
         board_ctrl = &zfw_ctrl->board_ctrl;
-        fw_ver = cy_readl(&board_ctrl->fw_version);
-        hw_ver = cy_readl(&((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->
+        fw_ver = readl(&board_ctrl->fw_version);
+        hw_ver = readl(&((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->
                         mail_box_0);
 
         while (cyz_fetch_msg(cinfo, &channel, &cmd, &param) == 1) {
                 special_count = 0;
                 delta_count = 0;
-                info = &cy_port[channel + cinfo->first_line];
-                if ((tty = info->tty) == 0) {
+                info = &cinfo->ports[channel];
+                if ((tty = info->tty) == NULL)
                         continue;
-                }
+
                 ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
                 buf_ctrl = &(zfw_ctrl->buf_ctrl[channel]);
 
@@ -1801,7 +1739,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                         delta_count++;
                         if (info->flags & ASYNC_CHECK_CD) {
                                 if ((fw_ver > 241 ? ((u_long) param) :
-                                                cy_readl(&ch_ctrl->rs_status)) &
+                                                readl(&ch_ctrl->rs_status)) &
                                                 C_RS_DCD) {
                                         cy_sched_event(info,
                                                         Cy_EVENT_OPEN_WAKEUP);
@@ -1833,8 +1771,8 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                 case C_CM_INTBACK2:
                         /* Reception Interrupt */
 #ifdef CY_DEBUG_INTERRUPTS
-                        printk("cyz_interrupt: rcvd intr, card %d, "
-                                        "port %ld\n\r", info->card, channel);
+                        printk(KERN_DEBUG "cyz_interrupt: rcvd intr, card %d, "
+                                        "port %ld\n", info->card, channel);
 #endif
                         cyz_handle_rx(info, ch_ctrl, buf_ctrl);
                         break;
@@ -1843,8 +1781,8 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                 case C_CM_INTBACK:
                         /* Transmission Interrupt */
 #ifdef CY_DEBUG_INTERRUPTS
-                        printk("cyz_interrupt: xmit intr, card %d, "
-                                        "port %ld\n\r", info->card, channel);
+                        printk(KERN_DEBUG "cyz_interrupt: xmit intr, card %d, "
+                                        "port %ld\n", info->card, channel);
 #endif
                         cyz_handle_tx(info, ch_ctrl, buf_ctrl);
                         break;
@@ -1865,18 +1803,19 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
 #ifdef CONFIG_CYZ_INTR
 static irqreturn_t cyz_interrupt(int irq, void *dev_id)
 {
-        struct cyclades_card *cinfo;
+        struct cyclades_card *cinfo = dev_id;
 
-        if ((cinfo = (struct cyclades_card *)dev_id) == 0) {
+        if (unlikely(cinfo == NULL)) {
 #ifdef CY_DEBUG_INTERRUPTS
-                printk("cyz_interrupt: spurious interrupt %d\n\r", irq);
+                printk(KERN_DEBUG "cyz_interrupt: spurious interrupt %d\n",irq);
 #endif
                 return IRQ_NONE;        /* spurious interrupt */
         }
 
-        if (!ISZLOADED(*cinfo)) {
+        if (unlikely(!ISZLOADED(*cinfo))) {
 #ifdef CY_DEBUG_INTERRUPTS
-                printk("cyz_interrupt: board not yet loaded (IRQ%d).\n\r", irq);
+                printk(KERN_DEBUG "cyz_interrupt: board not yet loaded "
+                                "(IRQ%d).\n", irq);
 #endif
                 return IRQ_NONE;
         }
@@ -1890,19 +1829,18 @@ static irqreturn_t cyz_interrupt(int irq, void *dev_id)
 static void cyz_rx_restart(unsigned long arg)
 {
         struct cyclades_port *info = (struct cyclades_port *)arg;
+        struct cyclades_card *card = info->card;
         int retval;
-        int card = info->card;
-        uclong channel = (info->line) - (cy_card[card].first_line);
+        __u32 channel = info->line - card->first_line;
         unsigned long flags;
 
-        CY_LOCK(info, flags);
-        retval = cyz_issue_cmd(&cy_card[card], channel, C_CM_INTBACK2, 0L);
+        spin_lock_irqsave(&card->card_lock, flags);
+        retval = cyz_issue_cmd(card, channel, C_CM_INTBACK2, 0L);
         if (retval != 0) {
-                printk("cyc:cyz_rx_restart retval on ttyC%d was %x\n",
+                printk(KERN_ERR "cyc:cyz_rx_restart retval on ttyC%d was %x\n",
                         info->line, retval);
         }
-        cyz_rx_full_timer[info->line].function = NULL;
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
 }
 
 #else                           /* CONFIG_CYZ_INTR */
@@ -1912,14 +1850,14 @@ static void cyz_poll(unsigned long arg)
         struct cyclades_card *cinfo;
         struct cyclades_port *info;
         struct tty_struct *tty;
-        static volatile struct FIRM_ID *firm_id;
-        static volatile struct ZFW_CTRL *zfw_ctrl;
-        static volatile struct BOARD_CTRL *board_ctrl;
-        static volatile struct CH_CTRL *ch_ctrl;
-        static volatile struct BUF_CTRL *buf_ctrl;
+        static struct FIRM_ID *firm_id;
+        static struct ZFW_CTRL *zfw_ctrl;
+        static struct BOARD_CTRL *board_ctrl;
+        static struct CH_CTRL *ch_ctrl;
+        static struct BUF_CTRL *buf_ctrl;
+        unsigned long expires = jiffies + HZ;
         int card, port;
 
-        cyz_timerlist.expires = jiffies + (HZ);
         for (card = 0; card < NR_CARDS; card++) {
                 cinfo = &cy_card[card];
 
@@ -1930,12 +1868,12 @@ static void cyz_poll(unsigned long arg)
 
                 firm_id = cinfo->base_addr + ID_ADDRESS;
                 zfw_ctrl = cinfo->base_addr +
-                                (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                                (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                 board_ctrl = &(zfw_ctrl->board_ctrl);
 
         /* Skip first polling cycle to avoid racing conditions with the FW */
                 if (!cinfo->intr_enabled) {
-                        cinfo->nports = (int)cy_readl(&board_ctrl->n_channel);
+                        cinfo->nports = (int)readl(&board_ctrl->n_channel);
                         cinfo->intr_enabled = 1;
                         continue;
                 }
@@ -1943,7 +1881,7 @@ static void cyz_poll(unsigned long arg)
                 cyz_handle_cmd(cinfo);
 
                 for (port = 0; port < cinfo->nports; port++) {
-                        info = &cy_port[port + cinfo->first_line];
+                        info = &cinfo->ports[port];
                         tty = info->tty;
                         ch_ctrl = &(zfw_ctrl->ch_ctrl[port]);
                         buf_ctrl = &(zfw_ctrl->buf_ctrl[port]);
@@ -1953,9 +1891,9 @@ static void cyz_poll(unsigned long arg)
                         cyz_handle_tx(info, ch_ctrl, buf_ctrl);
                 }
                 /* poll every 'cyz_polling_cycle' period */
-                cyz_timerlist.expires = jiffies + cyz_polling_cycle;
+                expires = jiffies + cyz_polling_cycle;
         }
-        add_timer(&cyz_timerlist);
+        mod_timer(&cyz_timerlist, expires);
 }                               /* cyz_poll */
 
 #endif                          /* CONFIG_CYZ_INTR */
@@ -1968,20 +1906,21 @@ static void cyz_poll(unsigned long arg)
  */
 static int startup(struct cyclades_port *info)
 {
+        struct cyclades_card *card;
         unsigned long flags;
         int retval = 0;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
         unsigned long page;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
+        channel = info->line - card->first_line;
 
         page = get_zeroed_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
 
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&card->card_lock, flags);
 
         if (info->flags & ASYNC_INITIALIZED) {
                 free_page(page);
@@ -2001,24 +1940,22 @@ static int startup(struct cyclades_port *info)
         else
                 info->xmit_buf = (unsigned char *)page;
 
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
 
         set_line_char(info);
 
-        if (!IS_CYC_Z(cy_card[card])) {
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr = cy_card[card].base_addr +
-                                (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
 #ifdef CY_DEBUG_OPEN
-                printk("cyc startup card %d, chip %d, channel %d, "
-                                "base_addr %lx\n",
-                                card, chip, channel, (long)base_addr);
-                /**/
+                printk(KERN_DEBUG "cyc startup card %d, chip %d, channel %d, "
+                                "base_addr %p\n",
+                                card, chip, channel, base_addr);
 #endif
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
 
                 cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
 
@@ -2034,14 +1971,14 @@ static int startup(struct cyclades_port *info)
                 cy_writeb(base_addr + (CyMSVR2 << index), CyDTR);
 
 #ifdef CY_DEBUG_DTR
-                printk("cyc:startup raising DTR\n");
-                printk("     status: 0x%x, 0x%x\n",
-                        cy_readb(base_addr + (CyMSVR1 << index)),
-                        cy_readb(base_addr + (CyMSVR2 << index)));
+                printk(KERN_DEBUG "cyc:startup raising DTR\n");
+                printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                        readb(base_addr + (CyMSVR1 << index)),
+                        readb(base_addr + (CyMSVR2 << index)));
 #endif
 
                 cy_writeb(base_addr + (CySRER << index),
-                        cy_readb(base_addr + (CySRER << index)) | CyRxData);
+                        readb(base_addr + (CySRER << index)) | CyRxData);
                 info->flags |= ASYNC_INITIALIZED;
 
                 if (info->tty) {
@@ -2054,7 +1991,7 @@ static int startup(struct cyclades_port *info)
                 info->idle_stats.recv_idle =
                 info->idle_stats.xmit_idle = jiffies;
 
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
 
         } else {
                 struct FIRM_ID __iomem *firm_id;
@@ -2063,24 +2000,23 @@ static int startup(struct cyclades_port *info)
                 struct CH_CTRL __iomem *ch_ctrl;
                 int retval;
 
-                base_addr = cy_card[card].base_addr;
+                base_addr = card->base_addr;
 
                 firm_id = base_addr + ID_ADDRESS;
-                if (!ISZLOADED(cy_card[card])) {
+                if (!ISZLOADED(*card)) {
                         return -ENODEV;
                 }
 
-                zfw_ctrl = cy_card[card].base_addr +
-                                (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                zfw_ctrl = card->base_addr +
+                                (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                 board_ctrl = &zfw_ctrl->board_ctrl;
                 ch_ctrl = zfw_ctrl->ch_ctrl;
 
 #ifdef CY_DEBUG_OPEN
-                printk("cyc startup Z card %d, channel %d, base_addr %lx\n",
-                        card, channel, (long)base_addr);
-                /**/
+                printk(KERN_DEBUG "cyc startup Z card %d, channel %d, "
+                        "base_addr %p\n", card, channel, base_addr);
 #endif
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
 
                 cy_writel(&ch_ctrl[channel].op_mode, C_CH_ENABLE);
 #ifdef Z_WAKE
@@ -2102,33 +2038,31 @@ static int startup(struct cyclades_port *info)
 #endif                          /* CONFIG_CYZ_INTR */
 #endif                          /* Z_WAKE */
 
-                retval = cyz_issue_cmd(&cy_card[card], channel, C_CM_IOCTL, 0L);
+                retval = cyz_issue_cmd(card, channel, C_CM_IOCTL, 0L);
                 if (retval != 0) {
-                        printk("cyc:startup(1) retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:startup(1) retval on ttyC%d was "
+                                "%x\n", info->line, retval);
                 }
 
                 /* Flush RX buffers before raising DTR and RTS */
-                retval = cyz_issue_cmd(&cy_card[card], channel, C_CM_FLUSH_RX,
-                                0L);
+                retval = cyz_issue_cmd(card, channel, C_CM_FLUSH_RX, 0L);
                 if (retval != 0) {
-                        printk("cyc:startup(2) retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:startup(2) retval on ttyC%d was "
+                                "%x\n", info->line, retval);
                 }
 
                 /* set timeout !!! */
                 /* set RTS and DTR !!! */
                 cy_writel(&ch_ctrl[channel].rs_control,
-                        cy_readl(&ch_ctrl[channel].rs_control) | C_RS_RTS |
+                        readl(&ch_ctrl[channel].rs_control) | C_RS_RTS |
                         C_RS_DTR);
-                retval = cyz_issue_cmd(&cy_card[info->card], channel,
-                                C_CM_IOCTLM, 0L);
+                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
                 if (retval != 0) {
-                        printk("cyc:startup(3) retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:startup(3) retval on ttyC%d was "
+                                "%x\n", info->line, retval);
                 }
 #ifdef CY_DEBUG_DTR
-                printk("cyc:startup raising Z DTR\n");
+                printk(KERN_DEBUG "cyc:startup raising Z DTR\n");
 #endif
 
                 /* enable send, recv, modem !!! */
@@ -2144,51 +2078,50 @@ static int startup(struct cyclades_port *info)
                 info->idle_stats.recv_idle =
                 info->idle_stats.xmit_idle = jiffies;
 
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
         }
 
 #ifdef CY_DEBUG_OPEN
-        printk(" cyc startup done\n");
+        printk(KERN_DEBUG "cyc startup done\n");
 #endif
         return 0;
 
 errout:
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
         return retval;
 }                               /* startup */
 
 static void start_xmit(struct cyclades_port *info)
 {
+        struct cyclades_card *card;
         unsigned long flags;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr = cy_card[card].base_addr +
-                                (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
                 cy_writeb(base_addr + (CyCAR << index), channel);
                 cy_writeb(base_addr + (CySRER << index),
-                        cy_readb(base_addr + (CySRER << index)) | CyTxRdy);
-                CY_UNLOCK(info, flags);
+                        readb(base_addr + (CySRER << index)) | CyTxRdy);
+                spin_unlock_irqrestore(&card->card_lock, flags);
         } else {
 #ifdef CONFIG_CYZ_INTR
                 int retval;
 
-                CY_LOCK(info, flags);
-                retval = cyz_issue_cmd(&cy_card[card], channel, C_CM_INTBACK,
-                                0L);
+                spin_lock_irqsave(&card->card_lock, flags);
+                retval = cyz_issue_cmd(card, channel, C_CM_INTBACK, 0L);
                 if (retval != 0) {
-                        printk("cyc:start_xmit retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:start_xmit retval on ttyC%d was "
+                                "%x\n", info->line, retval);
                 }
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
 #else                           /* CONFIG_CYZ_INTR */
                 /* Don't have to do anything at this time */
 #endif                          /* CONFIG_CYZ_INTR */
@@ -2201,30 +2134,30 @@ static void start_xmit(struct cyclades_port *info)
  */
 static void shutdown(struct cyclades_port *info)
 {
+        struct cyclades_card *card;
         unsigned long flags;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
 
         if (!(info->flags & ASYNC_INITIALIZED)) {
                 return;
         }
 
         card = info->card;
-        channel = info->line - cy_card[card].first_line;
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr = cy_card[card].base_addr +
-                                (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
 #ifdef CY_DEBUG_OPEN
-                printk("cyc shutdown Y card %d, chip %d, channel %d, "
-                                "base_addr %lx\n",
-                                card, chip, channel, (long)base_addr);
+                printk(KERN_DEBUG "cyc shutdown Y card %d, chip %d, "
+                                "channel %d, base_addr %p\n",
+                                card, chip, channel, base_addr);
 #endif
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
 
                 /* Clear delta_msr_wait queue to avoid mem leaks. */
                 wake_up_interruptible(&info->delta_msr_wait);
@@ -2240,10 +2173,10 @@ static void shutdown(struct cyclades_port *info)
                         cy_writeb(base_addr + (CyMSVR1 << index), ~CyRTS);
                         cy_writeb(base_addr + (CyMSVR2 << index), ~CyDTR);
 #ifdef CY_DEBUG_DTR
-                        printk("cyc shutdown dropping DTR\n");
-                        printk("     status: 0x%x, 0x%x\n",
-                                cy_readb(base_addr + (CyMSVR1 << index)),
-                                cy_readb(base_addr + (CyMSVR2 << index)));
+                        printk(KERN_DEBUG "cyc shutdown dropping DTR\n");
+                        printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                                readb(base_addr + (CyMSVR1 << index)),
+                                readb(base_addr + (CyMSVR2 << index)));
 #endif
                 }
                 cyy_issue_cmd(base_addr, CyCHAN_CTL | CyDIS_RCVR, index);
@@ -2254,7 +2187,7 @@ static void shutdown(struct cyclades_port *info)
                         set_bit(TTY_IO_ERROR, &info->tty->flags);
                 }
                 info->flags &= ~ASYNC_INITIALIZED;
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
         } else {
                 struct FIRM_ID __iomem *firm_id;
                 struct ZFW_CTRL __iomem *zfw_ctrl;
@@ -2262,23 +2195,23 @@ static void shutdown(struct cyclades_port *info)
                 struct CH_CTRL __iomem *ch_ctrl;
                 int retval;
 
-                base_addr = cy_card[card].base_addr;
+                base_addr = card->base_addr;
 #ifdef CY_DEBUG_OPEN
-                printk("cyc shutdown Z card %d, channel %d, base_addr %lx\n",
-                        card, channel, (long)base_addr);
+                printk(KERN_DEBUG "cyc shutdown Z card %d, channel %d, "
+                        "base_addr %p\n", card, channel, base_addr);
 #endif
 
                 firm_id = base_addr + ID_ADDRESS;
-                if (!ISZLOADED(cy_card[card])) {
+                if (!ISZLOADED(*card)) {
                         return;
                 }
 
-                zfw_ctrl = cy_card[card].base_addr +
-                                (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                zfw_ctrl = card->base_addr +
+                                (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                 board_ctrl = &zfw_ctrl->board_ctrl;
                 ch_ctrl = zfw_ctrl->ch_ctrl;
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
 
                 if (info->xmit_buf) {
                         unsigned char *temp;
@@ -2289,16 +2222,16 @@ static void shutdown(struct cyclades_port *info)
 
                 if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) {
                         cy_writel(&ch_ctrl[channel].rs_control,
-                                (uclong)(cy_readl(&ch_ctrl[channel].rs_control)&
+                                (__u32)(readl(&ch_ctrl[channel].rs_control) &
                                         ~(C_RS_RTS | C_RS_DTR)));
-                        retval = cyz_issue_cmd(&cy_card[info->card], channel,
+                        retval = cyz_issue_cmd(info->card, channel,
                                         C_CM_IOCTLM, 0L);
                         if (retval != 0) {
-                                printk("cyc:shutdown retval on ttyC%d was %x\n",
-                                        info->line, retval);
+                                printk(KERN_ERR"cyc:shutdown retval on ttyC%d "
+                                        "was %x\n", info->line, retval);
                         }
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:shutdown dropping Z DTR\n");
+                        printk(KERN_DEBUG "cyc:shutdown dropping Z DTR\n");
 #endif
                 }
 
@@ -2307,11 +2240,11 @@ static void shutdown(struct cyclades_port *info)
                 }
                 info->flags &= ~ASYNC_INITIALIZED;
 
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
         }
 
 #ifdef CY_DEBUG_OPEN
-        printk(" cyc shutdown done\n");
+        printk(KERN_DEBUG "cyc shutdown done\n");
 #endif
 }                               /* shutdown */
 
@@ -2332,7 +2265,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
         int retval;
         void __iomem *base_addr;
 
-        cinfo = &cy_card[info->card];
+        cinfo = info->card;
         channel = info->line - cinfo->first_line;
 
         /*
@@ -2340,9 +2273,8 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
          * until it's done, and then try again.
          */
         if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING) {
-                        interruptible_sleep_on(&info->close_wait);
-                }
+                wait_event_interruptible(info->close_wait,
+                                !(info->flags & ASYNC_CLOSING));
                 return (info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
         }
 
@@ -2365,17 +2297,16 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
         retval = 0;
         add_wait_queue(&info->open_wait, &wait);
 #ifdef CY_DEBUG_OPEN
-        printk("cyc block_til_ready before block: ttyC%d, count = %d\n",
-                info->line, info->count);
-        /**/
+        printk(KERN_DEBUG "cyc block_til_ready before block: ttyC%d, "
+                "count = %d\n", info->line, info->count);
 #endif
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&cinfo->card_lock, flags);
         if (!tty_hung_up_p(filp))
                 info->count--;
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&cinfo->card_lock, flags);
 #ifdef CY_DEBUG_COUNT
-        printk("cyc block_til_ready: (%d): decrementing count to %d\n",
-                current->pid, info->count);
+        printk(KERN_DEBUG "cyc block_til_ready: (%d): decrementing count to "
+                "%d\n", current->pid, info->count);
 #endif
         info->blocked_open++;
 
@@ -2386,7 +2317,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                 base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
 
                 while (1) {
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&cinfo->card_lock, flags);
                         if ((tty->termios->c_cflag & CBAUD)) {
                                 cy_writeb(base_addr + (CyCAR << index),
                                           (u_char) channel);
@@ -2395,15 +2326,14 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                                 cy_writeb(base_addr + (CyMSVR2 << index),
                                           CyDTR);
 #ifdef CY_DEBUG_DTR
-                                printk("cyc:block_til_ready raising DTR\n");
-                                printk("     status: 0x%x, 0x%x\n",
-                                        cy_readb(base_addr +
-                                                (CyMSVR1 << index)),
-                                        cy_readb(base_addr +
-                                                (CyMSVR2 << index)));
+                                printk(KERN_DEBUG "cyc:block_til_ready raising "
+                                        "DTR\n");
+                                printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                                        readb(base_addr + (CyMSVR1 << index)),
+                                        readb(base_addr + (CyMSVR2 << index)));
 #endif
                         }
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&cinfo->card_lock, flags);
 
                         set_current_state(TASK_INTERRUPTIBLE);
                         if (tty_hung_up_p(filp) ||
@@ -2413,26 +2343,25 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                                 break;
                         }
 
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&cinfo->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (!(info->flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
-                                        (cy_readb(base_addr +
+                                        (readb(base_addr +
                                                 (CyMSVR1 << index)) & CyDCD))) {
-                                CY_UNLOCK(info, flags);
+                                spin_unlock_irqrestore(&cinfo->card_lock, flags);
                                 break;
                         }
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&cinfo->card_lock, flags);
 
                         if (signal_pending(current)) {
                                 retval = -ERESTARTSYS;
                                 break;
                         }
 #ifdef CY_DEBUG_OPEN
-                        printk("cyc block_til_ready blocking: ttyC%d, "
-                                        "count = %d\n",
-                                        info->line, info->count);
-                        /**/
+                        printk(KERN_DEBUG "cyc block_til_ready blocking: "
+                                "ttyC%d, count = %d\n",
+                                info->line, info->count);
 #endif
                         schedule();
                 }
@@ -2446,31 +2375,30 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                 base_addr = cinfo->base_addr;
                 firm_id = base_addr + ID_ADDRESS;
                 if (!ISZLOADED(*cinfo)) {
-                        current->state = TASK_RUNNING;
+                        __set_current_state(TASK_RUNNING);
                         remove_wait_queue(&info->open_wait, &wait);
                         return -EINVAL;
                 }
 
-                zfw_ctrl = base_addr + (cy_readl(&firm_id->zfwctrl_addr) &
-                                0xfffff);
+                zfw_ctrl = base_addr + (readl(&firm_id->zfwctrl_addr)& 0xfffff);
                 board_ctrl = &zfw_ctrl->board_ctrl;
                 ch_ctrl = zfw_ctrl->ch_ctrl;
 
                 while (1) {
                         if ((tty->termios->c_cflag & CBAUD)) {
                                 cy_writel(&ch_ctrl[channel].rs_control,
-                                          cy_readl(&ch_ctrl[channel].
-                                                   rs_control) | (C_RS_RTS |
-                                                                  C_RS_DTR));
-                                retval = cyz_issue_cmd(&cy_card[info->card],
-                                                channel, C_CM_IOCTLM, 0L);
+                                        readl(&ch_ctrl[channel].rs_control) |
+                                        C_RS_RTS | C_RS_DTR);
+                                retval = cyz_issue_cmd(cinfo,
+                                        channel, C_CM_IOCTLM, 0L);
                                 if (retval != 0) {
-                                        printk("cyc:block_til_ready retval on "
-                                                "ttyC%d was %x\n",
+                                        printk(KERN_ERR "cyc:block_til_ready "
+                                                "retval on ttyC%d was %x\n",
                                                 info->line, retval);
                                 }
 #ifdef CY_DEBUG_DTR
-                                printk("cyc:block_til_ready raising Z DTR\n");
+                                printk(KERN_DEBUG "cyc:block_til_ready raising "
+                                        "Z DTR\n");
 #endif
                         }
 
@@ -2482,7 +2410,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                                 break;
                         }
                         if (!(info->flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
-                                        (cy_readl(&ch_ctrl[channel].rs_status) &
+                                        (readl(&ch_ctrl[channel].rs_status) &
                                                 C_RS_DCD))) {
                                 break;
                         }
@@ -2491,28 +2419,26 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                                 break;
                         }
 #ifdef CY_DEBUG_OPEN
-                        printk("cyc block_til_ready blocking: ttyC%d, "
-                                        "count = %d\n",
-                                        info->line, info->count);
-                        /**/
+                        printk(KERN_DEBUG "cyc block_til_ready blocking: "
+                                "ttyC%d, count = %d\n",
+                                info->line, info->count);
 #endif
                         schedule();
                 }
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
         if (!tty_hung_up_p(filp)) {
                 info->count++;
 #ifdef CY_DEBUG_COUNT
-                printk("cyc:block_til_ready (%d): incrementing count to %d\n",
-                        current->pid, info->count);
+                printk(KERN_DEBUG "cyc:block_til_ready (%d): incrementing "
+                        "count to %d\n", current->pid, info->count);
 #endif
         }
         info->blocked_open--;
 #ifdef CY_DEBUG_OPEN
-        printk("cyc:block_til_ready after blocking: ttyC%d, count = %d\n",
-                info->line, info->count);
-        /**/
+        printk(KERN_DEBUG "cyc:block_til_ready after blocking: ttyC%d, "
+                "count = %d\n", info->line, info->count);
 #endif
         if (retval)
                 return retval;
@@ -2527,13 +2453,20 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 static int cy_open(struct tty_struct *tty, struct file *filp)
 {
         struct cyclades_port *info;
+        unsigned int i;
         int retval, line;
 
         line = tty->index;
         if ((line < 0) || (NR_PORTS <= line)) {
                 return -ENODEV;
         }
-        info = &cy_port[line];
+        for (i = 0; i < NR_CARDS; i++)
+                if (line < cy_card[i].first_line + cy_card[i].nports &&
+                                line >= cy_card[i].first_line)
+                        break;
+        if (i >= NR_CARDS)
+                return -ENODEV;
+        info = &cy_card[i].ports[line - cy_card[i].first_line];
         if (info->line < 0) {
                 return -ENODEV;
         }
@@ -2542,23 +2475,23 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
            treat it as absent from the system.  This
            will make the user pay attention.
          */
-        if (IS_CYC_Z(cy_card[info->card])) {
-                struct cyclades_card *cinfo = &cy_card[info->card];
+        if (IS_CYC_Z(*info->card)) {
+                struct cyclades_card *cinfo = info->card;
                 struct FIRM_ID __iomem *firm_id = cinfo->base_addr + ID_ADDRESS;
 
                 if (!ISZLOADED(*cinfo)) {
-                        if (((ZE_V1 == cy_readl(
-                                        &((struct RUNTIME_9060 __iomem *)
+                        if (((ZE_V1 == readl(&((struct RUNTIME_9060 __iomem *)
                                          (cinfo->ctl_addr))->mail_box_0)) &&
                                         Z_FPGA_CHECK(*cinfo)) &&
-                                        (ZFIRM_HLT == cy_readl(
+                                        (ZFIRM_HLT == readl(
                                                 &firm_id->signature))) {
-                                printk("cyc:Cyclades-Z Error: you need an "
-                                        "external power supply for this number "
-                                        "of ports.\n\rFirmware halted.\r\n");
+                                printk(KERN_ERR "cyc:Cyclades-Z Error: you "
+                                        "need an external power supply for "
+                                        "this number of ports.\nFirmware "
+                                        "halted.\n");
                         } else {
-                                printk("cyc:Cyclades-Z firmware not yet "
-                                        "loaded\n");
+                                printk(KERN_ERR "cyc:Cyclades-Z firmware not "
+                                        "yet loaded\n");
                         }
                         return -ENODEV;
                 }
@@ -2572,24 +2505,23 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
                                 struct BOARD_CTRL __iomem *board_ctrl;
 
                                 zfw_ctrl = cinfo->base_addr +
-                                        (cy_readl(&firm_id->zfwctrl_addr) &
-                                                0xfffff);
+                                        (readl(&firm_id->zfwctrl_addr) &
+                                         0xfffff);
 
                                 board_ctrl = &zfw_ctrl->board_ctrl;
 
                                 /* Enable interrupts on the PLX chip */
                                 cy_writew(cinfo->ctl_addr + 0x68,
-                                          cy_readw(cinfo->ctl_addr +
-                                                   0x68) | 0x0900);
+                                        readw(cinfo->ctl_addr + 0x68) | 0x0900);
                                 /* Enable interrupts on the FW */
                                 retval = cyz_issue_cmd(cinfo, 0,
                                                 C_CM_IRQ_ENBL, 0L);
                                 if (retval != 0) {
-                                        printk("cyc:IRQ enable retval was %x\n",
-                                                retval);
+                                        printk(KERN_ERR "cyc:IRQ enable retval "
+                                                "was %x\n", retval);
                                 }
                                 cinfo->nports =
-                                        (int)cy_readl(&board_ctrl->n_channel);
+                                        (int)readl(&board_ctrl->n_channel);
                                 cinfo->intr_enabled = 1;
                         }
                 }
@@ -2599,7 +2531,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
                         return -ENODEV;
         }
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_open ttyC%d\n", info->line);     /* */
+        printk(KERN_DEBUG "cyc:cy_open ttyC%d\n", info->line);
 #endif
         tty->driver_data = info;
         info->tty = tty;
@@ -2607,12 +2539,12 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
                 return -ENODEV;
         }
 #ifdef CY_DEBUG_OPEN
-        printk("cyc:cy_open ttyC%d, count = %d\n", info->line, info->count);
-        /**/
+        printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
+                        info->count);
 #endif
         info->count++;
 #ifdef CY_DEBUG_COUNT
-        printk("cyc:cy_open (%d): incrementing count to %d\n",
+        printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
                 current->pid, info->count);
 #endif
 
@@ -2620,8 +2552,8 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
          * If the port is the middle of closing, bail out now
          */
         if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
+                wait_event_interruptible(info->close_wait,
+                                !(info->flags & ASYNC_CLOSING));
                 return (info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
         }
 
@@ -2636,8 +2568,8 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
         retval = block_til_ready(tty, filp, info);
         if (retval) {
 #ifdef CY_DEBUG_OPEN
-                printk("cyc:cy_open returning after block_til_ready with %d\n",
-                        retval);
+                printk(KERN_DEBUG "cyc:cy_open returning after block_til_ready "
+                        "with %d\n", retval);
 #endif
                 return retval;
         }
@@ -2645,8 +2577,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
         info->throttle = 0;
 
 #ifdef CY_DEBUG_OPEN
-        printk(" cyc:cy_open done\n");
-        /**/
+        printk(KERN_DEBUG "cyc:cy_open done\n");
 #endif
         return 0;
 }                               /* cy_open */
@@ -2656,9 +2587,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
  */
 static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_card *card;
+        struct cyclades_port *info = tty->driver_data;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
         unsigned long orig_jiffies;
         int char_time;
 
@@ -2697,20 +2629,19 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
         if (!timeout || timeout > 2 * info->timeout)
                 timeout = 2 * info->timeout;
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
-        printk("In cy_wait_until_sent(%d) check=%lu...", timeout, char_time);
-        printk("jiff=%lu...", jiffies);
+        printk(KERN_DEBUG "In cy_wait_until_sent(%d) check=%d, jiff=%lu...",
+                timeout, char_time, jiffies);
 #endif
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = (info->line) - (card->first_line);
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
-                while (cy_readb(base_addr + (CySRER << index)) & CyTxRdy) {
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
+                while (readb(base_addr + (CySRER << index)) & CyTxRdy) {
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
-                        printk("Not clean (jiff=%lu)...", jiffies);
+                        printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
 #endif
                         if (msleep_interruptible(jiffies_to_msecs(char_time)))
                                 break;
@@ -2718,13 +2649,11 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
                                         timeout))
                                 break;
                 }
-        } else {
-                /* Nothing to do! */
         }
         /* Run one more char cycle */
         msleep_interruptible(jiffies_to_msecs(char_time * 5));
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
-        printk("Clean (jiff=%lu)...done\n", jiffies);
+        printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
 #endif
 }
 
@@ -2733,25 +2662,29 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
  */
 static void cy_close(struct tty_struct *tty, struct file *filp)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
         unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_close ttyC%d\n", info->line);
+        printk(KERN_DEBUG "cyc:cy_close ttyC%d\n", info->line);
 #endif
 
         if (!info || serial_paranoia_check(info, tty->name, "cy_close")) {
                 return;
         }
 
-        CY_LOCK(info, flags);
+        card = info->card;
+
+        spin_lock_irqsave(&card->card_lock, flags);
         /* If the TTY is being hung up, nothing to do */
         if (tty_hung_up_p(filp)) {
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
                 return;
         }
 #ifdef CY_DEBUG_OPEN
-        printk("cyc:cy_close ttyC%d, count = %d\n", info->line, info->count);
+        printk(KERN_DEBUG "cyc:cy_close ttyC%d, count = %d\n", info->line,
+                info->count);
 #endif
         if ((tty->count == 1) && (info->count != 1)) {
                 /*
@@ -2761,22 +2694,22 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
                  * one, we've got real problems, since it means the
                  * serial port won't be shutdown.
                  */
-                printk("cyc:cy_close: bad serial port count; tty->count is 1, "
-                        "info->count is %d\n", info->count);
+                printk(KERN_ERR "cyc:cy_close: bad serial port count; "
+                        "tty->count is 1, info->count is %d\n", info->count);
                 info->count = 1;
         }
 #ifdef CY_DEBUG_COUNT
-        printk("cyc:cy_close at (%d): decrementing count to %d\n",
+        printk(KERN_DEBUG  "cyc:cy_close at (%d): decrementing count to %d\n",
                 current->pid, info->count - 1);
 #endif
         if (--info->count < 0) {
 #ifdef CY_DEBUG_COUNT
-                printk("cyc:cyc_close setting count to 0\n");
+                printk(KERN_DEBUG "cyc:cyc_close setting count to 0\n");
 #endif
                 info->count = 0;
         }
         if (info->count) {
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
                 return;
         }
         info->flags |= ASYNC_CLOSING;
@@ -2786,81 +2719,80 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
          * the line discipline to only process XON/XOFF characters.
          */
         tty->closing = 1;
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
         if (info->closing_wait != CY_CLOSING_WAIT_NONE) {
                 tty_wait_until_sent(tty, info->closing_wait);
         }
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&card->card_lock, flags);
 
-        if (!IS_CYC_Z(cy_card[info->card])) {
-                int channel = info->line - cy_card[info->card].first_line;
-                int index = cy_card[info->card].bus_index;
-                void __iomem *base_addr = cy_card[info->card].base_addr +
+        if (!IS_CYC_Z(*card)) {
+                int channel = info->line - card->first_line;
+                int index = card->bus_index;
+                void __iomem *base_addr = card->base_addr +
                         (cy_chip_offset[channel >> 2] << index);
                 /* Stop accepting input */
                 channel &= 0x03;
                 cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
                 cy_writeb(base_addr + (CySRER << index),
-                          cy_readb(base_addr + (CySRER << index)) & ~CyRxData);
+                          readb(base_addr + (CySRER << index)) & ~CyRxData);
                 if (info->flags & ASYNC_INITIALIZED) {
                         /* Waiting for on-board buffers to be empty before closing
                            the port */
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                         cy_wait_until_sent(tty, info->timeout);
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                 }
         } else {
 #ifdef Z_WAKE
                 /* Waiting for on-board buffers to be empty before closing the port */
-                void __iomem *base_addr = cy_card[info->card].base_addr;
+                void __iomem *base_addr = card->base_addr;
                 struct FIRM_ID __iomem *firm_id = base_addr + ID_ADDRESS;
                 struct ZFW_CTRL __iomem *zfw_ctrl =
-                    base_addr + (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                    base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                 struct CH_CTRL __iomem *ch_ctrl = zfw_ctrl->ch_ctrl;
-                int channel = info->line - cy_card[info->card].first_line;
+                int channel = info->line - card->first_line;
                 int retval;
 
-                if (cy_readl(&ch_ctrl[channel].flow_status) != C_FS_TXIDLE) {
-                        retval = cyz_issue_cmd(&cy_card[info->card], channel,
-                                                C_CM_IOCTLW, 0L);
+                if (readl(&ch_ctrl[channel].flow_status) != C_FS_TXIDLE) {
+                        retval = cyz_issue_cmd(card, channel, C_CM_IOCTLW, 0L);
                         if (retval != 0) {
-                                printk("cyc:cy_close retval on ttyC%d was %x\n",
-                                        info->line, retval);
+                                printk(KERN_DEBUG "cyc:cy_close retval on "
+                                        "ttyC%d was %x\n", info->line, retval);
                         }
-                        CY_UNLOCK(info, flags);
-                        interruptible_sleep_on(&info->shutdown_wait);
-                        CY_LOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
+                        wait_for_completion_interruptible(&info->shutdown_wait);
+                        spin_lock_irqsave(&card->card_lock, flags);
                 }
 #endif
         }
 
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
         shutdown(info);
         if (tty->driver->flush_buffer)
                 tty->driver->flush_buffer(tty);
         tty_ldisc_flush(tty);
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&card->card_lock, flags);
 
         tty->closing = 0;
         info->event = 0;
         info->tty = NULL;
         if (info->blocked_open) {
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
                 if (info->close_delay) {
                         msleep_interruptible(jiffies_to_msecs
                                                 (info->close_delay));
                 }
                 wake_up_interruptible(&info->open_wait);
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
         }
         info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
         wake_up_interruptible(&info->close_wait);
 
 #ifdef CY_DEBUG_OTHER
-        printk(" cyc:cy_close done\n");
+        printk(KERN_DEBUG "cyc:cy_close done\n");
 #endif
 
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
 }                               /* cy_close */
 
 /* This routine gets called when tty_write has put something into
@@ -2878,12 +2810,12 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
  */
 static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
         unsigned long flags;
         int c, ret = 0;
 
 #ifdef CY_DEBUG_IO
-        printk("cyc:cy_write ttyC%d\n", info->line);    /* */
+        printk(KERN_DEBUG "cyc:cy_write ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_write")) {
@@ -2893,7 +2825,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
         if (!info->xmit_buf)
                 return 0;
 
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&info->card->card_lock, flags);
         while (1) {
                 c = min(count, min((int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1),
                                    (int)(SERIAL_XMIT_SIZE - info->xmit_head)));
@@ -2909,7 +2841,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
                 count -= c;
                 ret += c;
         }
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&info->card->card_lock, flags);
 
         info->idle_stats.xmit_bytes += ret;
         info->idle_stats.xmit_idle = jiffies;
@@ -2929,11 +2861,11 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
  */
 static void cy_put_char(struct tty_struct *tty, unsigned char ch)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
         unsigned long flags;
 
 #ifdef CY_DEBUG_IO
-        printk("cyc:cy_put_char ttyC%d\n", info->line);
+        printk(KERN_DEBUG "cyc:cy_put_char ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_put_char"))
@@ -2942,9 +2874,9 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
         if (!info->xmit_buf)
                 return;
 
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&info->card->card_lock, flags);
         if (info->xmit_cnt >= (int)(SERIAL_XMIT_SIZE - 1)) {
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&info->card->card_lock, flags);
                 return;
         }
 
@@ -2953,7 +2885,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
         info->xmit_cnt++;
         info->idle_stats.xmit_bytes++;
         info->idle_stats.xmit_idle = jiffies;
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&info->card->card_lock, flags);
 }                               /* cy_put_char */
 
 /*
@@ -2962,10 +2894,10 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
  */
 static void cy_flush_chars(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
 
 #ifdef CY_DEBUG_IO
-        printk("cyc:cy_flush_chars ttyC%d\n", info->line);      /* */
+        printk(KERN_DEBUG "cyc:cy_flush_chars ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_flush_chars"))
@@ -2986,11 +2918,11 @@ static void cy_flush_chars(struct tty_struct *tty)
  */
 static int cy_write_room(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
         int ret;
 
 #ifdef CY_DEBUG_IO
-        printk("cyc:cy_write_room ttyC%d\n", info->line);       /* */
+        printk(KERN_DEBUG "cyc:cy_write_room ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_write_room"))
@@ -3003,46 +2935,49 @@ static int cy_write_room(struct tty_struct *tty)
 
 static int cy_chars_in_buffer(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
-        int card, channel;
+        struct cyclades_card *card;
+        struct cyclades_port *info = tty->driver_data;
+        int channel;
 
         if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer"))
                 return 0;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
+        channel = (info->line) - (card->first_line);
 
 #ifdef Z_EXT_CHARS_IN_BUFFER
         if (!IS_CYC_Z(cy_card[card])) {
 #endif                          /* Z_EXT_CHARS_IN_BUFFER */
 #ifdef CY_DEBUG_IO
-                printk("cyc:cy_chars_in_buffer ttyC%d %d\n", info->line, info->xmit_cnt);       /* */
+                printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
+                        info->line, info->xmit_cnt);
 #endif
                 return info->xmit_cnt;
 #ifdef Z_EXT_CHARS_IN_BUFFER
         } else {
-                static volatile struct FIRM_ID *firm_id;
-                static volatile struct ZFW_CTRL *zfw_ctrl;
-                static volatile struct CH_CTRL *ch_ctrl;
-                static volatile struct BUF_CTRL *buf_ctrl;
+                static struct FIRM_ID *firm_id;
+                static struct ZFW_CTRL *zfw_ctrl;
+                static struct CH_CTRL *ch_ctrl;
+                static struct BUF_CTRL *buf_ctrl;
                 int char_count;
-                volatile uclong tx_put, tx_get, tx_bufsize;
+                __u32 tx_put, tx_get, tx_bufsize;
 
-                firm_id = cy_card[card].base_addr + ID_ADDRESS;
-                zfw_ctrl = cy_card[card].base_addr +
-                        (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                firm_id = card->base_addr + ID_ADDRESS;
+                zfw_ctrl = card->base_addr +
+                        (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                 ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
                 buf_ctrl = &(zfw_ctrl->buf_ctrl[channel]);
 
-                tx_get = cy_readl(&buf_ctrl->tx_get);
-                tx_put = cy_readl(&buf_ctrl->tx_put);
-                tx_bufsize = cy_readl(&buf_ctrl->tx_bufsize);
+                tx_get = readl(&buf_ctrl->tx_get);
+                tx_put = readl(&buf_ctrl->tx_put);
+                tx_bufsize = readl(&buf_ctrl->tx_bufsize);
                 if (tx_put >= tx_get)
                         char_count = tx_put - tx_get;
                 else
                         char_count = tx_put - tx_get + tx_bufsize;
 #ifdef CY_DEBUG_IO
-                printk("cyc:cy_chars_in_buffer ttyC%d %d\n", info->line, info->xmit_cnt + char_count);  /* */
+                printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
+                        info->line, info->xmit_cnt + char_count);
 #endif
                 return info->xmit_cnt + char_count;
         }
@@ -3055,10 +2990,10 @@ static int cy_chars_in_buffer(struct tty_struct *tty)
  * ------------------------------------------------------------
  */
 
-static void cyy_baud_calc(struct cyclades_port *info, uclong baud)
+static void cyy_baud_calc(struct cyclades_port *info, __u32 baud)
 {
         int co, co_val, bpr;
-        uclong cy_clock = ((info->chip_rev >= CD1400_REV_J) ? 60000000 :
+        __u32 cy_clock = ((info->chip_rev >= CD1400_REV_J) ? 60000000 :
                         25000000);
 
         if (baud == 0) {
@@ -3086,9 +3021,10 @@ static void cyy_baud_calc(struct cyclades_port *info, uclong baud)
  */
 static void set_line_char(struct cyclades_port *info)
 {
+        struct cyclades_card *card;
         unsigned long flags;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
         unsigned cflag, iflag;
         unsigned short chip_number;
         int baud, baud_rate = 0;
@@ -3118,12 +3054,12 @@ static void set_line_char(struct cyclades_port *info)
         }
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
+        channel = info->line - card->first_line;
         chip_number = channel / 4;
 
-        if (!IS_CYC_Z(cy_card[card])) {
+        if (!IS_CYC_Z(*card)) {
 
-                index = cy_card[card].bus_index;
+                index = card->bus_index;
 
                 /* baud rate */
                 baud = tty_get_baud_rate(info->tty);
@@ -3241,10 +3177,9 @@ static void set_line_char(struct cyclades_port *info)
 
                 chip = channel >> 2;
                 channel &= 0x03;
-                base_addr = cy_card[card].base_addr +
-                        (cy_chip_offset[chip] << index);
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
                 cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
 
                 /* tx and rx baud rate */
@@ -3276,8 +3211,7 @@ static void set_line_char(struct cyclades_port *info)
                 if (C_CLOCAL(info->tty)) {
                         /* without modem intr */
                         cy_writeb(base_addr + (CySRER << index),
-                                  cy_readb(base_addr +
-                                           (CySRER << index)) | CyMdmCh);
+                                readb(base_addr + (CySRER << index)) | CyMdmCh);
                         /* act on 1->0 modem transitions */
                         if ((cflag & CRTSCTS) && info->rflow) {
                                 cy_writeb(base_addr + (CyMCOR1 << index),
@@ -3291,7 +3225,7 @@ static void set_line_char(struct cyclades_port *info)
                 } else {
                         /* without modem intr */
                         cy_writeb(base_addr + (CySRER << index),
-                                  cy_readb(base_addr +
+                                  readb(base_addr +
                                            (CySRER << index)) | CyMdmCh);
                         /* act on 1->0 modem transitions */
                         if ((cflag & CRTSCTS) && info->rflow) {
@@ -3316,10 +3250,10 @@ static void set_line_char(struct cyclades_port *info)
                                           ~CyDTR);
                         }
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:set_line_char dropping DTR\n");
-                        printk("     status: 0x%x, 0x%x\n",
-                                cy_readb(base_addr + (CyMSVR1 << index)),
-                                cy_readb(base_addr + (CyMSVR2 << index)));
+                        printk(KERN_DEBUG "cyc:set_line_char dropping DTR\n");
+                        printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                                readb(base_addr + (CyMSVR1 << index)),
+                                readb(base_addr + (CyMSVR2 << index)));
 #endif
                 } else {
                         if (info->rtsdtr_inv) {
@@ -3330,17 +3264,17 @@ static void set_line_char(struct cyclades_port *info)
                                           CyDTR);
                         }
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:set_line_char raising DTR\n");
-                        printk("     status: 0x%x, 0x%x\n",
-                                cy_readb(base_addr + (CyMSVR1 << index)),
-                                cy_readb(base_addr + (CyMSVR2 << index)));
+                        printk(KERN_DEBUG "cyc:set_line_char raising DTR\n");
+                        printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                                readb(base_addr + (CyMSVR1 << index)),
+                                readb(base_addr + (CyMSVR2 << index)));
 #endif
                 }
 
                 if (info->tty) {
                         clear_bit(TTY_IO_ERROR, &info->tty->flags);
                 }
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
 
         } else {
                 struct FIRM_ID __iomem *firm_id;
@@ -3348,16 +3282,16 @@ static void set_line_char(struct cyclades_port *info)
                 struct BOARD_CTRL __iomem *board_ctrl;
                 struct CH_CTRL __iomem *ch_ctrl;
                 struct BUF_CTRL __iomem *buf_ctrl;
-                uclong sw_flow;
+                __u32 sw_flow;
                 int retval;
 
-                firm_id = cy_card[card].base_addr + ID_ADDRESS;
-                if (!ISZLOADED(cy_card[card])) {
+                firm_id = card->base_addr + ID_ADDRESS;
+                if (!ISZLOADED(*card)) {
                         return;
                 }
 
-                zfw_ctrl = cy_card[card].base_addr +
-                        (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                zfw_ctrl = card->base_addr +
+                        (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                 board_ctrl = &zfw_ctrl->board_ctrl;
                 ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
                 buf_ctrl = &zfw_ctrl->buf_ctrl[channel];
@@ -3408,10 +3342,10 @@ static void set_line_char(struct cyclades_port *info)
                 }
                 if (cflag & CSTOPB) {
                         cy_writel(&ch_ctrl->comm_data_l,
-                                  cy_readl(&ch_ctrl->comm_data_l) | C_DL_2STOP);
+                                  readl(&ch_ctrl->comm_data_l) | C_DL_2STOP);
                 } else {
                         cy_writel(&ch_ctrl->comm_data_l,
-                                  cy_readl(&ch_ctrl->comm_data_l) | C_DL_1STOP);
+                                  readl(&ch_ctrl->comm_data_l) | C_DL_1STOP);
                 }
                 if (cflag & PARENB) {
                         if (cflag & PARODD) {
@@ -3426,12 +3360,10 @@ static void set_line_char(struct cyclades_port *info)
                 /* CTS flow control flag */
                 if (cflag & CRTSCTS) {
                         cy_writel(&ch_ctrl->hw_flow,
-                                  cy_readl(&ch_ctrl->
-                                           hw_flow) | C_RS_CTS | C_RS_RTS);
+                                readl(&ch_ctrl->hw_flow) | C_RS_CTS | C_RS_RTS);
                 } else {
-                        cy_writel(&ch_ctrl->hw_flow,
-                                  cy_readl(&ch_ctrl->
-                                           hw_flow) & ~(C_RS_CTS | C_RS_RTS));
+                        cy_writel(&ch_ctrl->hw_flow, readl(&ch_ctrl->hw_flow) &
+                                        ~(C_RS_CTS | C_RS_RTS));
                 }
                 /* As the HW flow control is done in firmware, the driver
                    doesn't need to care about it */
@@ -3446,10 +3378,10 @@ static void set_line_char(struct cyclades_port *info)
                 }
                 cy_writel(&ch_ctrl->sw_flow, sw_flow);
 
-                retval = cyz_issue_cmd(&cy_card[card], channel, C_CM_IOCTL, 0L);
+                retval = cyz_issue_cmd(card, channel, C_CM_IOCTL, 0L);
                 if (retval != 0) {
-                        printk("cyc:set_line_char retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:set_line_char retval on ttyC%d "
+                                "was %x\n", info->line, retval);
                 }
 
                 /* CD sensitivity */
@@ -3461,22 +3393,22 @@ static void set_line_char(struct cyclades_port *info)
 
                 if (baud == 0) {        /* baud rate is zero, turn off line */
                         cy_writel(&ch_ctrl->rs_control,
-                                  cy_readl(&ch_ctrl->rs_control) & ~C_RS_DTR);
+                                  readl(&ch_ctrl->rs_control) & ~C_RS_DTR);
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:set_line_char dropping Z DTR\n");
+                        printk(KERN_DEBUG "cyc:set_line_char dropping Z DTR\n");
 #endif
                 } else {
                         cy_writel(&ch_ctrl->rs_control,
-                                  cy_readl(&ch_ctrl->rs_control) | C_RS_DTR);
+                                  readl(&ch_ctrl->rs_control) | C_RS_DTR);
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:set_line_char raising Z DTR\n");
+                        printk(KERN_DEBUG "cyc:set_line_char raising Z DTR\n");
 #endif
                 }
 
-                retval = cyz_issue_cmd(&cy_card[card], channel, C_CM_IOCTLM,0L);
+                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM,0L);
                 if (retval != 0) {
-                        printk("cyc:set_line_char(2) retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:set_line_char(2) retval on ttyC%d "
+                                "was %x\n", info->line, retval);
                 }
 
                 if (info->tty) {
@@ -3490,14 +3422,15 @@ get_serial_info(struct cyclades_port *info,
                 struct serial_struct __user * retinfo)
 {
         struct serial_struct tmp;
-        struct cyclades_card *cinfo = &cy_card[info->card];
+        struct cyclades_card *cinfo = info->card;
 
         if (!retinfo)
                 return -EFAULT;
         memset(&tmp, 0, sizeof(tmp));
         tmp.type = info->type;
         tmp.line = info->line;
-        tmp.port = info->card * 0x100 + info->line - cinfo->first_line;
+        tmp.port = (info->card - cy_card) * 0x100 + info->line -
+                cinfo->first_line;
         tmp.irq = cinfo->irq;
         tmp.flags = info->flags;
         tmp.close_delay = info->close_delay;
@@ -3566,25 +3499,25 @@ check_and_exit:
  */
 static int get_lsr_info(struct cyclades_port *info, unsigned int __user * value)
 {
-        int card, chip, channel, index;
+        struct cyclades_card *card;
+        int chip, channel, index;
         unsigned char status;
         unsigned int result;
         unsigned long flags;
         void __iomem *base_addr;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = (info->line) - (card->first_line);
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
-                status = cy_readb(base_addr + (CySRER << index)) &
+                spin_lock_irqsave(&card->card_lock, flags);
+                status = readb(base_addr + (CySRER << index)) &
                                 (CyTxRdy | CyTxMpty);
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
                 result = (status ? 0 : TIOCSER_TEMT);
         } else {
                 /* Not supported yet */
@@ -3595,8 +3528,9 @@ static int get_lsr_info(struct cyclades_port *info, unsigned int __user * value)
 
 static int cy_tiocmget(struct tty_struct *tty, struct file *file)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
-        int card, chip, channel, index;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
+        int chip, channel, index;
         void __iomem *base_addr;
         unsigned long flags;
         unsigned char status;
@@ -3611,19 +3545,18 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
                 return -ENODEV;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
                 cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-                status = cy_readb(base_addr + (CyMSVR1 << index));
-                status |= cy_readb(base_addr + (CyMSVR2 << index));
-                CY_UNLOCK(info, flags);
+                status = readb(base_addr + (CyMSVR1 << index));
+                status |= readb(base_addr + (CyMSVR2 << index));
+                spin_unlock_irqrestore(&card->card_lock, flags);
 
                 if (info->rtsdtr_inv) {
                         result = ((status & CyRTS) ? TIOCM_DTR : 0) |
@@ -3637,19 +3570,14 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
                         ((status & CyDSR) ? TIOCM_DSR : 0) |
                         ((status & CyCTS) ? TIOCM_CTS : 0);
         } else {
-                base_addr = cy_card[card].base_addr;
-
-                if (cy_card[card].num_chips != -1) {
-                        return -EINVAL;
-                }
-
-                firm_id = cy_card[card].base_addr + ID_ADDRESS;
-                if (ISZLOADED(cy_card[card])) {
-                        zfw_ctrl = cy_card[card].base_addr +
-                                (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                base_addr = card->base_addr;
+                firm_id = card->base_addr + ID_ADDRESS;
+                if (ISZLOADED(*card)) {
+                        zfw_ctrl = card->base_addr +
+                                (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                         board_ctrl = &zfw_ctrl->board_ctrl;
                         ch_ctrl = zfw_ctrl->ch_ctrl;
-                        lstatus = cy_readl(&ch_ctrl[channel].rs_status);
+                        lstatus = readl(&ch_ctrl[channel].rs_status);
                         result = ((lstatus & C_RS_RTS) ? TIOCM_RTS : 0) |
                                 ((lstatus & C_RS_DTR) ? TIOCM_DTR : 0) |
                                 ((lstatus & C_RS_DCD) ? TIOCM_CAR : 0) |
@@ -3669,8 +3597,9 @@ static int
 cy_tiocmset(struct tty_struct *tty, struct file *file,
                 unsigned int set, unsigned int clear)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
-        int card, chip, channel, index;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
+        int chip, channel, index;
         void __iomem *base_addr;
         unsigned long flags;
         struct FIRM_ID __iomem *firm_id;
@@ -3683,16 +3612,15 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
                 return -ENODEV;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = (info->line) - (card->first_line);
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
                 if (set & TIOCM_RTS) {
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (info->rtsdtr_inv) {
@@ -3702,10 +3630,10 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
                                 cy_writeb(base_addr + (CyMSVR1 << index),
                                           CyRTS);
                         }
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                 }
                 if (clear & TIOCM_RTS) {
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (info->rtsdtr_inv) {
@@ -3715,10 +3643,10 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
                                 cy_writeb(base_addr + (CyMSVR1 << index),
                                           ~CyRTS);
                         }
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                 }
                 if (set & TIOCM_DTR) {
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (info->rtsdtr_inv) {
@@ -3729,15 +3657,15 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
                                           CyDTR);
                         }
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:set_modem_info raising DTR\n");
-                        printk("     status: 0x%x, 0x%x\n",
-                                cy_readb(base_addr + (CyMSVR1 << index)),
-                                cy_readb(base_addr + (CyMSVR2 << index)));
+                        printk(KERN_DEBUG "cyc:set_modem_info raising DTR\n");
+                        printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                                readb(base_addr + (CyMSVR1 << index)),
+                                readb(base_addr + (CyMSVR2 << index)));
 #endif
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                 }
                 if (clear & TIOCM_DTR) {
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (info->rtsdtr_inv) {
@@ -3749,68 +3677,69 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
                         }
 
 #ifdef CY_DEBUG_DTR
-                        printk("cyc:set_modem_info dropping DTR\n");
-                        printk("     status: 0x%x, 0x%x\n",
-                                cy_readb(base_addr + (CyMSVR1 << index)),
-                                cy_readb(base_addr + (CyMSVR2 << index)));
+                        printk(KERN_DEBUG "cyc:set_modem_info dropping DTR\n");
+                        printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                                readb(base_addr + (CyMSVR1 << index)),
+                                readb(base_addr + (CyMSVR2 << index)));
 #endif
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                 }
         } else {
-                base_addr = cy_card[card].base_addr;
+                base_addr = card->base_addr;
 
-                firm_id = cy_card[card].base_addr + ID_ADDRESS;
-                if (ISZLOADED(cy_card[card])) {
-                        zfw_ctrl = cy_card[card].base_addr +
-                                (cy_readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                firm_id = card->base_addr + ID_ADDRESS;
+                if (ISZLOADED(*card)) {
+                        zfw_ctrl = card->base_addr +
+                                (readl(&firm_id->zfwctrl_addr) & 0xfffff);
                         board_ctrl = &zfw_ctrl->board_ctrl;
                         ch_ctrl = zfw_ctrl->ch_ctrl;
 
                         if (set & TIOCM_RTS) {
-                                CY_LOCK(info, flags);
+                                spin_lock_irqsave(&card->card_lock, flags);
                                 cy_writel(&ch_ctrl[channel].rs_control,
-                                          cy_readl(&ch_ctrl[channel].
-                                                   rs_control) | C_RS_RTS);
-                                CY_UNLOCK(info, flags);
+                                        readl(&ch_ctrl[channel].rs_control) |
+                                        C_RS_RTS);
+                                spin_unlock_irqrestore(&card->card_lock, flags);
                         }
                         if (clear & TIOCM_RTS) {
-                                CY_LOCK(info, flags);
+                                spin_lock_irqsave(&card->card_lock, flags);
                                 cy_writel(&ch_ctrl[channel].rs_control,
-                                          cy_readl(&ch_ctrl[channel].
-                                                   rs_control) & ~C_RS_RTS);
-                                CY_UNLOCK(info, flags);
+                                        readl(&ch_ctrl[channel].rs_control) &
+                                        ~C_RS_RTS);
+                                spin_unlock_irqrestore(&card->card_lock, flags);
                         }
                         if (set & TIOCM_DTR) {
-                                CY_LOCK(info, flags);
+                                spin_lock_irqsave(&card->card_lock, flags);
                                 cy_writel(&ch_ctrl[channel].rs_control,
-                                          cy_readl(&ch_ctrl[channel].
-                                                   rs_control) | C_RS_DTR);
+                                        readl(&ch_ctrl[channel].rs_control) |
+                                        C_RS_DTR);
 #ifdef CY_DEBUG_DTR
-                                printk("cyc:set_modem_info raising Z DTR\n");
+                                printk(KERN_DEBUG "cyc:set_modem_info raising "
+                                        "Z DTR\n");
 #endif
-                                CY_UNLOCK(info, flags);
+                                spin_unlock_irqrestore(&card->card_lock, flags);
                         }
                         if (clear & TIOCM_DTR) {
-                                CY_LOCK(info, flags);
+                                spin_lock_irqsave(&card->card_lock, flags);
                                 cy_writel(&ch_ctrl[channel].rs_control,
-                                          cy_readl(&ch_ctrl[channel].
-                                                   rs_control) & ~C_RS_DTR);
+                                        readl(&ch_ctrl[channel].rs_control) &
+                                        ~C_RS_DTR);
 #ifdef CY_DEBUG_DTR
-                                printk("cyc:set_modem_info clearing Z DTR\n");
+                                printk(KERN_DEBUG "cyc:set_modem_info clearing "
+                                        "Z DTR\n");
 #endif
-                                CY_UNLOCK(info, flags);
+                                spin_unlock_irqrestore(&card->card_lock, flags);
                         }
                 } else {
                         return -ENODEV;
                 }
-                CY_LOCK(info, flags);
-                retval = cyz_issue_cmd(&cy_card[info->card],
-                                        channel, C_CM_IOCTLM, 0L);
+                spin_lock_irqsave(&card->card_lock, flags);
+                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
                 if (retval != 0) {
-                        printk("cyc:set_modem_info retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc:set_modem_info retval on ttyC%d "
+                                "was %x\n", info->line, retval);
                 }
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
         }
         return 0;
 }                               /* cy_tiocmset */
@@ -3820,14 +3749,17 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
  */
 static void cy_break(struct tty_struct *tty, int break_state)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "cy_break"))
                 return;
 
-        CY_LOCK(info, flags);
-        if (!IS_CYC_Z(cy_card[info->card])) {
+        card = info->card;
+
+        spin_lock_irqsave(&card->card_lock, flags);
+        if (!IS_CYC_Z(*card)) {
                 /* Let the transmit ISR take care of this (since it
                    requires stuffing characters into the output stream).
                  */
@@ -3835,18 +3767,18 @@ static void cy_break(struct tty_struct *tty, int break_state)
                         if (!info->breakon) {
                                 info->breakon = 1;
                                 if (!info->xmit_cnt) {
-                                        CY_UNLOCK(info, flags);
+                                        spin_unlock_irqrestore(&card->card_lock, flags);
                                         start_xmit(info);
-                                        CY_LOCK(info, flags);
+                                        spin_lock_irqsave(&card->card_lock, flags);
                                 }
                         }
                 } else {
                         if (!info->breakoff) {
                                 info->breakoff = 1;
                                 if (!info->xmit_cnt) {
-                                        CY_UNLOCK(info, flags);
+                                        spin_unlock_irqrestore(&card->card_lock, flags);
                                         start_xmit(info);
-                                        CY_LOCK(info, flags);
+                                        spin_lock_irqsave(&card->card_lock, flags);
                                 }
                         }
                 }
@@ -3854,24 +3786,25 @@ static void cy_break(struct tty_struct *tty, int break_state)
                 int retval;
 
                 if (break_state == -1) {
-                        retval = cyz_issue_cmd(&cy_card[info->card],
-                                info->line - cy_card[info->card].first_line,
+                        retval = cyz_issue_cmd(card,
+                                info->line - card->first_line,
                                 C_CM_SET_BREAK, 0L);
                         if (retval != 0) {
-                                printk("cyc:cy_break (set) retval on ttyC%d "
-                                        "was %x\n", info->line, retval);
+                                printk(KERN_ERR "cyc:cy_break (set) retval on "
+                                        "ttyC%d was %x\n", info->line, retval);
                         }
                 } else {
-                        retval = cyz_issue_cmd(&cy_card[info->card],
-                                info->line - cy_card[info->card].first_line,
+                        retval = cyz_issue_cmd(card,
+                                info->line - card->first_line,
                                 C_CM_CLR_BREAK, 0L);
                         if (retval != 0) {
-                                printk("cyc:cy_break (clr) retval on ttyC%d "
-                                        "was %x\n", info->line, retval);
+                                printk(KERN_DEBUG "cyc:cy_break (clr) retval "
+                                        "on ttyC%d was %x\n", info->line,
+                                        retval);
                         }
                 }
         }
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
 }                               /* cy_break */
 
 static int
@@ -3889,28 +3822,27 @@ get_mon_info(struct cyclades_port *info, struct cyclades_monitor __user * mon)
 
 static int set_threshold(struct cyclades_port *info, unsigned long value)
 {
+        struct cyclades_card *card;
         void __iomem *base_addr;
-        int card, channel, chip, index;
+        int channel, chip, index;
         unsigned long flags;
 
         card = info->card;
-        channel = info->line - cy_card[card].first_line;
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
+                index = card->bus_index;
                 base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                    card->base_addr + (cy_chip_offset[chip] << index);
 
                 info->cor3 &= ~CyREC_FIFO;
                 info->cor3 |= value & CyREC_FIFO;
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
                 cy_writeb(base_addr + (CyCOR3 << index), info->cor3);
                 cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR3ch, index);
-                CY_UNLOCK(info, flags);
-        } else {
-                /* Nothing to do! */
+                spin_unlock_irqrestore(&card->card_lock, flags);
         }
         return 0;
 }                               /* set_threshold */
@@ -3918,25 +3850,23 @@ static int set_threshold(struct cyclades_port *info, unsigned long value)
 static int
 get_threshold(struct cyclades_port *info, unsigned long __user * value)
 {
+        struct cyclades_card *card;
         void __iomem *base_addr;
-        int card, channel, chip, index;
+        int channel, chip, index;
         unsigned long tmp;
 
         card = info->card;
-        channel = info->line - cy_card[card].first_line;
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                tmp = cy_readb(base_addr + (CyCOR3 << index)) & CyREC_FIFO;
+                tmp = readb(base_addr + (CyCOR3 << index)) & CyREC_FIFO;
                 return put_user(tmp, value);
-        } else {
-                /* Nothing to do! */
-                return 0;
         }
+        return 0;
 }                               /* get_threshold */
 
 static int
@@ -3954,49 +3884,45 @@ get_default_threshold(struct cyclades_port *info, unsigned long __user * value)
 
 static int set_timeout(struct cyclades_port *info, unsigned long value)
 {
+        struct cyclades_card *card;
         void __iomem *base_addr;
-        int card, channel, chip, index;
+        int channel, chip, index;
         unsigned long flags;
 
         card = info->card;
-        channel = info->line - cy_card[card].first_line;
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&card->card_lock, flags);
                 cy_writeb(base_addr + (CyRTPR << index), value & 0xff);
-                CY_UNLOCK(info, flags);
-        } else {
-                /* Nothing to do! */
+                spin_unlock_irqrestore(&card->card_lock, flags);
         }
         return 0;
 }                               /* set_timeout */
 
 static int get_timeout(struct cyclades_port *info, unsigned long __user * value)
 {
+        struct cyclades_card *card;
         void __iomem *base_addr;
-        int card, channel, chip, index;
+        int channel, chip, index;
         unsigned long tmp;
 
         card = info->card;
-        channel = info->line - cy_card[card].first_line;
-        if (!IS_CYC_Z(cy_card[card])) {
+        channel = info->line - card->first_line;
+        if (!IS_CYC_Z(*card)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                index = cy_card[card].bus_index;
-                base_addr =
-                    cy_card[card].base_addr + (cy_chip_offset[chip] << index);
+                index = card->bus_index;
+                base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-                tmp = cy_readb(base_addr + (CyRTPR << index));
+                tmp = readb(base_addr + (CyRTPR << index));
                 return put_user(tmp, value);
-        } else {
-                /* Nothing to do! */
-                return 0;
         }
+        return 0;
 }                               /* get_timeout */
 
 static int set_default_timeout(struct cyclades_port *info, unsigned long value)
@@ -4020,7 +3946,7 @@ static int
 cy_ioctl(struct tty_struct *tty, struct file *file,
          unsigned int cmd, unsigned long arg)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
         struct cyclades_icount cprev, cnow;     /* kernel counter temps */
         struct serial_icounter_struct __user *p_cuser;  /* user space */
         int ret_val = 0;
@@ -4031,7 +3957,8 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                 return -ENODEV;
 
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n", info->line, cmd, arg);      /* */
+        printk(KERN_DEBUG "cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n",
+                info->line, cmd, arg);
 #endif
 
         switch (cmd) {
@@ -4076,14 +4003,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
         case CYGETRTSDTR_INV:
                 ret_val = info->rtsdtr_inv;
                 break;
-        case CYGETCARDINFO:
-                if (copy_to_user(argp, &cy_card[info->card],
-                                 sizeof(struct cyclades_card))) {
-                        ret_val = -EFAULT;
-                        break;
-                }
-                ret_val = 0;
-                break;
         case CYGETCD1400VER:
                 ret_val = info->chip_rev;
                 break;
@@ -4119,34 +4038,22 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                  * Caller should use TIOCGICOUNT to see which one it was
                  */
         case TIOCMIWAIT:
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&info->card->card_lock, flags);
                 /* note the counters on entry */
-                cprev = info->icount;
-                CY_UNLOCK(info, flags);
-                while (1) {
-                        interruptible_sleep_on(&info->delta_msr_wait);
-                        /* see if a signal did it */
-                        if (signal_pending(current)) {
-                                return -ERESTARTSYS;
-                        }
-
-                        CY_LOCK(info, flags);
+                cnow = info->icount;
+                spin_unlock_irqrestore(&info->card->card_lock, flags);
+                ret_val = wait_event_interruptible(info->delta_msr_wait, ({
+                        cprev = cnow;
+                        spin_lock_irqsave(&info->card->card_lock, flags);
                         cnow = info->icount;    /* atomic copy */
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&info->card->card_lock, flags);
 
-                        if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                            cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) {
-                                return -EIO;    /* no change => error */
-                        }
-                        if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                            ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                            ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) ||
-                            ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) {
-                                return 0;
-                        }
-                        cprev = cnow;
-                }
-                /* NOTREACHED */
+                        ((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
+                        ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
+                        ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
+                        ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts));
+                }));
+                break;
 
                 /*
                  * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
@@ -4155,9 +4062,9 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                  *     RI where only 0->1 is counted.
                  */
         case TIOCGICOUNT:
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&info->card->card_lock, flags);
                 cnow = info->icount;
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&info->card->card_lock, flags);
                 p_cuser = argp;
                 ret_val = put_user(cnow.cts, &p_cuser->cts);
                 if (ret_val)
@@ -4199,7 +4106,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
         }
 
 #ifdef CY_DEBUG_OTHER
-        printk(" cyc:cy_ioctl done\n");
+        printk(KERN_DEBUG "cyc:cy_ioctl done\n");
 #endif
 
         return ret_val;
@@ -4213,10 +4120,10 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
  */
 static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
 
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_set_termios ttyC%d\n", info->line);
+        printk(KERN_DEBUG "cyc:cy_set_termios ttyC%d\n", info->line);
 #endif
 
         if (tty->termios->c_cflag == old_termios->c_cflag &&
@@ -4248,8 +4155,9 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 */
 static void cy_send_xchar(struct tty_struct *tty, char ch)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
-        int card, channel;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
+        int channel;
 
         if (serial_paranoia_check(info, tty->name, "cy_send_xchar"))
                 return;
@@ -4260,15 +4168,13 @@ static void cy_send_xchar(struct tty_struct *tty, char ch)
                 cy_start(tty);
 
         card = info->card;
-        channel = info->line - cy_card[card].first_line;
+        channel = info->line - card->first_line;
 
-        if (IS_CYC_Z(cy_card[card])) {
+        if (IS_CYC_Z(*card)) {
                 if (ch == STOP_CHAR(tty))
-                        cyz_issue_cmd(&cy_card[card], channel, C_CM_SENDXOFF,
-                                        0L);
+                        cyz_issue_cmd(card, channel, C_CM_SENDXOFF, 0L);
                 else if (ch == START_CHAR(tty))
-                        cyz_issue_cmd(&cy_card[card], channel, C_CM_SENDXON,
-                                        0L);
+                        cyz_issue_cmd(card, channel, C_CM_SENDXON, 0L);
         }
 }
 
@@ -4278,15 +4184,16 @@ static void cy_send_xchar(struct tty_struct *tty, char ch)
  */
 static void cy_throttle(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
         unsigned long flags;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
 
 #ifdef CY_DEBUG_THROTTLE
         char buf[64];
 
-        printk("cyc:throttle %s: %d....ttyC%d\n", tty_name(tty, buf),
+        printk(KERN_DEBUG "cyc:throttle %s: %ld...ttyC%d\n", tty_name(tty, buf),
                         tty->ldisc.chars_in_buffer(tty), info->line);
 #endif
 
@@ -4297,22 +4204,22 @@ static void cy_throttle(struct tty_struct *tty)
         card = info->card;
 
         if (I_IXOFF(tty)) {
-                if (!IS_CYC_Z(cy_card[card]))
+                if (!IS_CYC_Z(*card))
                         cy_send_xchar(tty, STOP_CHAR(tty));
                 else
                         info->throttle = 1;
         }
 
         if (tty->termios->c_cflag & CRTSCTS) {
-                channel = info->line - cy_card[card].first_line;
-                if (!IS_CYC_Z(cy_card[card])) {
+                channel = info->line - card->first_line;
+                if (!IS_CYC_Z(*card)) {
                         chip = channel >> 2;
                         channel &= 0x03;
-                        index = cy_card[card].bus_index;
-                        base_addr = cy_card[card].base_addr +
+                        index = card->bus_index;
+                        base_addr = card->base_addr +
                                 (cy_chip_offset[chip] << index);
 
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (info->rtsdtr_inv) {
@@ -4322,7 +4229,7 @@ static void cy_throttle(struct tty_struct *tty)
                                 cy_writeb(base_addr + (CyMSVR1 << index),
                                           ~CyRTS);
                         }
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                 } else {
                         info->throttle = 1;
                 }
@@ -4336,16 +4243,17 @@ static void cy_throttle(struct tty_struct *tty)
  */
 static void cy_unthrottle(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
         unsigned long flags;
         void __iomem *base_addr;
-        int card, chip, channel, index;
+        int chip, channel, index;
 
 #ifdef CY_DEBUG_THROTTLE
         char buf[64];
 
-        printk("cyc:unthrottle %s: %d....ttyC%d\n", tty_name(tty, buf),
-                tty->ldisc.chars_in_buffer(tty), info->line);
+        printk(KERN_DEBUG "cyc:unthrottle %s: %ld...ttyC%d\n",
+                tty_name(tty, buf), tty->ldisc.chars_in_buffer(tty),info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_unthrottle")) {
@@ -4361,15 +4269,15 @@ static void cy_unthrottle(struct tty_struct *tty)
 
         if (tty->termios->c_cflag & CRTSCTS) {
                 card = info->card;
-                channel = info->line - cy_card[card].first_line;
-                if (!IS_CYC_Z(cy_card[card])) {
+                channel = info->line - card->first_line;
+                if (!IS_CYC_Z(*card)) {
                         chip = channel >> 2;
                         channel &= 0x03;
-                        index = cy_card[card].bus_index;
-                        base_addr = cy_card[card].base_addr +
+                        index = card->bus_index;
+                        base_addr = card->base_addr +
                                 (cy_chip_offset[chip] << index);
 
-                        CY_LOCK(info, flags);
+                        spin_lock_irqsave(&card->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
                         if (info->rtsdtr_inv) {
@@ -4379,7 +4287,7 @@ static void cy_unthrottle(struct tty_struct *tty)
                                 cy_writeb(base_addr + (CyMSVR1 << index),
                                           CyRTS);
                         }
-                        CY_UNLOCK(info, flags);
+                        spin_unlock_irqrestore(&card->card_lock, flags);
                 } else {
                         info->throttle = 0;
                 }
@@ -4392,102 +4300,96 @@ static void cy_unthrottle(struct tty_struct *tty)
 static void cy_stop(struct tty_struct *tty)
 {
         struct cyclades_card *cinfo;
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
         void __iomem *base_addr;
         int chip, channel, index;
         unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_stop ttyC%d\n", info->line);     /* */
+        printk(KERN_DEBUG "cyc:cy_stop ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_stop"))
                 return;
 
-        cinfo = &cy_card[info->card];
+        cinfo = info->card;
         channel = info->line - cinfo->first_line;
         if (!IS_CYC_Z(*cinfo)) {
                 index = cinfo->bus_index;
                 chip = channel >> 2;
                 channel &= 0x03;
-                base_addr = cy_card[info->card].base_addr +
-                        (cy_chip_offset[chip] << index);
+                base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&cinfo->card_lock, flags);
                 cy_writeb(base_addr + (CyCAR << index),
                         (u_char)(channel & 0x0003)); /* index channel */
                 cy_writeb(base_addr + (CySRER << index),
-                          cy_readb(base_addr + (CySRER << index)) & ~CyTxRdy);
-                CY_UNLOCK(info, flags);
-        } else {
-                /* Nothing to do! */
+                          readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+                spin_unlock_irqrestore(&cinfo->card_lock, flags);
         }
 }                               /* cy_stop */
 
 static void cy_start(struct tty_struct *tty)
 {
         struct cyclades_card *cinfo;
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
         void __iomem *base_addr;
         int chip, channel, index;
         unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_start ttyC%d\n", info->line);    /* */
+        printk(KERN_DEBUG "cyc:cy_start ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_start"))
                 return;
 
-        cinfo = &cy_card[info->card];
+        cinfo = info->card;
         channel = info->line - cinfo->first_line;
         index = cinfo->bus_index;
         if (!IS_CYC_Z(*cinfo)) {
                 chip = channel >> 2;
                 channel &= 0x03;
-                base_addr = cy_card[info->card].base_addr +
-                        (cy_chip_offset[chip] << index);
+                base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
 
-                CY_LOCK(info, flags);
+                spin_lock_irqsave(&cinfo->card_lock, flags);
                 cy_writeb(base_addr + (CyCAR << index), (u_char) (channel & 0x0003));   /* index channel */
                 cy_writeb(base_addr + (CySRER << index),
-                          cy_readb(base_addr + (CySRER << index)) | CyTxRdy);
-                CY_UNLOCK(info, flags);
-        } else {
-                /* Nothing to do! */
+                          readb(base_addr + (CySRER << index)) | CyTxRdy);
+                spin_unlock_irqrestore(&cinfo->card_lock, flags);
         }
 }                               /* cy_start */
 
 static void cy_flush_buffer(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
-        int card, channel, retval;
+        struct cyclades_port *info = tty->driver_data;
+        struct cyclades_card *card;
+        int channel, retval;
         unsigned long flags;
 
 #ifdef CY_DEBUG_IO
-        printk("cyc:cy_flush_buffer ttyC%d\n", info->line);     /* */
+        printk(KERN_DEBUG "cyc:cy_flush_buffer ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_flush_buffer"))
                 return;
 
         card = info->card;
-        channel = (info->line) - (cy_card[card].first_line);
+        channel = info->line - card->first_line;
 
-        CY_LOCK(info, flags);
+        spin_lock_irqsave(&card->card_lock, flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        CY_UNLOCK(info, flags);
+        spin_unlock_irqrestore(&card->card_lock, flags);
 
-        if (IS_CYC_Z(cy_card[card])) {  /* If it is a Z card, flush the on-board
+        if (IS_CYC_Z(*card)) {  /* If it is a Z card, flush the on-board
                                            buffers as well */
-                CY_LOCK(info, flags);
-                retval =
-                    cyz_issue_cmd(&cy_card[card], channel, C_CM_FLUSH_TX, 0L);
+                spin_lock_irqsave(&card->card_lock, flags);
+                retval = cyz_issue_cmd(card, channel, C_CM_FLUSH_TX, 0L);
                 if (retval != 0) {
-                        printk("cyc: flush_buffer retval on ttyC%d was %x\n",
-                                info->line, retval);
+                        printk(KERN_ERR "cyc: flush_buffer retval on ttyC%d "
+                                "was %x\n", info->line, retval);
                 }
-                CY_UNLOCK(info, flags);
+                spin_unlock_irqrestore(&card->card_lock, flags);
         }
         tty_wakeup(tty);
 }                               /* cy_flush_buffer */
@@ -4497,10 +4399,10 @@ static void cy_flush_buffer(struct tty_struct *tty)
  */
 static void cy_hangup(struct tty_struct *tty)
 {
-        struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
+        struct cyclades_port *info = tty->driver_data;
 
 #ifdef CY_DEBUG_OTHER
-        printk("cyc:cy_hangup ttyC%d\n", info->line);   /* */
+        printk(KERN_DEBUG "cyc:cy_hangup ttyC%d\n", info->line);
 #endif
 
         if (serial_paranoia_check(info, tty->name, "cy_hangup"))
@@ -4511,7 +4413,8 @@ static void cy_hangup(struct tty_struct *tty)
         info->event = 0;
         info->count = 0;
 #ifdef CY_DEBUG_COUNT
-        printk("cyc:cy_hangup (%d): setting count to 0\n", current->pid);
+        printk(KERN_DEBUG "cyc:cy_hangup (%d): setting count to 0\n",
+                current->pid);
 #endif
         info->tty = NULL;
         info->flags &= ~ASYNC_NORMAL_ACTIVE;
@@ -4526,10 +4429,107 @@ static void cy_hangup(struct tty_struct *tty)
  * ---------------------------------------------------------------------
  */
 
+static int __devinit cy_init_card(struct cyclades_card *cinfo)
+{
+        struct cyclades_port *info;
+        u32 mailbox;
+        unsigned int nports;
+        unsigned short chip_number;
+        int index, port;
+
+        spin_lock_init(&cinfo->card_lock);
+
+        if (IS_CYC_Z(*cinfo)) { /* Cyclades-Z */
+                mailbox = readl(&((struct RUNTIME_9060 __iomem *)
+                                     cinfo->ctl_addr)->mail_box_0);
+                nports = (mailbox == ZE_V1) ? ZE_V1_NPORTS : 8;
+                cinfo->intr_enabled = 0;
+                cinfo->nports = 0;      /* Will be correctly set later, after
+                                           Z FW is loaded */
+        } else {
+                index = cinfo->bus_index;
+                nports = cinfo->nports = CyPORTS_PER_CHIP * cinfo->num_chips;
+        }
+
+        cinfo->ports = kzalloc(sizeof(*cinfo->ports) * nports, GFP_KERNEL);
+        if (cinfo->ports == NULL) {
+                printk(KERN_ERR "Cyclades: cannot allocate ports\n");
+                cinfo->nports = 0;
+                return -ENOMEM;
+        }
+
+        for (port = cinfo->first_line; port < cinfo->first_line + nports;
+                        port++) {
+                info = &cinfo->ports[port - cinfo->first_line];
+                info->magic = CYCLADES_MAGIC;
+                info->card = cinfo;
+                info->line = port;
+                info->flags = STD_COM_FLAGS;
+                info->closing_wait = CLOSING_WAIT_DELAY;
+                info->close_delay = 5 * HZ / 10;
+
+                INIT_WORK(&info->tqueue, do_softint);
+                init_waitqueue_head(&info->open_wait);
+                init_waitqueue_head(&info->close_wait);
+                init_completion(&info->shutdown_wait);
+                init_waitqueue_head(&info->delta_msr_wait);
+
+                if (IS_CYC_Z(*cinfo)) {
+                        info->type = PORT_STARTECH;
+                        if (mailbox == ZO_V1)
+                                info->xmit_fifo_size = CYZ_FIFO_SIZE;
+                        else
+                                info->xmit_fifo_size = 4 * CYZ_FIFO_SIZE;
+#ifdef CONFIG_CYZ_INTR
+                        setup_timer(&cyz_rx_full_timer[port],
+                                cyz_rx_restart, (unsigned long)info);
+#endif
+                } else {
+                        info->type = PORT_CIRRUS;
+                        info->xmit_fifo_size = CyMAX_CHAR_FIFO;
+                        info->cor1 = CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
+                        info->cor2 = CyETC;
+                        info->cor3 = 0x08;      /* _very_ small rcv threshold */
+
+                        chip_number = (port - cinfo->first_line) / 4;
+                        if ((info->chip_rev = readb(cinfo->base_addr +
+                                      (cy_chip_offset[chip_number] <<
+                                       index) + (CyGFRCR << index))) >=
+                            CD1400_REV_J) {
+                                /* It is a CD1400 rev. J or later */
+                                info->tbpr = baud_bpr_60[13];   /* Tx BPR */
+                                info->tco = baud_co_60[13];     /* Tx CO */
+                                info->rbpr = baud_bpr_60[13];   /* Rx BPR */
+                                info->rco = baud_co_60[13];     /* Rx CO */
+                                info->rtsdtr_inv = 1;
+                        } else {
+                                info->tbpr = baud_bpr_25[13];   /* Tx BPR */
+                                info->tco = baud_co_25[13];     /* Tx CO */
+                                info->rbpr = baud_bpr_25[13];   /* Rx BPR */
+                                info->rco = baud_co_25[13];     /* Rx CO */
+                                info->rtsdtr_inv = 0;
+                        }
+                        info->read_status_mask = CyTIMEOUT | CySPECHAR |
+                                CyBREAK | CyPARITY | CyFRAME | CyOVERRUN;
+                }
+
+        }
+
+#ifndef CONFIG_CYZ_INTR
+        if (IS_CYC_Z(*cinfo) && !timer_pending(&cyz_timerlist)) {
+                mod_timer(&cyz_timerlist, jiffies + 1);
+#ifdef CY_PCI_DEBUG
+                printk(KERN_DEBUG "Cyclades-Z polling initialized\n");
+#endif
+        }
+#endif
+        return 0;
+}
+
 /* initialize chips on Cyclom-Y card -- return number of valid
    chips (which is number of ports/4) */
-static unsigned short __init
-cyy_init_card(void __iomem * true_base_addr, int index)
+static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr,
+                int index)
 {
         unsigned int chip_number;
         void __iomem *base_addr;
@@ -4544,7 +4544,7 @@ cyy_init_card(void __iomem * true_base_addr, int index)
                 base_addr =
                     true_base_addr + (cy_chip_offset[chip_number] << index);
                 mdelay(1);
-                if (cy_readb(base_addr + (CyCCR << index)) != 0x00) {
+                if (readb(base_addr + (CyCCR << index)) != 0x00) {
                         /*************
                         printk(" chip #%d at %#6lx is never idle (CCR != 0)\n",
                         chip_number, (unsigned long)base_addr);
@@ -4561,7 +4561,7 @@ cyy_init_card(void __iomem * true_base_addr, int index)
                    chip 4 GFRCR register appears at chip 0, there is no chip 4
                    and this must be a Cyclom-16Y, not a Cyclom-32Ye.
                  */
-                if (chip_number == 4 && cy_readb(true_base_addr +
+                if (chip_number == 4 && readb(true_base_addr +
                                 (cy_chip_offset[0] << index) +
                                 (CyGFRCR << index)) == 0) {
                         return chip_number;
@@ -4570,7 +4570,7 @@ cyy_init_card(void __iomem * true_base_addr, int index)
                 cy_writeb(base_addr + (CyCCR << index), CyCHIP_RESET);
                 mdelay(1);
 
-                if (cy_readb(base_addr + (CyGFRCR << index)) == 0x00) {
+                if (readb(base_addr + (CyGFRCR << index)) == 0x00) {
                         /*
                            printk(" chip #%d at %#6lx is not responding ",
                            chip_number, (unsigned long)base_addr);
@@ -4578,7 +4578,7 @@ cyy_init_card(void __iomem * true_base_addr, int index)
                          */
                         return chip_number;
                 }
-                if ((0xf0 & (cy_readb(base_addr + (CyGFRCR << index)))) !=
+                if ((0xf0 & (readb(base_addr + (CyGFRCR << index)))) !=
                                 0x40) {
                         /*
                         printk(" chip #%d at %#6lx is not valid (GFRCR == "
@@ -4589,7 +4589,7 @@ cyy_init_card(void __iomem * true_base_addr, int index)
                         return chip_number;
                 }
                 cy_writeb(base_addr + (CyGCR << index), CyCH0_SERIAL);
-                if (cy_readb(base_addr + (CyGFRCR << index)) >= CD1400_REV_J) {
+                if (readb(base_addr + (CyGFRCR << index)) >= CD1400_REV_J) {
                         /* It is a CD1400 rev. J or later */
                         /* Impossible to reach 5ms with this chip.
                            Changed to 2ms instead (f = 500 Hz). */
@@ -4602,7 +4602,7 @@ cyy_init_card(void __iomem * true_base_addr, int index)
                 /*
                    printk(" chip #%d at %#6lx is rev 0x%2x\n",
                    chip_number, (unsigned long)base_addr,
-                   cy_readb(base_addr+(CyGFRCR<<index)));
+                   readb(base_addr+(CyGFRCR<<index)));
                  */
         }
         return chip_number;
@@ -4647,9 +4647,15 @@ static int __init cy_detect_isa(void)
 
                 /* probe for CD1400... */
                 cy_isa_address = ioremap(isa_address, CyISA_Ywin);
+                if (cy_isa_address == NULL) {
+                        printk(KERN_ERR "Cyclom-Y/ISA: can't remap base "
+                                        "address\n");
+                        continue;
+                }
                 cy_isa_nchan = CyPORTS_PER_CHIP *
                         cyy_init_card(cy_isa_address, 0);
                 if (cy_isa_nchan == 0) {
+                        iounmap(cy_isa_address);
                         continue;
                 }
 #ifdef MODULE
@@ -4660,40 +4666,42 @@ static int __init cy_detect_isa(void)
                         /* find out the board's irq by probing */
                         cy_isa_irq = detect_isa_irq(cy_isa_address);
                 if (cy_isa_irq == 0) {
-                        printk("Cyclom-Y/ISA found at 0x%lx ",
+                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but the "
+                                "IRQ could not be detected.\n",
                                 (unsigned long)cy_isa_address);
-                        printk("but the IRQ could not be detected.\n");
+                        iounmap(cy_isa_address);
                         continue;
                 }
 
                 if ((cy_next_channel + cy_isa_nchan) > NR_PORTS) {
-                        printk("Cyclom-Y/ISA found at 0x%lx ",
+                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but no "
+                                "more channels are available. Change NR_PORTS "
+                                "in cyclades.c and recompile kernel.\n",
                                 (unsigned long)cy_isa_address);
-                        printk("but no more channels are available.\n");
-                        printk("Change NR_PORTS in cyclades.c and recompile "
-                                        "kernel.\n");
+                        iounmap(cy_isa_address);
                         return nboard;
                 }
                 /* fill the next cy_card structure available */
                 for (j = 0; j < NR_CARDS; j++) {
-                        if (cy_card[j].base_addr == 0)
+                        if (cy_card[j].base_addr == NULL)
                                 break;
                 }
                 if (j == NR_CARDS) {    /* no more cy_cards available */
-                        printk("Cyclom-Y/ISA found at 0x%lx ",
+                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but no "
+                                "more cards can be used. Change NR_CARDS in "
+                                "cyclades.c and recompile kernel.\n",
                                 (unsigned long)cy_isa_address);
-                        printk("but no more cards can be used .\n");
-                        printk("Change NR_CARDS in cyclades.c and recompile "
-                                        "kernel.\n");
+                        iounmap(cy_isa_address);
                         return nboard;
                 }
 
                 /* allocate IRQ */
                 if (request_irq(cy_isa_irq, cyy_interrupt,
                                 IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) {
-                        printk("Cyclom-Y/ISA found at 0x%lx ",
-                                (unsigned long)cy_isa_address);
-                        printk("but could not allocate IRQ#%d.\n", cy_isa_irq);
+                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but "
+                                "could not allocate IRQ#%d.\n",
+                                (unsigned long)cy_isa_address, cy_isa_irq);
+                        iounmap(cy_isa_address);
                         return nboard;
                 }
 
@@ -4704,15 +4712,23 @@ static int __init cy_detect_isa(void)
                 cy_card[j].bus_index = 0;
                 cy_card[j].first_line = cy_next_channel;
                 cy_card[j].num_chips = cy_isa_nchan / 4;
+                if (cy_init_card(&cy_card[j])) {
+                        cy_card[j].base_addr = NULL;
+                        free_irq(cy_isa_irq, &cy_card[j]);
+                        iounmap(cy_isa_address);
+                        continue;
+                }
                 nboard++;
 
-                /* print message */
-                printk("Cyclom-Y/ISA #%d: 0x%lx-0x%lx, IRQ%d, ",
+                printk(KERN_INFO "Cyclom-Y/ISA #%d: 0x%lx-0x%lx, IRQ%d found: "
+                        "%d channels starting from port %d\n",
                         j + 1, (unsigned long)cy_isa_address,
                         (unsigned long)(cy_isa_address + (CyISA_Ywin - 1)),
-                        cy_isa_irq);
-                printk("%d channels starting from port %d.\n",
-                        cy_isa_nchan, cy_next_channel);
+                        cy_isa_irq, cy_isa_nchan, cy_next_channel);
+
+                for (j = cy_next_channel;
+                                j < cy_next_channel + cy_isa_nchan; j++)
+                        tty_register_device(cy_serial_driver, j, NULL);
                 cy_next_channel += cy_isa_nchan;
         }
         return nboard;
@@ -4721,510 +4737,310 @@ static int __init cy_detect_isa(void)
 #endif                          /* CONFIG_ISA */
 }                               /* cy_detect_isa */
 
-static void plx_init(void __iomem * addr, uclong initctl)
+#ifdef CONFIG_PCI
+static void __devinit plx_init(void __iomem * addr, __u32 initctl)
 {
         /* Reset PLX */
-        cy_writel(addr + initctl, cy_readl(addr + initctl) | 0x40000000);
+        cy_writel(addr + initctl, readl(addr + initctl) | 0x40000000);
         udelay(100L);
-        cy_writel(addr + initctl, cy_readl(addr + initctl) & ~0x40000000);
+        cy_writel(addr + initctl, readl(addr + initctl) & ~0x40000000);
 
         /* Reload Config. Registers from EEPROM */
-        cy_writel(addr + initctl, cy_readl(addr + initctl) | 0x20000000);
+        cy_writel(addr + initctl, readl(addr + initctl) | 0x20000000);
         udelay(100L);
-        cy_writel(addr + initctl, cy_readl(addr + initctl) & ~0x20000000);
+        cy_writel(addr + initctl, readl(addr + initctl) & ~0x20000000);
 }
 
-/*
- * ---------------------------------------------------------------------
- * cy_detect_pci() - Test PCI bus presence and Cyclom-Ye/PCI.
- * sets global variables and return the number of PCI boards found.
- * ---------------------------------------------------------------------
- */
-static int __init cy_detect_pci(void)
+static int __devinit cy_pci_probe(struct pci_dev *pdev,
+                const struct pci_device_id *ent)
 {
-#ifdef CONFIG_PCI
-
-        struct pci_dev *pdev = NULL;
-        unsigned char cyy_rev_id;
-        unsigned char cy_pci_irq = 0;
-        uclong cy_pci_phys0, cy_pci_phys2;
-        void __iomem *cy_pci_addr0, *cy_pci_addr2;
-        unsigned short i, j, cy_pci_nchan, plx_ver;
-        unsigned short device_id, dev_index = 0;
-        uclong mailbox;
-        uclong ZeIndex = 0;
-        void __iomem *Ze_addr0[NR_CARDS], *Ze_addr2[NR_CARDS];
-        uclong Ze_phys0[NR_CARDS], Ze_phys2[NR_CARDS];
-        unsigned char Ze_irq[NR_CARDS];
-        struct pci_dev *Ze_pdev[NR_CARDS];
-
-        for (i = 0; i < NR_CARDS; i++) {
-                /* look for a Cyclades card by vendor and device id */
-                while ((device_id = cy_pci_dev_id[dev_index].device) != 0) {
-                        if ((pdev = pci_get_device(PCI_VENDOR_ID_CYCLADES,
-                                                   device_id, pdev)) == NULL) {
-                                dev_index++;    /* try next device id */
-                        } else {
-                                break;  /* found a board */
-                        }
-                }
-
-                if (device_id == 0)
-                        break;
-
-                if (pci_enable_device(pdev))
-                        continue;
-
-                /* read PCI configuration area */
-                cy_pci_irq = pdev->irq;
-                cy_pci_phys0 = pci_resource_start(pdev, 0);
-                cy_pci_phys2 = pci_resource_start(pdev, 2);
-                pci_read_config_byte(pdev, PCI_REVISION_ID, &cyy_rev_id);
+        void __iomem *addr0 = NULL, *addr2 = NULL;
+        char *card_name = NULL;
+        u32 mailbox;
+        unsigned int device_id, nchan = 0, card_no, i;
+        unsigned char plx_ver;
+        int retval, irq;
+
+        retval = pci_enable_device(pdev);
+        if (retval) {
+                dev_err(&pdev->dev, "cannot enable device\n");
+                goto err;
+        }
 
-                device_id &= ~PCI_DEVICE_ID_MASK;
+        /* read PCI configuration area */
+        irq = pdev->irq;
+        device_id = pdev->device & ~PCI_DEVICE_ID_MASK;
 
-                if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
-                                device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
-#ifdef CY_PCI_DEBUG
-                        printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
-                                pdev->bus->number, pdev->devfn);
-                        printk("rev_id=%d) IRQ%d\n",
-                                cyy_rev_id, (int)cy_pci_irq);
-                        printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
-                                "ctladdr=0x%lx\n",
-                                (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
+#if defined(__alpha__)
+        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo) {   /* below 1M? */
+                dev_err(&pdev->dev, "Cyclom-Y/PCI not supported for low "
+                        "addresses on Alpha systems.\n");
+                retval = -EIO;
+                goto err_dis;
+        }
 #endif
+        if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Lo) {
+                dev_err(&pdev->dev, "Cyclades-Z/PCI not supported for low "
+                        "addresses\n");
+                retval = -EIO;
+                goto err_dis;
+        }
 
-                        if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
-                                printk("  Warning: PCI I/O bit incorrectly "
-                                        "set. Ignoring it...\n");
-                                pdev->resource[2].flags &= ~IORESOURCE_IO;
-                        }
+        if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
+                dev_warn(&pdev->dev, "PCI I/O bit incorrectly set. Ignoring "
+                                "it...\n");
+                pdev->resource[2].flags &= ~IORESOURCE_IO;
+        }
 
-                        /* Although we don't use this I/O region, we should
-                           request it from the kernel anyway, to avoid problems
-                           with other drivers accessing it. */
-                        if (pci_request_regions(pdev, "Cyclom-Y") != 0) {
-                                printk(KERN_ERR "cyclades: failed to reserve "
-                                                "PCI resources\n");
-                                continue;
-                        }
-#if defined(__alpha__)
-                        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo) {   /* below 1M? */
-                                printk("Cyclom-Y/PCI (bus=0x0%x, pci_id=0x%x, ",
-                                        pdev->bus->number, pdev->devfn);
-                                printk("rev_id=%d) IRQ%d\n",
-                                        cyy_rev_id, (int)cy_pci_irq);
-                                printk("Cyclom-Y/PCI:found  winaddr=0x%lx "
-                                        "ctladdr=0x%lx\n",
-                                        (ulong)cy_pci_phys2,
-                                        (ulong)cy_pci_phys0);
-                                printk("Cyclom-Y/PCI not supported for low "
-                                        "addresses in Alpha systems.\n");
-                                i--;
-                                continue;
-                        }
-#endif
-                        cy_pci_addr0 = ioremap(cy_pci_phys0, CyPCI_Yctl);
-                        cy_pci_addr2 = ioremap(cy_pci_phys2, CyPCI_Ywin);
+        retval = pci_request_regions(pdev, "cyclades");
+        if (retval) {
+                dev_err(&pdev->dev, "failed to reserve resources\n");
+                goto err_dis;
+        }
 
-#ifdef CY_PCI_DEBUG
-                        printk("Cyclom-Y/PCI: relocate winaddr=0x%lx "
-                                "ctladdr=0x%lx\n",
-                                (u_long)cy_pci_addr2, (u_long)cy_pci_addr0);
-#endif
-                        cy_pci_nchan = (unsigned short)(CyPORTS_PER_CHIP *
-                                        cyy_init_card(cy_pci_addr2, 1));
-                        if (cy_pci_nchan == 0) {
-                                printk("Cyclom-Y PCI host card with ");
-                                printk("no Serial-Modules at 0x%lx.\n",
-                                        (ulong) cy_pci_phys2);
-                                i--;
-                                continue;
-                        }
-                        if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
-                                printk("Cyclom-Y/PCI found at 0x%lx ",
-                                        (ulong) cy_pci_phys2);
-                                printk("but no channels are available.\n");
-                                printk("Change NR_PORTS in cyclades.c and "
-                                                "recompile kernel.\n");
-                                return i;
-                        }
-                        /* fill the next cy_card structure available */
-                        for (j = 0; j < NR_CARDS; j++) {
-                                if (cy_card[j].base_addr == 0)
-                                        break;
-                        }
-                        if (j == NR_CARDS) {    /* no more cy_cards available */
-                                printk("Cyclom-Y/PCI found at 0x%lx ",
-                                        (ulong) cy_pci_phys2);
-                                printk("but no more cards can be used.\n");
-                                printk("Change NR_CARDS in cyclades.c and "
-                                                "recompile kernel.\n");
-                                return i;
-                        }
+        retval = -EIO;
+        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
+                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
+                card_name = "Cyclom-Y";
 
-                        /* allocate IRQ */
-                        if (request_irq(cy_pci_irq, cyy_interrupt,
-                                        IRQF_SHARED, "Cyclom-Y", &cy_card[j])) {
-                                printk("Cyclom-Y/PCI found at 0x%lx ",
-                                        (ulong) cy_pci_phys2);
-                                printk("but could not allocate IRQ%d.\n",
-                                        cy_pci_irq);
-                                return i;
-                        }
+                addr0 = pci_iomap(pdev, 0, CyPCI_Yctl);
+                if (addr0 == NULL) {
+                        dev_err(&pdev->dev, "can't remap ctl region\n");
+                        goto err_reg;
+                }
+                addr2 = pci_iomap(pdev, 2, CyPCI_Ywin);
+                if (addr2 == NULL) {
+                        dev_err(&pdev->dev, "can't remap base region\n");
+                        goto err_unmap;
+                }
 
-                        /* set cy_card */
-                        cy_card[j].base_phys = (ulong) cy_pci_phys2;
-                        cy_card[j].ctl_phys = (ulong) cy_pci_phys0;
-                        cy_card[j].base_addr = cy_pci_addr2;
-                        cy_card[j].ctl_addr = cy_pci_addr0;
-                        cy_card[j].irq = (int)cy_pci_irq;
-                        cy_card[j].bus_index = 1;
-                        cy_card[j].first_line = cy_next_channel;
-                        cy_card[j].num_chips = cy_pci_nchan / 4;
-                        cy_card[j].pdev = pdev;
-
-                        /* enable interrupts in the PCI interface */
-                        plx_ver = cy_readb(cy_pci_addr2 + CyPLX_VER) & 0x0f;
-                        switch (plx_ver) {
-                        case PLX_9050:
-
-                                cy_writeb(cy_pci_addr0 + 0x4c, 0x43);
-                                break;
+                nchan = CyPORTS_PER_CHIP * cyy_init_card(addr2, 1);
+                if (nchan == 0) {
+                        dev_err(&pdev->dev, "Cyclom-Y PCI host card with no "
+                                        "Serial-Modules\n");
+                        return -EIO;
+                }
+        } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
+                struct RUNTIME_9060 __iomem *ctl_addr;
 
-                        case PLX_9060:
-                        case PLX_9080:
-                        default:        /* Old boards, use PLX_9060 */
-
-                                plx_init(cy_pci_addr0, 0x6c);
-                        /* For some yet unknown reason, once the PLX9060 reloads
-                           the EEPROM, the IRQ is lost and, thus, we have to
-                           re-write it to the PCI config. registers.
-                           This will remain here until we find a permanent
-                           fix. */
-                                pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,
-                                                cy_pci_irq);
-
-                                cy_writew(cy_pci_addr0 + 0x68,
-                                          cy_readw(cy_pci_addr0 +
-                                                   0x68) | 0x0900);
-                                break;
-                        }
+                ctl_addr = addr0 = pci_iomap(pdev, 0, CyPCI_Zctl);
+                if (addr0 == NULL) {
+                        dev_err(&pdev->dev, "can't remap ctl region\n");
+                        goto err_reg;
+                }
 
-                        /* print message */
-                        printk("Cyclom-Y/PCI #%d: 0x%lx-0x%lx, IRQ%d, ",
-                                j + 1, (ulong)cy_pci_phys2,
-                                (ulong) (cy_pci_phys2 + CyPCI_Ywin - 1),
-                                (int)cy_pci_irq);
-                        printk("%d channels starting from port %d.\n",
-                                cy_pci_nchan, cy_next_channel);
-
-                        cy_next_channel += cy_pci_nchan;
-                } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Lo) {
-                        /* print message */
-                        printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
-                                pdev->bus->number, pdev->devfn);
-                        printk("rev_id=%d) IRQ%d\n",
-                                cyy_rev_id, (int)cy_pci_irq);
-                        printk("Cyclades-Z/PCI: found winaddr=0x%lx "
-                                "ctladdr=0x%lx\n",
-                                (ulong)cy_pci_phys2, (ulong)cy_pci_phys0);
-                        printk("Cyclades-Z/PCI not supported for low "
-                                "addresses\n");
-                        break;
-                } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
-#ifdef CY_PCI_DEBUG
-                        printk("Cyclades-Z/PCI (bus=0x0%x, pci_id=0x%x, ",
-                                pdev->bus->number, pdev->devfn);
-                        printk("rev_id=%d) IRQ%d\n",
-                                cyy_rev_id, (int)cy_pci_irq);
-                        printk("Cyclades-Z/PCI: found winaddr=0x%lx "
-                                "ctladdr=0x%lx\n",
-                                (ulong) cy_pci_phys2, (ulong) cy_pci_phys0);
-#endif
-                        cy_pci_addr0 = ioremap(cy_pci_phys0, CyPCI_Zctl);
-
-                        /* Disable interrupts on the PLX before resetting it */
-                        cy_writew(cy_pci_addr0 + 0x68,
-                                cy_readw(cy_pci_addr0 + 0x68) & ~0x0900);
-
-                        plx_init(cy_pci_addr0, 0x6c);
-                        /* For some yet unknown reason, once the PLX9060 reloads
-                           the EEPROM, the IRQ is lost and, thus, we have to
-                           re-write it to the PCI config. registers.
-                           This will remain here until we find a permanent
-                           fix. */
-                        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,
-                                                cy_pci_irq);
-
-                        mailbox =
-                            (uclong)cy_readl(&((struct RUNTIME_9060 __iomem *)
-                                                cy_pci_addr0)->mail_box_0);
-
-                        if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
-                                printk("  Warning: PCI I/O bit incorrectly "
-                                        "set. Ignoring it...\n");
-                                pdev->resource[2].flags &= ~IORESOURCE_IO;
-                        }
+                /* Disable interrupts on the PLX before resetting it */
+                cy_writew(addr0 + 0x68,
+                        readw(addr0 + 0x68) & ~0x0900);
+
+                plx_init(addr0, 0x6c);
+                /* For some yet unknown reason, once the PLX9060 reloads
+                   the EEPROM, the IRQ is lost and, thus, we have to
+                   re-write it to the PCI config. registers.
+                   This will remain here until we find a permanent
+                   fix. */
+                pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, irq);
+
+                mailbox = (u32)readl(&ctl_addr->mail_box_0);
+
+                addr2 = pci_iomap(pdev, 2, mailbox == ZE_V1 ?
+                                CyPCI_Ze_win : CyPCI_Zwin);
+                if (addr2 == NULL) {
+                        dev_err(&pdev->dev, "can't remap base region\n");
+                        goto err_unmap;
+                }
 
-                        /* Although we don't use this I/O region, we should
-                           request it from the kernel anyway, to avoid problems
-                           with other drivers accessing it. */
-                        if (pci_request_regions(pdev, "Cyclades-Z") != 0) {
-                                printk(KERN_ERR "cyclades: failed to reserve "
-                                        "PCI resources\n");
-                                continue;
-                        }
+                if (mailbox == ZE_V1) {
+                        card_name = "Cyclades-Ze";
 
-                        if (mailbox == ZE_V1) {
-                                cy_pci_addr2 = ioremap(cy_pci_phys2,
-                                                CyPCI_Ze_win);
-                                if (ZeIndex == NR_CARDS) {
-                                        printk("Cyclades-Ze/PCI found at "
-                                                "0x%lx but no more cards can "
-                                                "be used.\nChange NR_CARDS in "
-                                                "cyclades.c and recompile "
-                                                "kernel.\n",
-                                                (ulong)cy_pci_phys2);
-                                } else {
-                                        Ze_phys0[ZeIndex] = cy_pci_phys0;
-                                        Ze_phys2[ZeIndex] = cy_pci_phys2;
-                                        Ze_addr0[ZeIndex] = cy_pci_addr0;
-                                        Ze_addr2[ZeIndex] = cy_pci_addr2;
-                                        Ze_irq[ZeIndex] = cy_pci_irq;
-                                        Ze_pdev[ZeIndex] = pdev;
-                                        ZeIndex++;
-                                }
-                                i--;
-                                continue;
-                        } else {
-                                cy_pci_addr2 = ioremap(cy_pci_phys2,CyPCI_Zwin);
-                        }
+                        readl(&ctl_addr->mail_box_0);
+                        nchan = ZE_V1_NPORTS;
+                } else {
+                        card_name = "Cyclades-8Zo";
 
 #ifdef CY_PCI_DEBUG
-                        printk("Cyclades-Z/PCI: relocate winaddr=0x%lx "
-                                "ctladdr=0x%lx\n",
-                                (ulong) cy_pci_addr2, (ulong) cy_pci_addr0);
                         if (mailbox == ZO_V1) {
-                                cy_writel(&((struct RUNTIME_9060 *)
-                                        (cy_pci_addr0))->loc_addr_base,
-                                        WIN_CREG);
-                                PAUSE;
-                                printk("Cyclades-8Zo/PCI: FPGA id %lx, ver "
-                                        "%lx\n", (ulong) (0xff &
-                                        cy_readl(&((struct CUSTOM_REG *)
-                                                (cy_pci_addr2))->fpga_id)),
-                                        (ulong)(0xff &
-                                        cy_readl(&((struct CUSTOM_REG *)
-                                                (cy_pci_addr2))->
-                                                        fpga_version)));
-                                cy_writel(&((struct RUNTIME_9060 *)
-                                        (cy_pci_addr0))->loc_addr_base,
-                                        WIN_RAM);
+                                cy_writel(&ctl_addr->loc_addr_base, WIN_CREG);
+                                dev_info(&pdev->dev, "Cyclades-8Zo/PCI: FPGA "
+                                        "id %lx, ver %lx\n", (ulong)(0xff &
+                                        readl(&((struct CUSTOM_REG *)addr2)->
+                                                fpga_id)), (ulong)(0xff &
+                                        readl(&((struct CUSTOM_REG *)addr2)->
+                                                fpga_version)));
+                                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
                         } else {
-                                printk("Cyclades-Z/PCI: New Cyclades-Z board.  "
-                                                "FPGA not loaded\n");
+                                dev_info(&pdev->dev, "Cyclades-Z/PCI: New "
+                                        "Cyclades-Z board.  FPGA not loaded\n");
                         }
 #endif
                         /* The following clears the firmware id word.  This
                            ensures that the driver will not attempt to talk to
                            the board until it has been properly initialized.
                          */
-                        PAUSE;
                         if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
-                                cy_writel(cy_pci_addr2 + ID_ADDRESS, 0L);
+                                cy_writel(addr2 + ID_ADDRESS, 0L);
 
                         /* This must be a Cyclades-8Zo/PCI.  The extendable
                            version will have a different device_id and will
                            be allocated its maximum number of ports. */
-                        cy_pci_nchan = 8;
-
-                        if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
-                                printk("Cyclades-8Zo/PCI found at 0x%lx but"
-                                        "no channels are available.\nChange "
-                                        "NR_PORTS in cyclades.c and recompile "
-                                        "kernel.\n", (ulong)cy_pci_phys2);
-                                return i;
-                        }
-
-                        /* fill the next cy_card structure available */
-                        for (j = 0; j < NR_CARDS; j++) {
-                                if (cy_card[j].base_addr == 0)
-                                        break;
-                        }
-                        if (j == NR_CARDS) {    /* no more cy_cards available */
-                                printk("Cyclades-8Zo/PCI found at 0x%lx but"
-                                        "no more cards can be used.\nChange "
-                                        "NR_CARDS in cyclades.c and recompile "
-                                        "kernel.\n", (ulong)cy_pci_phys2);
-                                return i;
-                        }
-#ifdef CONFIG_CYZ_INTR
-                        /* allocate IRQ only if board has an IRQ */
-                        if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) {
-                                if (request_irq(cy_pci_irq, cyz_interrupt,
-                                                IRQF_SHARED, "Cyclades-Z",
-                                                &cy_card[j])) {
-                                        printk("Cyclom-8Zo/PCI found at 0x%lx "
-                                                "but could not allocate "
-                                                "IRQ%d.\n", (ulong)cy_pci_phys2,
-                                                cy_pci_irq);
-                                        return i;
-                                }
-                        }
-#endif                          /* CONFIG_CYZ_INTR */
-
-                        /* set cy_card */
-                        cy_card[j].base_phys = cy_pci_phys2;
-                        cy_card[j].ctl_phys = cy_pci_phys0;
-                        cy_card[j].base_addr = cy_pci_addr2;
-                        cy_card[j].ctl_addr = cy_pci_addr0;
-                        cy_card[j].irq = (int)cy_pci_irq;
-                        cy_card[j].bus_index = 1;
-                        cy_card[j].first_line = cy_next_channel;
-                        cy_card[j].num_chips = -1;
-                        cy_card[j].pdev = pdev;
-
-                        /* print message */
-#ifdef CONFIG_CYZ_INTR
-                        /* don't report IRQ if board is no IRQ */
-                        if ((cy_pci_irq != 0) && (cy_pci_irq != 255))
-                                printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, "
-                                        "IRQ%d, ", j + 1, (ulong)cy_pci_phys2,
-                                        (ulong) (cy_pci_phys2 + CyPCI_Zwin - 1),
-                                        (int)cy_pci_irq);
-                        else
-#endif                          /* CONFIG_CYZ_INTR */
-                                printk("Cyclades-8Zo/PCI #%d: 0x%lx-0x%lx, ",
-                                        j + 1, (ulong)cy_pci_phys2,
-                                        (ulong)(cy_pci_phys2 + CyPCI_Zwin - 1));
-
-                        printk("%d channels starting from port %d.\n",
-                                        cy_pci_nchan, cy_next_channel);
-                        cy_next_channel += cy_pci_nchan;
+                        nchan = 8;
                 }
         }
 
-        for (; ZeIndex != 0 && i < NR_CARDS; i++) {
-                cy_pci_phys0 = Ze_phys0[0];
-                cy_pci_phys2 = Ze_phys2[0];
-                cy_pci_addr0 = Ze_addr0[0];
-                cy_pci_addr2 = Ze_addr2[0];
-                cy_pci_irq = Ze_irq[0];
-                pdev = Ze_pdev[0];
-                for (j = 0; j < ZeIndex - 1; j++) {
-                        Ze_phys0[j] = Ze_phys0[j + 1];
-                        Ze_phys2[j] = Ze_phys2[j + 1];
-                        Ze_addr0[j] = Ze_addr0[j + 1];
-                        Ze_addr2[j] = Ze_addr2[j + 1];
-                        Ze_irq[j] = Ze_irq[j + 1];
-                        Ze_pdev[j] = Ze_pdev[j + 1];
-                }
-                ZeIndex--;
-                mailbox = (uclong)cy_readl(&((struct RUNTIME_9060 __iomem *)
-                                                cy_pci_addr0)->mail_box_0);
-#ifdef CY_PCI_DEBUG
-                printk("Cyclades-Z/PCI: relocate winaddr=0x%lx ctladdr=0x%lx\n",
-                        (ulong)cy_pci_addr2, (ulong)cy_pci_addr0);
-                printk("Cyclades-Z/PCI: New Cyclades-Z board.  FPGA not "
-                                "loaded\n");
-#endif
-                PAUSE;
-                /* This must be the new Cyclades-Ze/PCI. */
-                cy_pci_nchan = ZE_V1_NPORTS;
-
-                if ((cy_next_channel + cy_pci_nchan) > NR_PORTS) {
-                        printk("Cyclades-Ze/PCI found at 0x%lx but no channels "
-                                "are available.\nChange NR_PORTS in cyclades.c "
-                                "and recompile kernel.\n",
-                                (ulong) cy_pci_phys2);
-                        return i;
-                }
+        if ((cy_next_channel + nchan) > NR_PORTS) {
+                dev_err(&pdev->dev, "Cyclades-8Zo/PCI found, but no "
+                        "channels are available. Change NR_PORTS in "
+                        "cyclades.c and recompile kernel.\n");
+                goto err_unmap;
+        }
+        /* fill the next cy_card structure available */
+        for (card_no = 0; card_no < NR_CARDS; card_no++) {
+                if (cy_card[card_no].base_addr == NULL)
+                        break;
+        }
+        if (card_no == NR_CARDS) {      /* no more cy_cards available */
+                dev_err(&pdev->dev, "Cyclades-8Zo/PCI found, but no "
+                        "more cards can be used. Change NR_CARDS in "
+                        "cyclades.c and recompile kernel.\n");
+                goto err_unmap;
+        }
 
-                /* fill the next cy_card structure available */
-                for (j = 0; j < NR_CARDS; j++) {
-                        if (cy_card[j].base_addr == 0)
-                                break;
-                }
-                if (j == NR_CARDS) {    /* no more cy_cards available */
-                        printk("Cyclades-Ze/PCI found at 0x%lx but no more "
-                                "cards can be used.\nChange NR_CARDS in "
-                                "cyclades.c and recompile kernel.\n",
-                                (ulong) cy_pci_phys2);
-                        return i;
+        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
+                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
+                /* allocate IRQ */
+                retval = request_irq(irq, cyy_interrupt,
+                                IRQF_SHARED, "Cyclom-Y", &cy_card[card_no]);
+                if (retval) {
+                        dev_err(&pdev->dev, "could not allocate IRQ\n");
+                        goto err_unmap;
                 }
+                cy_card[card_no].num_chips = nchan / 4;
+        } else {
 #ifdef CONFIG_CYZ_INTR
                 /* allocate IRQ only if board has an IRQ */
-                if ((cy_pci_irq != 0) && (cy_pci_irq != 255)) {
-                        if (request_irq(cy_pci_irq, cyz_interrupt,
+                if (irq != 0 && irq != 255) {
+                        retval = request_irq(irq, cyz_interrupt,
                                         IRQF_SHARED, "Cyclades-Z",
-                                        &cy_card[j])) {
-                                printk("Cyclom-Ze/PCI found at 0x%lx ",
-                                        (ulong) cy_pci_phys2);
-                                printk("but could not allocate IRQ%d.\n",
-                                        cy_pci_irq);
-                                return i;
+                                        &cy_card[card_no]);
+                        if (retval) {
+                                dev_err(&pdev->dev, "could not allocate IRQ\n");
+                                goto err_unmap;
                         }
                 }
 #endif                          /* CONFIG_CYZ_INTR */
+                cy_card[card_no].num_chips = -1;
+        }
 
-                /* set cy_card */
-                cy_card[j].base_phys = cy_pci_phys2;
-                cy_card[j].ctl_phys = cy_pci_phys0;
-                cy_card[j].base_addr = cy_pci_addr2;
-                cy_card[j].ctl_addr = cy_pci_addr0;
-                cy_card[j].irq = (int)cy_pci_irq;
-                cy_card[j].bus_index = 1;
-                cy_card[j].first_line = cy_next_channel;
-                cy_card[j].num_chips = -1;
-                cy_card[j].pdev = pdev;
+        /* set cy_card */
+        cy_card[card_no].base_addr = addr2;
+        cy_card[card_no].ctl_addr = addr0;
+        cy_card[card_no].irq = irq;
+        cy_card[card_no].bus_index = 1;
+        cy_card[card_no].first_line = cy_next_channel;
+        retval = cy_init_card(&cy_card[card_no]);
+        if (retval)
+                goto err_null;
 
-                /* print message */
-#ifdef CONFIG_CYZ_INTR
-                /* don't report IRQ if board is no IRQ */
-                if ((cy_pci_irq != 0) && (cy_pci_irq != 255))
-                        printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, IRQ%d, ",
-                                j + 1, (ulong) cy_pci_phys2,
-                                (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1),
-                                (int)cy_pci_irq);
-                else
-#endif                          /* CONFIG_CYZ_INTR */
-                        printk("Cyclades-Ze/PCI #%d: 0x%lx-0x%lx, ",
-                                j + 1, (ulong) cy_pci_phys2,
-                                (ulong) (cy_pci_phys2 + CyPCI_Ze_win - 1));
+        pci_set_drvdata(pdev, &cy_card[card_no]);
 
-                printk("%d channels starting from port %d.\n",
-                        cy_pci_nchan, cy_next_channel);
-                cy_next_channel += cy_pci_nchan;
-        }
-        if (ZeIndex != 0) {
-                printk("Cyclades-Ze/PCI found at 0x%x but no more cards can be "
-                        "used.\nChange NR_CARDS in cyclades.c and recompile "
-                        "kernel.\n", (unsigned int)Ze_phys2[0]);
+        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
+                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
+                /* enable interrupts in the PCI interface */
+                plx_ver = readb(addr2 + CyPLX_VER) & 0x0f;
+                switch (plx_ver) {
+                case PLX_9050:
+
+                        cy_writeb(addr0 + 0x4c, 0x43);
+                        break;
+
+                case PLX_9060:
+                case PLX_9080:
+                default:        /* Old boards, use PLX_9060 */
+
+                        plx_init(addr0, 0x6c);
+                /* For some yet unknown reason, once the PLX9060 reloads
+                   the EEPROM, the IRQ is lost and, thus, we have to
+                   re-write it to the PCI config. registers.
+                   This will remain here until we find a permanent
+                   fix. */
+                        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, irq);
+
+                        cy_writew(addr0 + 0x68, readw(addr0 + 0x68) | 0x0900);
+                        break;
+                }
         }
-        return i;
-#else
+
+        dev_info(&pdev->dev, "%s/PCI #%d found: %d channels starting from "
+                "port %d.\n", card_name, card_no + 1, nchan, cy_next_channel);
+        for (i = cy_next_channel; i < cy_next_channel + nchan; i++)
+                tty_register_device(cy_serial_driver, i, &pdev->dev);
+        cy_next_channel += nchan;
+
         return 0;
-#endif                          /* ifdef CONFIG_PCI */
-}                               /* cy_detect_pci */
+err_null:
+        cy_card[card_no].base_addr = NULL;
+        free_irq(irq, &cy_card[card_no]);
+err_unmap:
+        pci_iounmap(pdev, addr0);
+        if (addr2)
+                pci_iounmap(pdev, addr2);
+err_reg:
+        pci_release_regions(pdev);
+err_dis:
+        pci_disable_device(pdev);
+err:
+        return retval;
+}
 
-/*
- * This routine prints out the appropriate serial driver version number
- * and identifies which options were configured into this driver.
- */
-static inline void show_version(void)
+static void __devexit cy_pci_remove(struct pci_dev *pdev)
 {
-        printk("Cyclades driver " CY_VERSION "\n");
-        printk("        built %s %s\n", __DATE__, __TIME__);
-}                               /* show_version */
+        struct cyclades_card *cinfo = pci_get_drvdata(pdev);
+        unsigned int i;
+
+        /* non-Z with old PLX */
+        if (!IS_CYC_Z(*cinfo) && (readb(cinfo->base_addr + CyPLX_VER) & 0x0f) ==
+                        PLX_9050)
+                cy_writeb(cinfo->ctl_addr + 0x4c, 0);
+        else
+#ifndef CONFIG_CYZ_INTR
+                if (!IS_CYC_Z(*cinfo))
+#endif
+                cy_writew(cinfo->ctl_addr + 0x68,
+                                readw(cinfo->ctl_addr + 0x68) & ~0x0900);
+
+        pci_iounmap(pdev, cinfo->base_addr);
+        if (cinfo->ctl_addr)
+                pci_iounmap(pdev, cinfo->ctl_addr);
+        if (cinfo->irq
+#ifndef CONFIG_CYZ_INTR
+                && !IS_CYC_Z(*cinfo)
+#endif /* CONFIG_CYZ_INTR */
+                )
+                free_irq(cinfo->irq, cinfo);
+        pci_release_regions(pdev);
+
+        cinfo->base_addr = NULL;
+        for (i = cinfo->first_line; i < cinfo->first_line +
+                        cinfo->nports; i++)
+                tty_unregister_device(cy_serial_driver, i);
+        cinfo->nports = 0;
+        kfree(cinfo->ports);
+}
+
+static struct pci_driver cy_pci_driver = {
+        .name = "cyclades",
+        .id_table = cy_pci_dev_id,
+        .probe = cy_pci_probe,
+        .remove = __devexit_p(cy_pci_remove)
+};
+#endif
 
 static int
 cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,
                 int *eof, void *data)
 {
         struct cyclades_port *info;
-        int i;
+        unsigned int i, j;
         int len = 0;
         off_t begin = 0;
         off_t pos = 0;
@@ -5238,33 +5054,34 @@ cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,
         len += size;
 
         /* Output one line for each known port */
-        for (i = 0; i < NR_PORTS && cy_port[i].line >= 0; i++) {
-                info = &cy_port[i];
-
-                if (info->count)
-                        size = sprintf(buf + len, "%3d %8lu %10lu %8lu %10lu "
-                                "%8lu %9lu %6ld\n", info->line,
-                                (cur_jifs - info->idle_stats.in_use) / HZ,
-                                info->idle_stats.xmit_bytes,
-                                (cur_jifs - info->idle_stats.xmit_idle) / HZ,
-                                info->idle_stats.recv_bytes,
-                                (cur_jifs - info->idle_stats.recv_idle) / HZ,
-                                info->idle_stats.overruns,
-                                (long)info->tty->ldisc.num);
-                else
-                        size = sprintf(buf + len, "%3d %8lu %10lu %8lu %10lu "
-                                "%8lu %9lu %6ld\n",
-                                info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
-                len += size;
-                pos = begin + len;
-
-                if (pos < offset) {
-                        len = 0;
-                        begin = pos;
+        for (i = 0; i < NR_CARDS; i++)
+                for (j = 0; j < cy_card[i].nports; j++) {
+                        info = &cy_card[i].ports[j];
+
+                        if (info->count)
+                                size = sprintf(buf + len, "%3d %8lu %10lu %8lu "
+                                        "%10lu %8lu %9lu %6ld\n", info->line,
+                                        (cur_jifs - info->idle_stats.in_use) /
+                                        HZ, info->idle_stats.xmit_bytes,
+                                        (cur_jifs - info->idle_stats.xmit_idle)/
+                                        HZ, info->idle_stats.recv_bytes,
+                                        (cur_jifs - info->idle_stats.recv_idle)/
+                                        HZ, info->idle_stats.overruns,
+                                        (long)info->tty->ldisc.num);
+                        else
+                                size = sprintf(buf + len, "%3d %8lu %10lu %8lu "
+                                        "%10lu %8lu %9lu %6ld\n",
+                                        info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
+                        len += size;
+                        pos = begin + len;
+
+                        if (pos < offset) {
+                                len = 0;
+                                begin = pos;
+                        }
+                        if (pos > offset + length)
+                                goto done;
                 }
-                if (pos > offset + length)
-                        goto done;
-        }
         *eof = 1;
 done:
         *start = buf + (offset - begin);        /* Start of wanted data */
@@ -5319,18 +5136,15 @@ static const struct tty_operations cy_ops = {
 
 static int __init cy_init(void)
 {
-        struct cyclades_port *info;
-        struct cyclades_card *cinfo;
-        int number_z_boards = 0;
-        int board, port, i, index;
-        unsigned long mailbox;
-        unsigned short chip_number;
-        int nports;
+        unsigned int nboards;
+        int retval = -ENOMEM;
 
         cy_serial_driver = alloc_tty_driver(NR_PORTS);
         if (!cy_serial_driver)
-                return -ENOMEM;
-        show_version();
+                goto err;
+
+        printk(KERN_INFO "Cyclades driver " CY_VERSION " (built %s %s)\n",
+                        __DATE__, __TIME__);
 
         /* Initialize the tty_driver structure */
 
@@ -5344,15 +5158,13 @@ static int __init cy_init(void)
         cy_serial_driver->init_termios = tty_std_termios;
         cy_serial_driver->init_termios.c_cflag =
             B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        cy_serial_driver->flags = TTY_DRIVER_REAL_RAW;
+        cy_serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         tty_set_operations(cy_serial_driver, &cy_ops);
 
-        if (tty_register_driver(cy_serial_driver))
-                panic("Couldn't register Cyclades serial driver\n");
-
-        for (i = 0; i < NR_CARDS; i++) {
-                /* base_addr=0 indicates board not found */
-                cy_card[i].base_addr = NULL;
+        retval = tty_register_driver(cy_serial_driver);
+        if (retval) {
+                printk(KERN_ERR "Couldn't register Cyclades serial driver\n");
+                goto err_frtty;
         }
 
         /* the code below is responsible to find the boards. Each different
@@ -5363,223 +5175,68 @@ static int __init cy_init(void)
            the cy_next_channel. */
 
         /* look for isa boards */
-        cy_isa_nboard = cy_detect_isa();
+        nboards = cy_detect_isa();
 
+#ifdef CONFIG_PCI
         /* look for pci boards */
-        cy_pci_nboard = cy_detect_pci();
-
-        cy_nboard = cy_isa_nboard + cy_pci_nboard;
-
-        /* invalidate remaining cy_card structures */
-        for (i = 0; i < NR_CARDS; i++) {
-                if (cy_card[i].base_addr == 0) {
-                        cy_card[i].first_line = -1;
-                        cy_card[i].ctl_addr = NULL;
-                        cy_card[i].irq = 0;
-                        cy_card[i].bus_index = 0;
-                        cy_card[i].first_line = 0;
-                        cy_card[i].num_chips = 0;
-                }
-        }
-        /* invalidate remaining cy_port structures */
-        for (i = cy_next_channel; i < NR_PORTS; i++) {
-                cy_port[i].line = -1;
-                cy_port[i].magic = -1;
-        }
-
-        /* initialize per-port data structures for each valid board found */
-        for (board = 0; board < cy_nboard; board++) {
-                cinfo = &cy_card[board];
-                if (cinfo->num_chips == -1) {   /* Cyclades-Z */
-                        number_z_boards++;
-                        mailbox = cy_readl(&((struct RUNTIME_9060 __iomem *)
-                                             cy_card[board].ctl_addr)->
-                                           mail_box_0);
-                        nports = (mailbox == ZE_V1) ? ZE_V1_NPORTS : 8;
-                        cinfo->intr_enabled = 0;
-                        cinfo->nports = 0;      /* Will be correctly set later, after 
-                                                   Z FW is loaded */
-                        spin_lock_init(&cinfo->card_lock);
-                        for (port = cinfo->first_line;
-                             port < cinfo->first_line + nports; port++) {
-                                info = &cy_port[port];
-                                info->magic = CYCLADES_MAGIC;
-                                info->type = PORT_STARTECH;
-                                info->card = board;
-                                info->line = port;
-                                info->chip_rev = 0;
-                                info->flags = STD_COM_FLAGS;
-                                info->tty = NULL;
-                                if (mailbox == ZO_V1)
-                                        info->xmit_fifo_size = CYZ_FIFO_SIZE;
-                                else
-                                        info->xmit_fifo_size =
-                                            4 * CYZ_FIFO_SIZE;
-                                info->cor1 = 0;
-                                info->cor2 = 0;
-                                info->cor3 = 0;
-                                info->cor4 = 0;
-                                info->cor5 = 0;
-                                info->tbpr = 0;
-                                info->tco = 0;
-                                info->rbpr = 0;
-                                info->rco = 0;
-                                info->custom_divisor = 0;
-                                info->close_delay = 5 * HZ / 10;
-                                info->closing_wait = CLOSING_WAIT_DELAY;
-                                info->icount.cts = info->icount.dsr =
-                                    info->icount.rng = info->icount.dcd = 0;
-                                info->icount.rx = info->icount.tx = 0;
-                                info->icount.frame = info->icount.parity = 0;
-                                info->icount.overrun = info->icount.brk = 0;
-                                info->x_char = 0;
-                                info->event = 0;
-                                info->count = 0;
-                                info->blocked_open = 0;
-                                info->default_threshold = 0;
-                                info->default_timeout = 0;
-                                INIT_WORK(&info->tqueue, do_softint);
-                                init_waitqueue_head(&info->open_wait);
-                                init_waitqueue_head(&info->close_wait);
-                                init_waitqueue_head(&info->shutdown_wait);
-                                init_waitqueue_head(&info->delta_msr_wait);
-                                /* info->session */
-                                /* info->pgrp */
-                                info->read_status_mask = 0;
-                                /* info->timeout */
-                                /* Bentson's vars */
-                                info->jiffies[0] = 0;
-                                info->jiffies[1] = 0;
-                                info->jiffies[2] = 0;
-                                info->rflush_count = 0;
-#ifdef CONFIG_CYZ_INTR
-                                init_timer(&cyz_rx_full_timer[port]);
-                                cyz_rx_full_timer[port].function = NULL;
+        retval = pci_register_driver(&cy_pci_driver);
+        if (retval && !nboards)
+                goto err_unr;
 #endif
-                        }
-                        continue;
-                } else {        /* Cyclom-Y of some kind */
-                        index = cinfo->bus_index;
-                        spin_lock_init(&cinfo->card_lock);
-                        cinfo->nports = CyPORTS_PER_CHIP * cinfo->num_chips;
-                        for (port = cinfo->first_line;
-                             port < cinfo->first_line + cinfo->nports; port++) {
-                                info = &cy_port[port];
-                                info->magic = CYCLADES_MAGIC;
-                                info->type = PORT_CIRRUS;
-                                info->card = board;
-                                info->line = port;
-                                info->flags = STD_COM_FLAGS;
-                                info->tty = NULL;
-                                info->xmit_fifo_size = CyMAX_CHAR_FIFO;
-                                info->cor1 =
-                                    CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
-                                info->cor2 = CyETC;
-                                info->cor3 = 0x08;      /* _very_ small rcv threshold */
-                                info->cor4 = 0;
-                                info->cor5 = 0;
-                                info->custom_divisor = 0;
-                                info->close_delay = 5 * HZ / 10;
-                                info->closing_wait = CLOSING_WAIT_DELAY;
-                                info->icount.cts = info->icount.dsr =
-                                    info->icount.rng = info->icount.dcd = 0;
-                                info->icount.rx = info->icount.tx = 0;
-                                info->icount.frame = info->icount.parity = 0;
-                                info->icount.overrun = info->icount.brk = 0;
-                                chip_number = (port - cinfo->first_line) / 4;
-                                if ((info->chip_rev =
-                                     cy_readb(cinfo->base_addr +
-                                              (cy_chip_offset[chip_number] <<
-                                               index) + (CyGFRCR << index))) >=
-                                    CD1400_REV_J) {
-                                        /* It is a CD1400 rev. J or later */
-                                        info->tbpr = baud_bpr_60[13];   /* Tx BPR */
-                                        info->tco = baud_co_60[13];     /* Tx CO */
-                                        info->rbpr = baud_bpr_60[13];   /* Rx BPR */
-                                        info->rco = baud_co_60[13];     /* Rx CO */
-                                        info->rflow = 0;
-                                        info->rtsdtr_inv = 1;
-                                } else {
-                                        info->tbpr = baud_bpr_25[13];   /* Tx BPR */
-                                        info->tco = baud_co_25[13];     /* Tx CO */
-                                        info->rbpr = baud_bpr_25[13];   /* Rx BPR */
-                                        info->rco = baud_co_25[13];     /* Rx CO */
-                                        info->rflow = 0;
-                                        info->rtsdtr_inv = 0;
-                                }
-                                info->x_char = 0;
-                                info->event = 0;
-                                info->count = 0;
-                                info->blocked_open = 0;
-                                info->default_threshold = 0;
-                                info->default_timeout = 0;
-                                INIT_WORK(&info->tqueue, do_softint);
-                                init_waitqueue_head(&info->open_wait);
-                                init_waitqueue_head(&info->close_wait);
-                                init_waitqueue_head(&info->shutdown_wait);
-                                init_waitqueue_head(&info->delta_msr_wait);
-                                /* info->session */
-                                /* info->pgrp */
-                                info->read_status_mask =
-                                    CyTIMEOUT | CySPECHAR | CyBREAK
-                                    | CyPARITY | CyFRAME | CyOVERRUN;
-                                /* info->timeout */
-                        }
-                }
-        }
-
-#ifndef CONFIG_CYZ_INTR
-        if (number_z_boards && !cyz_timeron) {
-                cyz_timeron++;
-                cyz_timerlist.expires = jiffies + 1;
-                add_timer(&cyz_timerlist);
-#ifdef CY_PCI_DEBUG
-                printk("Cyclades-Z polling initialized\n");
-#endif
-        }
-#endif                          /* CONFIG_CYZ_INTR */
 
         return 0;
-
+err_unr:
+        tty_unregister_driver(cy_serial_driver);
+err_frtty:
+        put_tty_driver(cy_serial_driver);
+err:
+        return retval;
 }                               /* cy_init */
 
 static void __exit cy_cleanup_module(void)
 {
+        struct cyclades_card *card;
         int i, e1;
 
 #ifndef CONFIG_CYZ_INTR
-        if (cyz_timeron){
-                cyz_timeron = 0;
-                del_timer(&cyz_timerlist);
-        }
+        del_timer_sync(&cyz_timerlist);
 #endif /* CONFIG_CYZ_INTR */
 
         if ((e1 = tty_unregister_driver(cy_serial_driver)))
-                printk("cyc: failed to unregister Cyclades serial driver(%d)\n",
-                        e1);
+                printk(KERN_ERR "failed to unregister Cyclades serial "
+                                "driver(%d)\n", e1);
 
-        put_tty_driver(cy_serial_driver);
+#ifdef CONFIG_PCI
+        pci_unregister_driver(&cy_pci_driver);
+#endif
 
         for (i = 0; i < NR_CARDS; i++) {
-                if (cy_card[i].base_addr) {
-                        iounmap(cy_card[i].base_addr);
-                        if (cy_card[i].ctl_addr)
-                                iounmap(cy_card[i].ctl_addr);
-                        if (cy_card[i].irq
+                card = &cy_card[i];
+                if (card->base_addr) {
+                        /* clear interrupt */
+                        cy_writeb(card->base_addr + Cy_ClrIntr, 0);
+                        iounmap(card->base_addr);
+                        if (card->ctl_addr)
+                                iounmap(card->ctl_addr);
+                        if (card->irq
 #ifndef CONFIG_CYZ_INTR
-                                && cy_card[i].num_chips != -1 /* not a Z card */
+                                && !IS_CYC_Z(*card)
 #endif /* CONFIG_CYZ_INTR */
                                 )
-                                free_irq(cy_card[i].irq, &cy_card[i]);
-#ifdef CONFIG_PCI
-                        if (cy_card[i].pdev)
-                                pci_release_regions(cy_card[i].pdev);
-#endif
+                                free_irq(card->irq, card);
+                        for (e1 = card->first_line;
+                                        e1 < card->first_line +
+                                        card->nports; e1++)
+                                tty_unregister_device(cy_serial_driver, e1);
+                        kfree(card->ports);
                 }
         }
+
+        put_tty_driver(cy_serial_driver);
 } /* cy_cleanup_module */
 
 module_init(cy_init);
 module_exit(cy_cleanup_module);
 
 MODULE_LICENSE("GPL");
+MODULE_VERSION(CY_VERSION);
diff --git a/drivers/char/digi.h b/drivers/char/digi.h
deleted file mode 100644
index 19df0e879b1b..000000000000
--- a/drivers/char/digi.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*          Definitions for DigiBoard ditty(1) command.                 */
-
-#if !defined(TIOCMODG)
-#define TIOCMODG        (('d'<<8) | 250)                /* get modem ctrl state */
-#define TIOCMODS        (('d'<<8) | 251)                /* set modem ctrl state */
-#endif
-
-#if !defined(TIOCMSET)
-#define TIOCMSET        (('d'<<8) | 252)                /* set modem ctrl state */
-#define TIOCMGET        (('d'<<8) | 253)                /* set modem ctrl state */
-#endif
-
-#if !defined(TIOCMBIC)
-#define TIOCMBIC        (('d'<<8) | 254)                /* set modem ctrl state */
-#define TIOCMBIS        (('d'<<8) | 255)                /* set modem ctrl state */
-#endif
-
-#if !defined(TIOCSDTR)
-#define TIOCSDTR        (('e'<<8) | 0)          /* set DTR              */
-#define TIOCCDTR        (('e'<<8) | 1)          /* clear DTR            */
-#endif
-
-/************************************************************************
- * Ioctl command arguments for DIGI parameters.
- ************************************************************************/
-#define DIGI_GETA       (('e'<<8) | 94)         /* Read params          */
-
-#define DIGI_SETA       (('e'<<8) | 95)         /* Set params           */
-#define DIGI_SETAW      (('e'<<8) | 96)         /* Drain & set params   */
-#define DIGI_SETAF      (('e'<<8) | 97)         /* Drain, flush & set params */
-
-#define DIGI_GETFLOW    (('e'<<8) | 99)         /* Get startc/stopc flow */
-                                                /* control characters    */
-#define DIGI_SETFLOW    (('e'<<8) | 100)                /* Set startc/stopc flow */
-                                                /* control characters    */
-#define DIGI_GETAFLOW   (('e'<<8) | 101)                /* Get Aux. startc/stopc */
-                                                /* flow control chars    */
-#define DIGI_SETAFLOW   (('e'<<8) | 102)                /* Set Aux. startc/stopc */
-                                                /* flow control chars    */
-
-struct  digiflow_struct {
-        unsigned char   startc;                         /* flow cntl start char */
-        unsigned char   stopc;                          /* flow cntl stop char  */
-};
-
-typedef struct digiflow_struct digiflow_t;
-
-
-/************************************************************************
- * Values for digi_flags 
- ************************************************************************/
-#define DIGI_IXON       0x0001          /* Handle IXON in the FEP       */
-#define DIGI_FAST       0x0002          /* Fast baud rates              */
-#define RTSPACE         0x0004          /* RTS input flow control       */
-#define CTSPACE         0x0008          /* CTS output flow control      */
-#define DSRPACE         0x0010          /* DSR output flow control      */
-#define DCDPACE         0x0020          /* DCD output flow control      */
-#define DTRPACE         0x0040          /* DTR input flow control       */
-#define DIGI_FORCEDCD   0x0100          /* Force carrier                */
-#define DIGI_ALTPIN     0x0200          /* Alternate RJ-45 pin config   */
-#define DIGI_AIXON      0x0400          /* Aux flow control in fep      */
-
-
-/************************************************************************
- * Structure used with ioctl commands for DIGI parameters.
- ************************************************************************/
-struct digi_struct {
-        unsigned short  digi_flags;             /* Flags (see above)    */
-};
-
-typedef struct digi_struct digi_t;
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index bd7be09ea53d..5b91bc04ea4e 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -33,59 +33,44 @@
 
 #include "drmP.h"
 
-#if PAGE_SIZE == 65536
-# define ATI_PCIGART_TABLE_ORDER        0
-# define ATI_PCIGART_TABLE_PAGES        (1 << 0)
-#elif PAGE_SIZE == 16384
-# define ATI_PCIGART_TABLE_ORDER        1
-# define ATI_PCIGART_TABLE_PAGES        (1 << 1)
-#elif PAGE_SIZE == 8192
-# define ATI_PCIGART_TABLE_ORDER        2
-# define ATI_PCIGART_TABLE_PAGES        (1 << 2)
-#elif PAGE_SIZE == 4096
-# define ATI_PCIGART_TABLE_ORDER        3
-# define ATI_PCIGART_TABLE_PAGES        (1 << 3)
-#else
-# error - PAGE_SIZE not 64K, 16K, 8K or 4K
-#endif
-
-# define ATI_MAX_PCIGART_PAGES          8192    /**< 32 MB aperture, 4K pages */
 # define ATI_PCIGART_PAGE_SIZE          4096    /**< PCI GART page size */
 
-static void *drm_ati_alloc_pcigart_table(void)
+static void *drm_ati_alloc_pcigart_table(int order)
 {
         unsigned long address;
         struct page *page;
         int i;
-        DRM_DEBUG("%s\n", __FUNCTION__);
+
+        DRM_DEBUG("%s: alloc %d order\n", __FUNCTION__, order);
 
         address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
-                                   ATI_PCIGART_TABLE_ORDER);
+                                   order);
         if (address == 0UL) {
                 return NULL;
         }
 
         page = virt_to_page(address);
 
-        for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
+        for (i = 0; i < order; i++, page++)
                 SetPageReserved(page);
 
         DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);
         return (void *)address;
 }
 
-static void drm_ati_free_pcigart_table(void *address)
+static void drm_ati_free_pcigart_table(void *address, int order)
 {
         struct page *page;
         int i;
+        int num_pages = 1 << order;
         DRM_DEBUG("%s\n", __FUNCTION__);
 
         page = virt_to_page((unsigned long)address);
 
-        for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
+        for (i = 0; i < num_pages; i++, page++)
                 ClearPageReserved(page);
 
-        free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER);
+        free_pages((unsigned long)address, order);
 }
 
 int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
@@ -93,6 +78,8 @@ int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
         drm_sg_mem_t *entry = dev->sg;
         unsigned long pages;
         int i;
+        int order;
+        int num_pages, max_pages;
 
         /* we need to support large memory configurations */
         if (!entry) {
@@ -100,15 +87,19 @@ int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
                 return 0;
         }
 
+        order = drm_order((gart_info->table_size + (PAGE_SIZE-1)) / PAGE_SIZE);
+        num_pages = 1 << order;
+
         if (gart_info->bus_addr) {
                 if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
                         pci_unmap_single(dev->pdev, gart_info->bus_addr,
-                                         ATI_PCIGART_TABLE_PAGES * PAGE_SIZE,
+                                         num_pages * PAGE_SIZE,
                                          PCI_DMA_TODEVICE);
                 }
 
-                pages = (entry->pages <= ATI_MAX_PCIGART_PAGES)
-                    ? entry->pages : ATI_MAX_PCIGART_PAGES;
+                max_pages = (gart_info->table_size / sizeof(u32));
+                pages = (entry->pages <= max_pages)
+                  ? entry->pages : max_pages;
 
                 for (i = 0; i < pages; i++) {
                         if (!entry->busaddr[i])
@@ -123,13 +114,12 @@ 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);
+                drm_ati_free_pcigart_table(gart_info->addr, order);
                 gart_info->addr = NULL;
         }
 
         return 1;
 }
-
 EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
 
 int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
@@ -139,6 +129,9 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
         unsigned long pages;
         u32 *pci_gart, page_base, bus_address = 0;
         int i, j, ret = 0;
+        int order;
+        int max_pages;
+        int num_pages;
 
         if (!entry) {
                 DRM_ERROR("no scatter/gather memory!\n");
@@ -148,7 +141,10 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
         if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
                 DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
 
-                address = drm_ati_alloc_pcigart_table();
+                order = drm_order((gart_info->table_size +
+                                   (PAGE_SIZE-1)) / PAGE_SIZE);
+                num_pages = 1 << order;
+                address = drm_ati_alloc_pcigart_table(order);
                 if (!address) {
                         DRM_ERROR("cannot allocate PCI GART page!\n");
                         goto done;
@@ -160,11 +156,13 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
                 }
 
                 bus_address = pci_map_single(dev->pdev, address,
-                                             ATI_PCIGART_TABLE_PAGES *
-                                             PAGE_SIZE, PCI_DMA_TODEVICE);
+                                             num_pages * PAGE_SIZE,
+                                             PCI_DMA_TODEVICE);
                 if (bus_address == 0) {
                         DRM_ERROR("unable to map PCIGART pages!\n");
-                        drm_ati_free_pcigart_table(address);
+                        order = drm_order((gart_info->table_size +
+                                           (PAGE_SIZE-1)) / PAGE_SIZE);
+                        drm_ati_free_pcigart_table(address, order);
                         address = NULL;
                         goto done;
                 }
@@ -177,10 +175,11 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
 
         pci_gart = (u32 *) address;
 
-        pages = (entry->pages <= ATI_MAX_PCIGART_PAGES)
-            ? entry->pages : ATI_MAX_PCIGART_PAGES;
+        max_pages = (gart_info->table_size / sizeof(u32));
+        pages = (entry->pages <= max_pages)
+            ? entry->pages : max_pages;
 
-        memset(pci_gart, 0, ATI_MAX_PCIGART_PAGES * sizeof(u32));
+        memset(pci_gart, 0, max_pages * sizeof(u32));
 
         for (i = 0; i < pages; i++) {
                 /* we need to support large memory configurations */
@@ -198,10 +197,18 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
                 page_base = (u32) entry->busaddr[i];
 
                 for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
-                        if (gart_info->is_pcie)
+                        switch(gart_info->gart_reg_if) {
+                        case DRM_ATI_GART_IGP:
+                                *pci_gart = cpu_to_le32((page_base) | 0xc);
+                                break;
+                        case DRM_ATI_GART_PCIE:
                                 *pci_gart = cpu_to_le32((page_base >> 8) | 0xc);
-                        else
+                                break;
+                        default:
+                        case DRM_ATI_GART_PCI:
                                 *pci_gart = cpu_to_le32(page_base);
+                                break;
+                        }
                         pci_gart++;
                         page_base += ATI_PCIGART_PAGE_SIZE;
                 }
@@ -220,5 +227,4 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
         gart_info->bus_addr = bus_address;
         return ret;
 }
-
 EXPORT_SYMBOL(drm_ati_pcigart_init);
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 80041d5b792d..d494315752a2 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -519,12 +519,17 @@ typedef struct drm_vbl_sig {
 #define DRM_ATI_GART_MAIN 1
 #define DRM_ATI_GART_FB   2
 
+#define DRM_ATI_GART_PCI 1
+#define DRM_ATI_GART_PCIE 2
+#define DRM_ATI_GART_IGP 3
+
 typedef struct ati_pcigart_info {
         int gart_table_location;
-        int is_pcie;
+        int gart_reg_if;
         void *addr;
         dma_addr_t bus_addr;
         drm_local_map_t mapping;
+        int table_size;
 } drm_ati_pcigart_info;
 
 /*
diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c
index 892db7096986..32ed19c9ec1c 100644
--- a/drivers/char/drm/drm_dma.c
+++ b/drivers/char/drm/drm_dma.c
@@ -65,7 +65,7 @@ int drm_dma_setup(drm_device_t * dev)
  * \param dev DRM device.
  *
  * Free all pages associated with DMA buffers, the buffers and pages lists, and
- * finally the the drm_device::dma structure itself.
+ * finally the drm_device::dma structure itself.
  */
 void drm_dma_takedown(drm_device_t * dev)
 {
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index 26bec30ee86e..8e77b7ed0f44 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -15,8 +15,6 @@
  * #define DRIVER_DESC          "Matrox G200/G400"
  * #define DRIVER_DATE          "20001127"
  *
- * #define DRIVER_IOCTL_COUNT   DRM_ARRAY_SIZE( mga_ioctls )
- *
  * #define drm_x                mga_##x
  * \endcode
  */
@@ -120,7 +118,7 @@ static drm_ioctl_desc_t drm_ioctls[] = {
         [DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW)] = {drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
 };
 
-#define DRIVER_IOCTL_COUNT      ARRAY_SIZE( drm_ioctls )
+#define DRM_CORE_IOCTL_COUNT    ARRAY_SIZE( drm_ioctls )
 
 /**
  * Take down the DRM device.
@@ -496,11 +494,11 @@ int drm_ioctl(struct inode *inode, struct file *filp,
                   (long)old_encode_dev(priv->head->device),
                   priv->authenticated);
 
-        if ((nr >= DRIVER_IOCTL_COUNT) &&
+        if ((nr >= DRM_CORE_IOCTL_COUNT) &&
             ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
                 goto err_i1;
-        if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
-                 && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
+        if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) &&
+            (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
                 ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
         else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE))
                 ioctl = &drm_ioctls[nr];
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
index 2908b72daa6e..0fe7b4497927 100644
--- a/drivers/char/drm/drm_os_linux.h
+++ b/drivers/char/drm/drm_os_linux.h
@@ -70,9 +70,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size)
 
 #endif
 
-/** Task queue handler arguments */
-#define DRM_TASKQUEUE_ARGS      void *arg
-
 /** For data going into the kernel through the ioctl argument */
 #define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3)      \
         if ( copy_from_user(&arg1, arg2, arg3) )        \
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 01cf482d2d00..31cdde83713b 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -102,6 +102,7 @@
         {0x1002, 0x5653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP}, \
         {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
+        {0x1002, 0x5955, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
         {0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
         {0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
         {0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 35540cfb43dd..b5c5b9fa84c3 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -157,7 +157,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
  * \param address access address.
  * \return pointer to the page structure.
  *
- * Get the the mapping, find the real physical page to map, get the page, and
+ * Get the mapping, find the real physical page to map, get the page, and
  * return it.
  */
 static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index db5a60450e68..1014602c43a7 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -560,9 +560,10 @@ static int r128_do_init_cce(drm_device_t * dev, drm_r128_init_t * init)
         if (dev_priv->is_pci) {
 #endif
                 dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
+                dev_priv->gart_info.table_size = R128_PCIGART_TABLE_SIZE;
                 dev_priv->gart_info.addr = NULL;
                 dev_priv->gart_info.bus_addr = 0;
-                dev_priv->gart_info.is_pcie = 0;
+                dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
                 if (!drm_ati_pcigart_init(dev, &dev_priv->gart_info)) {
                         DRM_ERROR("failed to init PCI GART!\n");
                         dev->dev_private = (void *)dev_priv;
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index f1efb49de8df..9086835686dc 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -383,6 +383,8 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 
 #define R128_PERFORMANCE_BOXES          0
 
+#define R128_PCIGART_TABLE_SIZE         32768
+
 #define R128_READ(reg)          DRM_READ32(  dev_priv->mmio, (reg) )
 #define R128_WRITE(reg,val)     DRM_WRITE32( dev_priv->mmio, (reg), (val) )
 #define R128_READ8(reg)         DRM_READ8(   dev_priv->mmio, (reg) )
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h
index a881f96c983e..ecda760ae8c0 100644
--- a/drivers/char/drm/r300_reg.h
+++ b/drivers/char/drm/r300_reg.h
@@ -293,7 +293,7 @@ I am fairly certain that they are correct unless stated otherwise in comments.
 #       define R300_PVS_CNTL_1_PROGRAM_START_SHIFT   0
 #       define R300_PVS_CNTL_1_POS_END_SHIFT         10
 #       define R300_PVS_CNTL_1_PROGRAM_END_SHIFT     20
-/* Addresses are relative the the vertex program parameters area. */
+/* Addresses are relative to the vertex program parameters area. */
 #define R300_VAP_PVS_CNTL_2                 0x22D4
 #       define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0
 #       define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT  16
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index c1850ecac302..68338389d836 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -830,6 +830,15 @@ static int RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
         return RADEON_READ(RADEON_PCIE_DATA);
 }
 
+static u32 RADEON_READ_IGPGART(drm_radeon_private_t *dev_priv, int addr)
+{
+        u32 ret;
+        RADEON_WRITE(RADEON_IGPGART_INDEX, addr & 0x7f);
+        ret = RADEON_READ(RADEON_IGPGART_DATA);
+        RADEON_WRITE(RADEON_IGPGART_INDEX, 0x7f);
+        return ret;
+}
+
 #if RADEON_FIFO_DEBUG
 static void radeon_status(drm_radeon_private_t * dev_priv)
 {
@@ -1267,7 +1276,44 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
         }
 }
 
-/* Enable or disable PCI-E GART on the chip */
+/* Enable or disable IGP GART on the chip */
+static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+{
+        u32 temp, tmp;
+
+        tmp = RADEON_READ(RADEON_AIC_CNTL);
+        if (on) {
+                DRM_DEBUG("programming igpgart %08X %08lX %08X\n",
+                         dev_priv->gart_vm_start,
+                         (long)dev_priv->gart_info.bus_addr,
+                         dev_priv->gart_size);
+
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_UNK_18, 0x1000);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_ENABLE, 0x1);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_CTRL, 0x42040800);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_BASE_ADDR,
+                                     dev_priv->gart_info.bus_addr);
+
+                temp = RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_UNK_39);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_UNK_39, temp);
+
+                RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev_priv->gart_vm_start);
+                dev_priv->gart_size = 32*1024*1024;
+                RADEON_WRITE(RADEON_MC_AGP_LOCATION,
+                             (((dev_priv->gart_vm_start - 1 +
+                               dev_priv->gart_size) & 0xffff0000) |
+                             (dev_priv->gart_vm_start >> 16)));
+
+                temp = RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_ENABLE);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_ENABLE, temp);
+
+                RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_FLUSH);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_FLUSH, 0x1);
+                RADEON_READ_IGPGART(dev_priv, RADEON_IGPGART_FLUSH);
+                RADEON_WRITE_IGPGART(RADEON_IGPGART_FLUSH, 0x0);
+       }
+}
+
 static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
 {
         u32 tmp = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_TX_GART_CNTL);
@@ -1302,6 +1348,11 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 {
         u32 tmp;
 
+        if (dev_priv->flags & RADEON_IS_IGPGART) {
+                radeon_set_igpgart(dev_priv, on);
+                return;
+        }
+
         if (dev_priv->flags & RADEON_IS_PCIE) {
                 radeon_set_pciegart(dev_priv, on);
                 return;
@@ -1620,20 +1671,22 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
 #endif
         {
                 /* if we have an offset set from userspace */
-                if (dev_priv->pcigart_offset) {
+                if (dev_priv->pcigart_offset_set) {
                         dev_priv->gart_info.bus_addr =
                             dev_priv->pcigart_offset + dev_priv->fb_location;
                         dev_priv->gart_info.mapping.offset =
                             dev_priv->gart_info.bus_addr;
                         dev_priv->gart_info.mapping.size =
-                            RADEON_PCIGART_TABLE_SIZE;
+                            dev_priv->gart_info.table_size;
 
                         drm_core_ioremap(&dev_priv->gart_info.mapping, dev);
                         dev_priv->gart_info.addr =
                             dev_priv->gart_info.mapping.handle;
 
-                        dev_priv->gart_info.is_pcie =
-                            !!(dev_priv->flags & RADEON_IS_PCIE);
+                        if (dev_priv->flags & RADEON_IS_PCIE)
+                                dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCIE;
+                        else
+                                dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
                         dev_priv->gart_info.gart_table_location =
                             DRM_ATI_GART_FB;
 
@@ -1641,6 +1694,10 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                                   dev_priv->gart_info.addr,
                                   dev_priv->pcigart_offset);
                 } else {
+                        if (dev_priv->flags & RADEON_IS_IGPGART)
+                                dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
+                        else
+                                dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
                         dev_priv->gart_info.gart_table_location =
                             DRM_ATI_GART_MAIN;
                         dev_priv->gart_info.addr = NULL;
@@ -1714,7 +1771,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 = NULL;
+                        dev_priv->gart_info.addr = 0;
                 }
         }
         /* only clear to the start of flags */
@@ -2222,6 +2279,8 @@ int radeon_driver_firstopen(struct drm_device *dev)
         drm_local_map_t *map;
         drm_radeon_private_t *dev_priv = dev->dev_private;
 
+        dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
+
         ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
                          drm_get_resource_len(dev, 2), _DRM_REGISTERS,
                          _DRM_READ_ONLY, &dev_priv->mmio);
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
index 8d6350dd5360..66c4b6fed04f 100644
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
@@ -707,6 +707,7 @@ typedef struct drm_radeon_setparam {
 #define RADEON_SETPARAM_SWITCH_TILING  2        /* enable/disable color tiling */
 #define RADEON_SETPARAM_PCIGART_LOCATION 3      /* PCI Gart Location */
 #define RADEON_SETPARAM_NEW_MEMMAP 4            /* Use new memory map */
+#define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
 
 /* 1.14: Clients can allocate/free a surface
  */
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 8b105f1460a7..54f49ef4bef0 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -95,9 +95,11 @@
  * 1.24- Add general-purpose packet for manipulating scratch registers (r300)
  * 1.25- Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL,
  *       new packet type)
+ * 1.26- Add support for variable size PCI(E) gart aperture
+ * 1.27- Add support for IGP GART
  */
 #define DRIVER_MAJOR            1
-#define DRIVER_MINOR            25
+#define DRIVER_MINOR            27
 #define DRIVER_PATCHLEVEL       0
 
 /*
@@ -143,6 +145,7 @@ enum radeon_chip_flags {
         RADEON_IS_PCIE = 0x00200000UL,
         RADEON_NEW_MEMMAP = 0x00400000UL,
         RADEON_IS_PCI = 0x00800000UL,
+        RADEON_IS_IGPGART = 0x01000000UL,
 };
 
 #define GET_RING_HEAD(dev_priv) (dev_priv->writeback_works ? \
@@ -240,7 +243,6 @@ typedef struct drm_radeon_private {
 
         int do_boxes;
         int page_flipping;
-        int current_page;
 
         u32 color_fmt;
         unsigned int front_offset;
@@ -280,6 +282,7 @@ typedef struct drm_radeon_private {
         struct radeon_virt_surface virt_surfaces[2 * RADEON_MAX_SURFACES];
 
         unsigned long pcigart_offset;
+        unsigned int pcigart_offset_set;
         drm_ati_pcigart_info gart_info;
 
         u32 scratch_ages[5];
@@ -432,6 +435,15 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp,
 #define RADEON_PCIE_TX_GART_END_LO      0x16
 #define RADEON_PCIE_TX_GART_END_HI      0x17
 
+#define RADEON_IGPGART_INDEX            0x168
+#define RADEON_IGPGART_DATA             0x16c
+#define RADEON_IGPGART_UNK_18           0x18
+#define RADEON_IGPGART_CTRL             0x2b
+#define RADEON_IGPGART_BASE_ADDR        0x2c
+#define RADEON_IGPGART_FLUSH            0x2e
+#define RADEON_IGPGART_ENABLE           0x38
+#define RADEON_IGPGART_UNK_39           0x39
+
 #define RADEON_MPP_TB_CONFIG            0x01c0
 #define RADEON_MEM_CNTL                 0x0140
 #define RADEON_MEM_SDRAM_MODE_REG       0x0158
@@ -964,6 +976,14 @@ do {									\
         RADEON_WRITE( RADEON_CLOCK_CNTL_DATA, (val) );                  \
 } while (0)
 
+#define RADEON_WRITE_IGPGART( addr, val )                               \
+do {                                                                    \
+        RADEON_WRITE( RADEON_IGPGART_INDEX,                             \
+                        ((addr) & 0x7f) | (1 << 8));                    \
+        RADEON_WRITE( RADEON_IGPGART_DATA, (val) );                     \
+        RADEON_WRITE( RADEON_IGPGART_INDEX, 0x7f );                     \
+} while (0)
+
 #define RADEON_WRITE_PCIE( addr, val )                                  \
 do {                                                                    \
         RADEON_WRITE8( RADEON_PCIE_INDEX,                               \
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 938eccb78cc0..98c5f1d3a8e7 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -773,7 +773,7 @@ static void radeon_clear_box(drm_radeon_private_t * dev_priv,
                  RADEON_GMC_SRC_DATATYPE_COLOR |
                  RADEON_ROP3_P | RADEON_GMC_CLR_CMP_CNTL_DIS);
 
-        if (dev_priv->page_flipping && dev_priv->current_page == 1) {
+        if (dev_priv->sarea_priv->pfCurrentPage == 1) {
                 OUT_RING(dev_priv->front_pitch_offset);
         } else {
                 OUT_RING(dev_priv->back_pitch_offset);
@@ -861,7 +861,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
 
         dev_priv->stats.clears++;
 
-        if (dev_priv->page_flipping && dev_priv->current_page == 1) {
+        if (dev_priv->sarea_priv->pfCurrentPage == 1) {
                 unsigned int tmp = flags;
 
                 flags &= ~(RADEON_FRONT | RADEON_BACK);
@@ -1382,7 +1382,7 @@ static void radeon_cp_dispatch_swap(drm_device_t * dev)
                 /* Make this work even if front & back are flipped:
                  */
                 OUT_RING(CP_PACKET0(RADEON_SRC_PITCH_OFFSET, 1));
-                if (dev_priv->current_page == 0) {
+                if (dev_priv->sarea_priv->pfCurrentPage == 0) {
                         OUT_RING(dev_priv->back_pitch_offset);
                         OUT_RING(dev_priv->front_pitch_offset);
                 } else {
@@ -1416,12 +1416,12 @@ static void radeon_cp_dispatch_flip(drm_device_t * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_sarea_t *sarea = (drm_sarea_t *) dev_priv->sarea->handle;
-        int offset = (dev_priv->current_page == 1)
+        int offset = (dev_priv->sarea_priv->pfCurrentPage == 1)
             ? dev_priv->front_offset : dev_priv->back_offset;
         RING_LOCALS;
-        DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
+        DRM_DEBUG("%s: pfCurrentPage=%d\n",
                   __FUNCTION__,
-                  dev_priv->current_page, dev_priv->sarea_priv->pfCurrentPage);
+                  dev_priv->sarea_priv->pfCurrentPage);
 
         /* Do some trivial performance monitoring...
          */
@@ -1449,8 +1449,8 @@ static void radeon_cp_dispatch_flip(drm_device_t * dev)
          * performing the swapbuffer ioctl.
          */
         dev_priv->sarea_priv->last_frame++;
-        dev_priv->sarea_priv->pfCurrentPage = dev_priv->current_page =
-            1 - dev_priv->current_page;
+        dev_priv->sarea_priv->pfCurrentPage =
+                1 - dev_priv->sarea_priv->pfCurrentPage;
 
         BEGIN_RING(2);
 
@@ -2152,24 +2152,10 @@ static int radeon_do_init_pageflip(drm_device_t * dev)
         ADVANCE_RING();
 
         dev_priv->page_flipping = 1;
-        dev_priv->current_page = 0;
-        dev_priv->sarea_priv->pfCurrentPage = dev_priv->current_page;
 
-        return 0;
-}
-
-/* Called whenever a client dies, from drm_release.
- * NOTE:  Lock isn't necessarily held when this is called!
- */
-static int radeon_do_cleanup_pageflip(drm_device_t * dev)
-{
-        drm_radeon_private_t *dev_priv = dev->dev_private;
-        DRM_DEBUG("\n");
-
-        if (dev_priv->current_page != 0)
-                radeon_cp_dispatch_flip(dev);
+        if (dev_priv->sarea_priv->pfCurrentPage != 1)
+                dev_priv->sarea_priv->pfCurrentPage = 0;
 
-        dev_priv->page_flipping = 0;
         return 0;
 }
 
@@ -3145,10 +3131,16 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
                 break;
         case RADEON_SETPARAM_PCIGART_LOCATION:
                 dev_priv->pcigart_offset = sp.value;
+                dev_priv->pcigart_offset_set = 1;
                 break;
         case RADEON_SETPARAM_NEW_MEMMAP:
                 dev_priv->new_memmap = sp.value;
                 break;
+        case RADEON_SETPARAM_PCIGART_TABLE_SIZE:
+                dev_priv->gart_info.table_size = sp.value;
+                if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE)
+                        dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
+                break;
         default:
                 DRM_DEBUG("Invalid parameter %d\n", sp.param);
                 return DRM_ERR(EINVAL);
@@ -3168,9 +3160,7 @@ void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp)
 {
         if (dev->dev_private) {
                 drm_radeon_private_t *dev_priv = dev->dev_private;
-                if (dev_priv->page_flipping) {
-                        radeon_do_cleanup_pageflip(dev);
-                }
+                dev_priv->page_flipping = 0;
                 radeon_mem_release(filp, dev_priv->gart_heap);
                 radeon_mem_release(filp, dev_priv->fb_heap);
                 radeon_surfaces_release(filp, dev_priv);
@@ -3179,6 +3169,14 @@ void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp)
 
 void radeon_driver_lastclose(drm_device_t * dev)
 {
+        if (dev->dev_private) {
+                drm_radeon_private_t *dev_priv = dev->dev_private;
+
+                if (dev_priv->sarea_priv &&
+                    dev_priv->sarea_priv->pfCurrentPage != 0)
+                        radeon_cp_dispatch_flip(dev);
+        }
+
         radeon_do_release(dev);
 }
 
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index c0539c6299cf..13a9c5ca4593 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -252,7 +252,7 @@ static int via_dma_init(DRM_IOCTL_ARGS)
                 break;
         case VIA_DMA_INITIALIZED:
                 retcode = (dev_priv->ring.virtual_start != NULL) ?
-                    0 : DRM_ERR(EFAULT);
+                        0 : DRM_ERR(EFAULT);
                 break;
         default:
                 retcode = DRM_ERR(EINVAL);
@@ -432,56 +432,34 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
 {
         int paused, count;
         volatile uint32_t *paused_at = dev_priv->last_pause_ptr;
+        uint32_t reader,ptr;
 
+        paused = 0;
         via_flush_write_combine();
-        while (!*(via_get_dma(dev_priv) - 1)) ;
-        *dev_priv->last_pause_ptr = pause_addr_lo;
+        (void) *(volatile uint32_t *)(via_get_dma(dev_priv) -1);
+        *paused_at = pause_addr_lo;
         via_flush_write_combine();
-
-        /*
-         * The below statement is inserted to really force the flush.
-         * Not sure it is needed.
-         */
-
-        while (!*dev_priv->last_pause_ptr) ;
+        (void) *paused_at;
+        reader = *(dev_priv->hw_addr_ptr);
+        ptr = ((volatile char *)paused_at - dev_priv->dma_ptr) +
+                dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
         dev_priv->last_pause_ptr = via_get_dma(dev_priv) - 1;
-        while (!*dev_priv->last_pause_ptr) ;
 
-        paused = 0;
-        count = 20;
-
-        while (!(paused = (VIA_READ(0x41c) & 0x80000000)) && count--) ;
-        if ((count <= 8) && (count >= 0)) {
-                uint32_t rgtr, ptr;
-                rgtr = *(dev_priv->hw_addr_ptr);
-                ptr = ((volatile char *)dev_priv->last_pause_ptr -
-                      dev_priv->dma_ptr) + dev_priv->dma_offset +
-                      (uint32_t) dev_priv->agpAddr + 4 - CMDBUF_ALIGNMENT_SIZE;
-                if (rgtr <= ptr) {
-                        DRM_ERROR
-                            ("Command regulator\npaused at count %d, address %x, "
-                             "while current pause address is %x.\n"
-                             "Please mail this message to "
-                             "<unichrome-devel@lists.sourceforge.net>\n", count,
-                             rgtr, ptr);
-                }
+        if ((ptr - reader) <= dev_priv->dma_diff ) {
+                count = 10000000;
+                while (!(paused = (VIA_READ(0x41c) & 0x80000000)) && count--);
         }
 
         if (paused && !no_pci_fire) {
-                uint32_t rgtr, ptr;
-                uint32_t ptr_low;
+                reader = *(dev_priv->hw_addr_ptr);
+                if ((ptr - reader) == dev_priv->dma_diff) {
 
-                count = 1000000;
-                while ((VIA_READ(VIA_REG_STATUS) & VIA_CMD_RGTR_BUSY)
-                       && count--) ;
+                        /*
+                         * There is a concern that these writes may stall the PCI bus
+                         * if the GPU is not idle. However, idling the GPU first
+                         * doesn't make a difference.
+                         */
 
-                rgtr = *(dev_priv->hw_addr_ptr);
-                ptr = ((volatile char *)paused_at - dev_priv->dma_ptr) +
-                    dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
-
-                ptr_low = (ptr > 3 * CMDBUF_ALIGNMENT_SIZE) ?
-                    ptr - 3 * CMDBUF_ALIGNMENT_SIZE : 0;
-                if (rgtr <= ptr && rgtr >= ptr_low) {
                         VIA_WRITE(VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
                         VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_hi);
                         VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_lo);
@@ -494,6 +472,9 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
 static int via_wait_idle(drm_via_private_t * dev_priv)
 {
         int count = 10000000;
+
+        while (!(VIA_READ(VIA_REG_STATUS) & VIA_VR_QUEUE_BUSY) && count--);
+
         while (count-- && (VIA_READ(VIA_REG_STATUS) &
                            (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY |
                             VIA_3D_ENG_BUSY))) ;
@@ -537,6 +518,9 @@ static void via_cmdbuf_start(drm_via_private_t * dev_priv)
         uint32_t end_addr, end_addr_lo;
         uint32_t command;
         uint32_t agp_base;
+        uint32_t ptr;
+        uint32_t reader;
+        int count;
 
         dev_priv->dma_low = 0;
 
@@ -554,7 +538,7 @@ static void via_cmdbuf_start(drm_via_private_t * dev_priv)
                           &pause_addr_hi, &pause_addr_lo, 1) - 1;
 
         via_flush_write_combine();
-        while (!*dev_priv->last_pause_ptr) ;
+        (void) *(volatile uint32_t *)dev_priv->last_pause_ptr;
 
         VIA_WRITE(VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
         VIA_WRITE(VIA_REG_TRANSPACE, command);
@@ -566,6 +550,24 @@ static void via_cmdbuf_start(drm_via_private_t * dev_priv)
         DRM_WRITEMEMORYBARRIER();
         VIA_WRITE(VIA_REG_TRANSPACE, command | HC_HAGPCMNT_MASK);
         VIA_READ(VIA_REG_TRANSPACE);
+
+        dev_priv->dma_diff = 0;
+
+        count = 10000000;
+        while (!(VIA_READ(0x41c) & 0x80000000) && count--);
+
+        reader = *(dev_priv->hw_addr_ptr);
+        ptr = ((volatile char *)dev_priv->last_pause_ptr - dev_priv->dma_ptr) +
+            dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
+
+        /*
+         * This is the difference between where we tell the
+         * command reader to pause and where it actually pauses.
+         * This differs between hw implementation so we need to
+         * detect it.
+         */
+
+        dev_priv->dma_diff = ptr - reader;
 }
 
 static void via_pad_cache(drm_via_private_t * dev_priv, int qwords)
@@ -592,7 +594,6 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
         uint32_t pause_addr_lo, pause_addr_hi;
         uint32_t jump_addr_lo, jump_addr_hi;
         volatile uint32_t *last_pause_ptr;
-        uint32_t dma_low_save1, dma_low_save2;
 
         agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
         via_align_cmd(dev_priv, HC_HAGPBpID_JUMP, 0, &jump_addr_hi,
@@ -619,31 +620,11 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
                       &pause_addr_lo, 0);
 
         *last_pause_ptr = pause_addr_lo;
-        dma_low_save1 = dev_priv->dma_low;
-
-        /*
-         * Now, set a trap that will pause the regulator if it tries to rerun the old
-         * command buffer. (Which may happen if via_hook_segment detecs a command regulator pause
-         * and reissues the jump command over PCI, while the regulator has already taken the jump
-         * and actually paused at the current buffer end).
-         * There appears to be no other way to detect this condition, since the hw_addr_pointer
-         * does not seem to get updated immediately when a jump occurs.
-         */
 
-        last_pause_ptr =
-            via_align_cmd(dev_priv, HC_HAGPBpID_PAUSE, 0, &pause_addr_hi,
-                          &pause_addr_lo, 0) - 1;
-        via_align_cmd(dev_priv, HC_HAGPBpID_PAUSE, 0, &pause_addr_hi,
-                      &pause_addr_lo, 0);
-        *last_pause_ptr = pause_addr_lo;
-
-        dma_low_save2 = dev_priv->dma_low;
-        dev_priv->dma_low = dma_low_save1;
-        via_hook_segment(dev_priv, jump_addr_hi, jump_addr_lo, 0);
-        dev_priv->dma_low = dma_low_save2;
-        via_hook_segment(dev_priv, pause_addr_hi, pause_addr_lo, 0);
+        via_hook_segment( dev_priv, jump_addr_hi, jump_addr_lo, 0);
 }
 
+
 static void via_cmdbuf_rewind(drm_via_private_t * dev_priv)
 {
         via_cmdbuf_jump(dev_priv);
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
index 8b8778d4a423..b46ca8e6306d 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/char/drm/via_drv.h
@@ -29,11 +29,11 @@
 
 #define DRIVER_NAME             "via"
 #define DRIVER_DESC             "VIA Unichrome / Pro"
-#define DRIVER_DATE             "20061227"
+#define DRIVER_DATE             "20070202"
 
 #define DRIVER_MAJOR            2
 #define DRIVER_MINOR            11
-#define DRIVER_PATCHLEVEL       0
+#define DRIVER_PATCHLEVEL       1
 
 #include "via_verifier.h"
 
@@ -93,6 +93,7 @@ typedef struct drm_via_private {
         unsigned long vram_offset;
         unsigned long agp_offset;
         drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES];
+        uint32_t dma_diff;
 } drm_via_private_t;
 
 enum via_family {
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 3d7efc26aad6..334ad5bbe6b6 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -4,7 +4,6 @@
  */
 #include <linux/module.h>
 #include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
 #include <linux/capability.h>
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index db984e481d4c..9b8278e1f4f8 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -32,7 +32,6 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 
 #include <asm/atarihw.h>
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index d8dbdb916232..abde6ddefe69 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -62,7 +62,6 @@
 #include <linux/init.h>         /* for __init, module_{init,exit} */
 #include <linux/poll.h>         /* for POLLIN, etc. */
 #include <linux/dtlk.h>         /* local header file for DoubleTalk values */
-#include <linux/smp_lock.h>
 
 #ifdef TRACING
 #define TRACE_TEXT(str) printk(str);
@@ -325,16 +324,22 @@ static int dtlk_release(struct inode *inode, struct file *file)
 
 static int __init dtlk_init(void)
 {
+        int err;
+
         dtlk_port_lpc = 0;
         dtlk_port_tts = 0;
         dtlk_busy = 0;
         dtlk_major = register_chrdev(0, "dtlk", &dtlk_fops);
-        if (dtlk_major == 0) {
+        if (dtlk_major < 0) {
                 printk(KERN_ERR "DoubleTalk PC - cannot register device\n");
-                return 0;
+                return dtlk_major;
+        }
+        err = dtlk_dev_probe();
+        if (err) {
+                unregister_chrdev(dtlk_major, "dtlk");
+                return err;
         }
-        if (dtlk_dev_probe() == 0)
-                printk(", MAJOR %d\n", dtlk_major);
+        printk(", MAJOR %d\n", dtlk_major);
 
         init_waitqueue_head(&dtlk_process_list);
 
diff --git a/drivers/char/ec3104_keyb.c b/drivers/char/ec3104_keyb.c
index 77f58ed6d59a..020011495d91 100644
--- a/drivers/char/ec3104_keyb.c
+++ b/drivers/char/ec3104_keyb.c
@@ -41,7 +41,6 @@
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
 #include <linux/kbd_kern.h>
-#include <linux/smp_lock.h>
 #include <linux/bitops.h>
 
 #include <asm/keyboard.h>
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index de5be30484ad..c6c56fb8ba50 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -949,7 +949,7 @@ static int block_til_ready(struct tty_struct *tty,
 
         } /* End forever while  */
 
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&ch->open_wait, &wait);
         if (!tty_hung_up_p(filp))
                 ch->count++;
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
index 23b25ada65ea..9e1fc02967ff 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -12,7 +12,7 @@
  *
  *      This driver allows use of the real time clock (built into
  *      nearly all computers) from user space. It exports the /dev/rtc
- *      interface supporting various ioctl() and also the /proc/dev/rtc
+ *      interface supporting various ioctl() and also the /proc/driver/rtc
  *      pseudo-file for status information.
  *
  *      The ioctls can be used to set the interrupt behaviour where
@@ -207,7 +207,7 @@ static ssize_t gen_rtc_read(struct file *file, char __user *buf,
                         sizeof(unsigned long);
         }
  out:
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&gen_rtc_wait, &wait);
 
         return retval;
@@ -377,7 +377,7 @@ static int gen_rtc_release(struct inode *inode, struct file *file)
 #ifdef CONFIG_PROC_FS
 
 /*
- *      Info exported via "/proc/rtc".
+ *      Info exported via "/proc/driver/rtc".
  */
 
 static int gen_rtc_proc_output(char *buf)
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index ae76a9ffe89f..0e8ceea5ea78 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -44,12 +44,11 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/reboot.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <asm/uaccess.h>
 #include <linux/sysrq.h>
-
+#include <linux/timer.h>
 
 #define VERSION_STR "0.9.0"
 
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 0f9ed7b46a6d..322bc5f7d86b 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -111,7 +111,7 @@ static int last_hvc = -1;
  * lock held.  If successful, this function increments the kobject reference
  * count against the target hvc_struct so it should be released when finished.
  */
-struct hvc_struct *hvc_get_by_index(int index)
+static struct hvc_struct *hvc_get_by_index(int index)
 {
         struct hvc_struct *hp;
         unsigned long flags;
@@ -150,7 +150,8 @@ static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
  * hvc_console_setup() finds adapters.
  */
 
-void hvc_console_print(struct console *co, const char *b, unsigned count)
+static void hvc_console_print(struct console *co, const char *b,
+                              unsigned count)
 {
         char c[N_OUTBUF] __ALIGNED__;
         unsigned i = 0, n = 0;
@@ -208,7 +209,7 @@ static int __init hvc_console_setup(struct console *co, char *options)
         return 0;
 }
 
-struct console hvc_con_driver = {
+static struct console hvc_con_driver = {
         .name           = "hvc",
         .write          = hvc_console_print,
         .device         = hvc_console_device,
@@ -278,7 +279,6 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
 
         return 0;
 }
-EXPORT_SYMBOL(hvc_instantiate);
 
 /* Wake the sleeping khvcd */
 static void hvc_kick(void)
@@ -792,7 +792,6 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int irq,
 
         return hp;
 }
-EXPORT_SYMBOL(hvc_alloc);
 
 int __devexit hvc_remove(struct hvc_struct *hp)
 {
@@ -828,11 +827,10 @@ int __devexit hvc_remove(struct hvc_struct *hp)
                 tty_hangup(tty);
         return 0;
 }
-EXPORT_SYMBOL(hvc_remove);
 
 /* Driver initialization.  Follow console initialization.  This is where the TTY
  * interfaces start to become available. */
-int __init hvc_init(void)
+static int __init hvc_init(void)
 {
         struct tty_driver *drv;
 
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index ec420fe8a908..b37f1d5a5be6 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -579,7 +579,7 @@ static int hvc_find_vtys(void)
                 if (!vtermno)
                         continue;
 
-                if (!device_is_compatible(vty, "IBM,iSeries-vty"))
+                if (!of_device_is_compatible(vty, "IBM,iSeries-vty"))
                         continue;
 
                 if (num_found == 0)
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index 94a542e20efb..79711aa4b41d 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -157,7 +157,7 @@ static int hvc_find_vtys(void)
                 if (!vtermno)
                         continue;
 
-                if (device_is_compatible(vty, "hvterm1")) {
+                if (of_device_is_compatible(vty, "hvterm1")) {
                         hvc_instantiate(*vtermno, num_found, &hvc_get_put_ops);
                         ++num_found;
                 }
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 5f3acd8e64b8..7cda04b33534 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -91,3 +91,17 @@ config HW_RANDOM_OMAP
           module will be called omap-rng.
 
           If unsure, say Y.
+
+config HW_RANDOM_PASEMI
+        tristate "PA Semi HW Random Number Generator support"
+        depends on HW_RANDOM && PPC_PASEMI
+        default HW_RANDOM
+        ---help---
+          This driver provides kernel-side support for the Random Number
+          Generator hardware found on PA6T-1682M processor.
+
+          To compile this driver as a module, choose M here: the
+          module will be called pasemi-rng.
+
+          If unsure, say Y.
+
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index c41fa19454e3..c8b7300e2fb1 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_HW_RANDOM_GEODE) += geode-rng.o
 obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
 obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index cc1046e6ee02..4ae9811d1a6c 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -24,10 +24,11 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/module.h>
+#include <linux/hw_random.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/hw_random.h>
+#include <linux/stop_machine.h>
 #include <asm/io.h>
 
 
@@ -217,30 +218,117 @@ static struct hwrng intel_rng = {
         .data_read      = intel_rng_data_read,
 };
 
+struct intel_rng_hw {
+        struct pci_dev *dev;
+        void __iomem *mem;
+        u8 bios_cntl_off;
+        u8 bios_cntl_val;
+        u8 fwh_dec_en1_off;
+        u8 fwh_dec_en1_val;
+};
 
-#ifdef CONFIG_SMP
-static char __initdata waitflag;
+static int __init intel_rng_hw_init(void *_intel_rng_hw)
+{
+        struct intel_rng_hw *intel_rng_hw = _intel_rng_hw;
+        u8 mfc, dvc;
+
+        /* interrupts disabled in stop_machine_run call */
+
+        if (!(intel_rng_hw->fwh_dec_en1_val & FWH_F8_EN_MASK))
+                pci_write_config_byte(intel_rng_hw->dev,
+                                      intel_rng_hw->fwh_dec_en1_off,
+                                      intel_rng_hw->fwh_dec_en1_val |
+                                      FWH_F8_EN_MASK);
+        if (!(intel_rng_hw->bios_cntl_val & BIOS_CNTL_WRITE_ENABLE_MASK))
+                pci_write_config_byte(intel_rng_hw->dev,
+                                      intel_rng_hw->bios_cntl_off,
+                                      intel_rng_hw->bios_cntl_val |
+                                      BIOS_CNTL_WRITE_ENABLE_MASK);
+
+        writeb(INTEL_FWH_RESET_CMD, intel_rng_hw->mem);
+        writeb(INTEL_FWH_READ_ID_CMD, intel_rng_hw->mem);
+        mfc = readb(intel_rng_hw->mem + INTEL_FWH_MANUFACTURER_CODE_ADDRESS);
+        dvc = readb(intel_rng_hw->mem + INTEL_FWH_DEVICE_CODE_ADDRESS);
+        writeb(INTEL_FWH_RESET_CMD, intel_rng_hw->mem);
+
+        if (!(intel_rng_hw->bios_cntl_val &
+              (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK)))
+                pci_write_config_byte(intel_rng_hw->dev,
+                                      intel_rng_hw->bios_cntl_off,
+                                      intel_rng_hw->bios_cntl_val);
+        if (!(intel_rng_hw->fwh_dec_en1_val & FWH_F8_EN_MASK))
+                pci_write_config_byte(intel_rng_hw->dev,
+                                      intel_rng_hw->fwh_dec_en1_off,
+                                      intel_rng_hw->fwh_dec_en1_val);
 
-static void __init intel_init_wait(void *unused)
+        if (mfc != INTEL_FWH_MANUFACTURER_CODE ||
+            (dvc != INTEL_FWH_DEVICE_CODE_8M &&
+             dvc != INTEL_FWH_DEVICE_CODE_4M)) {
+                printk(KERN_ERR PFX "FWH not detected\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw,
+                                        struct pci_dev *dev)
 {
-        while (waitflag)
-                cpu_relax();
+        intel_rng_hw->bios_cntl_val = 0xff;
+        intel_rng_hw->fwh_dec_en1_val = 0xff;
+        intel_rng_hw->dev = dev;
+
+        /* Check for Intel 82802 */
+        if (dev->device < 0x2640) {
+                intel_rng_hw->fwh_dec_en1_off = FWH_DEC_EN1_REG_OLD;
+                intel_rng_hw->bios_cntl_off = BIOS_CNTL_REG_OLD;
+        } else {
+                intel_rng_hw->fwh_dec_en1_off = FWH_DEC_EN1_REG_NEW;
+                intel_rng_hw->bios_cntl_off = BIOS_CNTL_REG_NEW;
+        }
+
+        pci_read_config_byte(dev, intel_rng_hw->fwh_dec_en1_off,
+                             &intel_rng_hw->fwh_dec_en1_val);
+        pci_read_config_byte(dev, intel_rng_hw->bios_cntl_off,
+                             &intel_rng_hw->bios_cntl_val);
+
+        if ((intel_rng_hw->bios_cntl_val &
+             (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK))
+            == BIOS_CNTL_LOCK_ENABLE_MASK) {
+                static __initdata /*const*/ char warning[] =
+                        KERN_WARNING PFX "Firmware space is locked read-only. "
+                        KERN_WARNING PFX "If you can't or\n don't want to "
+                        KERN_WARNING PFX "disable this in firmware setup, and "
+                        KERN_WARNING PFX "if\n you are certain that your "
+                        KERN_WARNING PFX "system has a functional\n RNG, try"
+                        KERN_WARNING PFX "using the 'no_fwh_detect' option.\n";
+
+                if (no_fwh_detect)
+                        return -ENODEV;
+                printk(warning);
+                return -EBUSY;
+        }
+
+        intel_rng_hw->mem = ioremap_nocache(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
+        if (intel_rng_hw->mem == NULL)
+                return -EBUSY;
+
+        return 0;
 }
-#endif
+
 
 static int __init mod_init(void)
 {
         int err = -ENODEV;
-        unsigned i;
+        int i;
         struct pci_dev *dev = NULL;
-        void __iomem *mem;
-        unsigned long flags;
-        u8 bios_cntl_off, fwh_dec_en1_off;
-        u8 bios_cntl_val = 0xff, fwh_dec_en1_val = 0xff;
-        u8 hw_status, mfc, dvc;
+        void __iomem *mem = mem;
+        u8 hw_status;
+        struct intel_rng_hw *intel_rng_hw;
 
         for (i = 0; !dev && pci_tbl[i].vendor; ++i)
-                dev = pci_get_device(pci_tbl[i].vendor, pci_tbl[i].device, NULL);
+                dev = pci_get_device(pci_tbl[i].vendor, pci_tbl[i].device,
+                                     NULL);
 
         if (!dev)
                 goto out; /* Device not found. */
@@ -250,39 +338,18 @@ static int __init mod_init(void)
                 goto fwh_done;
         }
 
-        /* Check for Intel 82802 */
-        if (dev->device < 0x2640) {
-                fwh_dec_en1_off = FWH_DEC_EN1_REG_OLD;
-                bios_cntl_off = BIOS_CNTL_REG_OLD;
-        } else {
-                fwh_dec_en1_off = FWH_DEC_EN1_REG_NEW;
-                bios_cntl_off = BIOS_CNTL_REG_NEW;
-        }
-
-        pci_read_config_byte(dev, fwh_dec_en1_off, &fwh_dec_en1_val);
-        pci_read_config_byte(dev, bios_cntl_off, &bios_cntl_val);
-
-        if ((bios_cntl_val &
-             (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK))
-            == BIOS_CNTL_LOCK_ENABLE_MASK) {
-                static __initdata /*const*/ char warning[] =
-                        KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n"
-                        KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n"
-                        KERN_WARNING PFX "you are certain that your system has a functional\n"
-                        KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n";
-
+        intel_rng_hw = kmalloc(sizeof(*intel_rng_hw), GFP_KERNEL);
+        if (!intel_rng_hw) {
                 pci_dev_put(dev);
-                if (no_fwh_detect)
-                        goto fwh_done;
-                printk(warning);
-                err = -EBUSY;
                 goto out;
         }
 
-        mem = ioremap_nocache(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
-        if (mem == NULL) {
+        err = intel_init_hw_struct(intel_rng_hw, dev);
+        if (err) {
                 pci_dev_put(dev);
-                err = -EBUSY;
+                kfree(intel_rng_hw);
+                if (err == -ENODEV)
+                        goto fwh_done;
                 goto out;
         }
 
@@ -290,59 +357,18 @@ static int __init mod_init(void)
          * Since the BIOS code/data is going to disappear from its normal
          * location with the Read ID command, all activity on the system
          * must be stopped until the state is back to normal.
+         *
+         * Use stop_machine_run because IPIs can be blocked by disabling
+         * interrupts.
          */
-#ifdef CONFIG_SMP
-        set_mb(waitflag, 1);
-        if (smp_call_function(intel_init_wait, NULL, 1, 0) != 0) {
-                set_mb(waitflag, 0);
-                pci_dev_put(dev);
-                printk(KERN_ERR PFX "cannot run on all processors\n");
-                err = -EAGAIN;
-                goto err_unmap;
-        }
-#endif
-        local_irq_save(flags);
-
-        if (!(fwh_dec_en1_val & FWH_F8_EN_MASK))
-                pci_write_config_byte(dev,
-                                      fwh_dec_en1_off,
-                                      fwh_dec_en1_val | FWH_F8_EN_MASK);
-        if (!(bios_cntl_val & BIOS_CNTL_WRITE_ENABLE_MASK))
-                pci_write_config_byte(dev,
-                                      bios_cntl_off,
-                                      bios_cntl_val | BIOS_CNTL_WRITE_ENABLE_MASK);
-
-        writeb(INTEL_FWH_RESET_CMD, mem);
-        writeb(INTEL_FWH_READ_ID_CMD, mem);
-        mfc = readb(mem + INTEL_FWH_MANUFACTURER_CODE_ADDRESS);
-        dvc = readb(mem + INTEL_FWH_DEVICE_CODE_ADDRESS);
-        writeb(INTEL_FWH_RESET_CMD, mem);
-
-        if (!(bios_cntl_val &
-              (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK)))
-                pci_write_config_byte(dev, bios_cntl_off, bios_cntl_val);
-        if (!(fwh_dec_en1_val & FWH_F8_EN_MASK))
-                pci_write_config_byte(dev, fwh_dec_en1_off, fwh_dec_en1_val);
-
-        local_irq_restore(flags);
-#ifdef CONFIG_SMP
-        /* Tell other CPUs to resume. */
-        set_mb(waitflag, 0);
-#endif
-
-        iounmap(mem);
+        err = stop_machine_run(intel_rng_hw_init, intel_rng_hw, NR_CPUS);
         pci_dev_put(dev);
-
-        if (mfc != INTEL_FWH_MANUFACTURER_CODE ||
-            (dvc != INTEL_FWH_DEVICE_CODE_8M &&
-             dvc != INTEL_FWH_DEVICE_CODE_4M)) {
-                printk(KERN_ERR PFX "FWH not detected\n");
-                err = -ENODEV;
+        iounmap(intel_rng_hw->mem);
+        kfree(intel_rng_hw);
+        if (err)
                 goto out;
-        }
 
 fwh_done:
-
         err = -ENOMEM;
         mem = ioremap(INTEL_RNG_ADDR, INTEL_RNG_ADDR_LEN);
         if (!mem)
@@ -352,22 +378,21 @@ fwh_done:
         /* Check for Random Number Generator */
         err = -ENODEV;
         hw_status = hwstatus_get(mem);
-        if ((hw_status & INTEL_RNG_PRESENT) == 0)
-                goto err_unmap;
+        if ((hw_status & INTEL_RNG_PRESENT) == 0) {
+                iounmap(mem);
+                goto out;
+        }
 
         printk(KERN_INFO "Intel 82802 RNG detected\n");
         err = hwrng_register(&intel_rng);
         if (err) {
                 printk(KERN_ERR PFX "RNG registering failed (%d)\n",
                        err);
-                goto err_unmap;
+                iounmap(mem);
         }
 out:
         return err;
 
-err_unmap:
-        iounmap(mem);
-        goto out;
 }
 
 static void __exit mod_exit(void)
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
new file mode 100644
index 000000000000..fa6040b6c8f2
--- /dev/null
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2006-2007 PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * Driver for the PWRficient onchip rng
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/hw_random.h>
+#include <asm/of_platform.h>
+#include <asm/io.h>
+
+#define SDCRNG_CTL_REG                  0x00
+#define   SDCRNG_CTL_FVLD_M             0x0000f000
+#define   SDCRNG_CTL_FVLD_S             12
+#define   SDCRNG_CTL_KSZ                0x00000800
+#define   SDCRNG_CTL_RSRC_CRG           0x00000010
+#define   SDCRNG_CTL_RSRC_RRG           0x00000000
+#define   SDCRNG_CTL_CE                 0x00000004
+#define   SDCRNG_CTL_RE                 0x00000002
+#define   SDCRNG_CTL_DR                 0x00000001
+#define   SDCRNG_CTL_SELECT_RRG_RNG     (SDCRNG_CTL_RE | SDCRNG_CTL_RSRC_RRG)
+#define   SDCRNG_CTL_SELECT_CRG_RNG     (SDCRNG_CTL_CE | SDCRNG_CTL_RSRC_CRG)
+#define SDCRNG_VAL_REG                  0x20
+
+#define MODULE_NAME "pasemi_rng"
+
+static int pasemi_rng_data_present(struct hwrng *rng)
+{
+        void __iomem *rng_regs = (void __iomem *)rng->priv;
+
+        return (in_le32(rng_regs + SDCRNG_CTL_REG)
+                & SDCRNG_CTL_FVLD_M) ? 1 : 0;
+}
+
+static int pasemi_rng_data_read(struct hwrng *rng, u32 *data)
+{
+        void __iomem *rng_regs = (void __iomem *)rng->priv;
+        *data = in_le32(rng_regs + SDCRNG_VAL_REG);
+        return 4;
+}
+
+static int pasemi_rng_init(struct hwrng *rng)
+{
+        void __iomem *rng_regs = (void __iomem *)rng->priv;
+        u32 ctl;
+
+        ctl = SDCRNG_CTL_DR | SDCRNG_CTL_SELECT_RRG_RNG | SDCRNG_CTL_KSZ;
+        out_le32(rng_regs + SDCRNG_CTL_REG, ctl);
+        out_le32(rng_regs + SDCRNG_CTL_REG, ctl & ~SDCRNG_CTL_DR);
+
+        return 0;
+}
+
+static void pasemi_rng_cleanup(struct hwrng *rng)
+{
+        void __iomem *rng_regs = (void __iomem *)rng->priv;
+        u32 ctl;
+
+        ctl = SDCRNG_CTL_RE | SDCRNG_CTL_CE;
+        out_le32(rng_regs + SDCRNG_CTL_REG,
+                 in_le32(rng_regs + SDCRNG_CTL_REG) & ~ctl);
+}
+
+static struct hwrng pasemi_rng = {
+        .name           = MODULE_NAME,
+        .init           = pasemi_rng_init,
+        .cleanup        = pasemi_rng_cleanup,
+        .data_present   = pasemi_rng_data_present,
+        .data_read      = pasemi_rng_data_read,
+};
+
+static int __devinit rng_probe(struct of_device *ofdev,
+                               const struct of_device_id *match)
+{
+        void __iomem *rng_regs;
+        struct device_node *rng_np = ofdev->node;
+        struct resource res;
+        int err = 0;
+
+        err = of_address_to_resource(rng_np, 0, &res);
+        if (err)
+                return -ENODEV;
+
+        rng_regs = ioremap(res.start, 0x100);
+
+        if (!rng_regs)
+                return -ENOMEM;
+
+        pasemi_rng.priv = (unsigned long)rng_regs;
+
+        printk(KERN_INFO "Registering PA Semi RNG\n");
+
+        err = hwrng_register(&pasemi_rng);
+
+        if (err)
+                iounmap(rng_regs);
+
+        return err;
+}
+
+static int __devexit rng_remove(struct of_device *dev)
+{
+        void __iomem *rng_regs = (void __iomem *)pasemi_rng.priv;
+
+        hwrng_unregister(&pasemi_rng);
+        iounmap(rng_regs);
+
+        return 0;
+}
+
+static struct of_device_id rng_match[] = {
+        {
+                .compatible      = "1682m-rng",
+        },
+        {},
+};
+
+static struct of_platform_driver rng_driver = {
+        .name           = "pasemi-rng",
+        .match_table    = rng_match,
+        .probe          = rng_probe,
+        .remove         = rng_remove,
+};
+
+static int __init rng_init(void)
+{
+        return of_register_platform_driver(&rng_driver);
+}
+module_init(rng_init);
+
+static void __exit rng_exit(void)
+{
+        of_unregister_platform_driver(&rng_driver);
+}
+module_exit(rng_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
+MODULE_DESCRIPTION("H/W RNG driver for PA Semi processor");
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 353d9f3cf8d7..0289705967de 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -22,6 +22,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/dmi.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c
index a48da02aad2f..932264a657d0 100644
--- a/drivers/char/ip27-rtc.c
+++ b/drivers/char/ip27-rtc.c
@@ -35,7 +35,6 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
 
 #include <asm/m48t35.h>
 #include <asm/sn/ioc3.h>
diff --git a/drivers/char/ipmi/Kconfig b/drivers/char/ipmi/Kconfig
index a6dcb2918157..b894f67fdf14 100644
--- a/drivers/char/ipmi/Kconfig
+++ b/drivers/char/ipmi/Kconfig
@@ -3,6 +3,8 @@
 #
 
 menu "IPMI"
+        depends on HAS_IOMEM
+
 config IPMI_HANDLER
        tristate 'IPMI top-level message handler'
        help
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index e22146546add..78e1b962fe35 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -9,6 +9,7 @@
  *         source@mvista.com
  *
  * Copyright 2002 MontaVista Software Inc.
+ * Copyright 2006 IBM Corp., Christian Krafft <krafft@de.ibm.com>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -64,6 +65,11 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 
+#ifdef CONFIG_PPC_OF
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#endif
+
 #define PFX "ipmi_si: "
 
 /* Measure times between events in the driver. */
@@ -76,6 +82,12 @@
 #define SI_SHORT_TIMEOUT_USEC  250 /* .25ms when the SM request a
                                        short timeout */
 
+/* Bit for BMC global enables. */
+#define IPMI_BMC_RCV_MSG_INTR     0x01
+#define IPMI_BMC_EVT_MSG_INTR     0x02
+#define IPMI_BMC_EVT_MSG_BUFF     0x04
+#define IPMI_BMC_SYS_LOG          0x08
+
 enum si_intf_state {
         SI_NORMAL,
         SI_GETTING_FLAGS,
@@ -84,7 +96,9 @@ enum si_intf_state {
         SI_CLEARING_FLAGS_THEN_SET_IRQ,
         SI_GETTING_MESSAGES,
         SI_ENABLE_INTERRUPTS1,
-        SI_ENABLE_INTERRUPTS2
+        SI_ENABLE_INTERRUPTS2,
+        SI_DISABLE_INTERRUPTS1,
+        SI_DISABLE_INTERRUPTS2
         /* FIXME - add watchdog stuff. */
 };
 
@@ -333,6 +347,17 @@ static void start_enable_irq(struct smi_info *smi_info)
         smi_info->si_state = SI_ENABLE_INTERRUPTS1;
 }
 
+static void start_disable_irq(struct smi_info *smi_info)
+{
+        unsigned char msg[2];
+
+        msg[0] = (IPMI_NETFN_APP_REQUEST << 2);
+        msg[1] = IPMI_GET_BMC_GLOBAL_ENABLES_CMD;
+
+        smi_info->handlers->start_transaction(smi_info->si_sm, msg, 2);
+        smi_info->si_state = SI_DISABLE_INTERRUPTS1;
+}
+
 static void start_clear_flags(struct smi_info *smi_info)
 {
         unsigned char msg[3];
@@ -353,7 +378,7 @@ static void start_clear_flags(struct smi_info *smi_info)
 static inline void disable_si_irq(struct smi_info *smi_info)
 {
         if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
-                disable_irq_nosync(smi_info->irq);
+                start_disable_irq(smi_info);
                 smi_info->interrupt_disabled = 1;
         }
 }
@@ -361,7 +386,7 @@ static inline void disable_si_irq(struct smi_info *smi_info)
 static inline void enable_si_irq(struct smi_info *smi_info)
 {
         if ((smi_info->irq) && (smi_info->interrupt_disabled)) {
-                enable_irq(smi_info->irq);
+                start_enable_irq(smi_info);
                 smi_info->interrupt_disabled = 0;
         }
 }
@@ -583,7 +608,9 @@ static void handle_transaction_done(struct smi_info *smi_info)
                 } else {
                         msg[0] = (IPMI_NETFN_APP_REQUEST << 2);
                         msg[1] = IPMI_SET_BMC_GLOBAL_ENABLES_CMD;
-                        msg[2] = msg[3] | 1; /* enable msg queue int */
+                        msg[2] = (msg[3] |
+                                  IPMI_BMC_RCV_MSG_INTR |
+                                  IPMI_BMC_EVT_MSG_INTR);
                         smi_info->handlers->start_transaction(
                                 smi_info->si_sm, msg, 3);
                         smi_info->si_state = SI_ENABLE_INTERRUPTS2;
@@ -605,6 +632,45 @@ static void handle_transaction_done(struct smi_info *smi_info)
                 smi_info->si_state = SI_NORMAL;
                 break;
         }
+
+        case SI_DISABLE_INTERRUPTS1:
+        {
+                unsigned char msg[4];
+
+                /* We got the flags from the SMI, now handle them. */
+                smi_info->handlers->get_result(smi_info->si_sm, msg, 4);
+                if (msg[2] != 0) {
+                        printk(KERN_WARNING
+                               "ipmi_si: Could not disable interrupts"
+                               ", failed get.\n");
+                        smi_info->si_state = SI_NORMAL;
+                } else {
+                        msg[0] = (IPMI_NETFN_APP_REQUEST << 2);
+                        msg[1] = IPMI_SET_BMC_GLOBAL_ENABLES_CMD;
+                        msg[2] = (msg[3] &
+                                  ~(IPMI_BMC_RCV_MSG_INTR |
+                                    IPMI_BMC_EVT_MSG_INTR));
+                        smi_info->handlers->start_transaction(
+                                smi_info->si_sm, msg, 3);
+                        smi_info->si_state = SI_DISABLE_INTERRUPTS2;
+                }
+                break;
+        }
+
+        case SI_DISABLE_INTERRUPTS2:
+        {
+                unsigned char msg[4];
+
+                /* We got the flags from the SMI, now handle them. */
+                smi_info->handlers->get_result(smi_info->si_sm, msg, 4);
+                if (msg[2] != 0) {
+                        printk(KERN_WARNING
+                               "ipmi_si: Could not disable interrupts"
+                               ", failed set.\n");
+                }
+                smi_info->si_state = SI_NORMAL;
+                break;
+        }
         }
 }
 
@@ -858,9 +924,6 @@ static void smi_timeout(unsigned long data)
         struct timeval    t;
 #endif
 
-        if (atomic_read(&smi_info->stop_operation))
-                return;
-
         spin_lock_irqsave(&(smi_info->si_lock), flags);
 #ifdef DEBUG_TIMING
         do_gettimeofday(&t);
@@ -916,15 +979,11 @@ static irqreturn_t si_irq_handler(int irq, void *data)
         smi_info->interrupts++;
         spin_unlock(&smi_info->count_lock);
 
-        if (atomic_read(&smi_info->stop_operation))
-                goto out;
-
 #ifdef DEBUG_TIMING
         do_gettimeofday(&t);
         printk("**Interrupt: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
         smi_event_handler(smi_info, 0);
- out:
         spin_unlock_irqrestore(&(smi_info->si_lock), flags);
         return IRQ_HANDLED;
 }
@@ -1006,6 +1065,7 @@ static DEFINE_MUTEX(smi_infos_lock);
 static int smi_num; /* Used to sequence the SMIs */
 
 #define DEFAULT_REGSPACING      1
+#define DEFAULT_REGSIZE         1
 
 static int           si_trydefaults = 1;
 static char          *si_type[SI_MAX_PARMS];
@@ -1111,7 +1171,7 @@ static int std_irq_setup(struct smi_info *info)
         if (info->si_type == SI_BT) {
                 rv = request_irq(info->irq,
                                  si_bt_irq_handler,
-                                 IRQF_DISABLED,
+                                 IRQF_SHARED | IRQF_DISABLED,
                                  DEVICE_NAME,
                                  info);
                 if (!rv)
@@ -1121,7 +1181,7 @@ static int std_irq_setup(struct smi_info *info)
         } else
                 rv = request_irq(info->irq,
                                  si_irq_handler,
-                                 IRQF_DISABLED,
+                                 IRQF_SHARED | IRQF_DISABLED,
                                  DEVICE_NAME,
                                  info);
         if (rv) {
@@ -1701,15 +1761,11 @@ static u32 ipmi_acpi_gpe(void *context)
         smi_info->interrupts++;
         spin_unlock(&smi_info->count_lock);
 
-        if (atomic_read(&smi_info->stop_operation))
-                goto out;
-
 #ifdef DEBUG_TIMING
         do_gettimeofday(&t);
         printk("**ACPI_GPE: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
         smi_event_handler(smi_info, 0);
- out:
         spin_unlock_irqrestore(&(smi_info->si_lock), flags);
 
         return ACPI_INTERRUPT_HANDLED;
@@ -1859,10 +1915,10 @@ static __devinit int try_init_acpi(struct SPMITable *spmi)
 
         if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                 info->io_setup = mem_setup;
-                info->io.addr_type = IPMI_IO_ADDR_SPACE;
+                info->io.addr_type = IPMI_MEM_ADDR_SPACE;
         } else if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
                 info->io_setup = port_setup;
-                info->io.addr_type = IPMI_MEM_ADDR_SPACE;
+                info->io.addr_type = IPMI_IO_ADDR_SPACE;
         } else {
                 kfree(info);
                 printk("ipmi_si: Unknown ACPI I/O Address type\n");
@@ -2133,12 +2189,15 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
                 info->irq_setup = std_irq_setup;
 
         info->dev = &pdev->dev;
+        pci_set_drvdata(pdev, info);
 
         return try_smi_init(info);
 }
 
 static void __devexit ipmi_pci_remove(struct pci_dev *pdev)
 {
+        struct smi_info *info = pci_get_drvdata(pdev);
+        cleanup_one_si(info);
 }
 
 #ifdef CONFIG_PM
@@ -2172,6 +2231,99 @@ static struct pci_driver ipmi_pci_driver = {
 #endif /* CONFIG_PCI */
 
 
+#ifdef CONFIG_PPC_OF
+static int __devinit ipmi_of_probe(struct of_device *dev,
+                         const struct of_device_id *match)
+{
+        struct smi_info *info;
+        struct resource resource;
+        const int *regsize, *regspacing, *regshift;
+        struct device_node *np = dev->node;
+        int ret;
+        int proplen;
+
+        dev_info(&dev->dev, PFX "probing via device tree\n");
+
+        ret = of_address_to_resource(np, 0, &resource);
+        if (ret) {
+                dev_warn(&dev->dev, PFX "invalid address from OF\n");
+                return ret;
+        }
+
+        regsize = get_property(np, "reg-size", &proplen);
+        if (regsize && proplen != 4) {
+                dev_warn(&dev->dev, PFX "invalid regsize from OF\n");
+                return -EINVAL;
+        }
+
+        regspacing = get_property(np, "reg-spacing", &proplen);
+        if (regspacing && proplen != 4) {
+                dev_warn(&dev->dev, PFX "invalid regspacing from OF\n");
+                return -EINVAL;
+        }
+
+        regshift = get_property(np, "reg-shift", &proplen);
+        if (regshift && proplen != 4) {
+                dev_warn(&dev->dev, PFX "invalid regshift from OF\n");
+                return -EINVAL;
+        }
+
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+
+        if (!info) {
+                dev_err(&dev->dev,
+                        PFX "could not allocate memory for OF probe\n");
+                return -ENOMEM;
+        }
+
+        info->si_type           = (enum si_type) match->data;
+        info->addr_source       = "device-tree";
+        info->io_setup          = mem_setup;
+        info->irq_setup         = std_irq_setup;
+
+        info->io.addr_type      = IPMI_MEM_ADDR_SPACE;
+        info->io.addr_data      = resource.start;
+
+        info->io.regsize        = regsize ? *regsize : DEFAULT_REGSIZE;
+        info->io.regspacing     = regspacing ? *regspacing : DEFAULT_REGSPACING;
+        info->io.regshift       = regshift ? *regshift : 0;
+
+        info->irq               = irq_of_parse_and_map(dev->node, 0);
+        info->dev               = &dev->dev;
+
+        dev_dbg(&dev->dev, "addr 0x%lx regsize %ld spacing %ld irq %x\n",
+                info->io.addr_data, info->io.regsize, info->io.regspacing,
+                info->irq);
+
+        dev->dev.driver_data = (void*) info;
+
+        return try_smi_init(info);
+}
+
+static int __devexit ipmi_of_remove(struct of_device *dev)
+{
+        cleanup_one_si(dev->dev.driver_data);
+        return 0;
+}
+
+static struct of_device_id ipmi_match[] =
+{
+        { .type = "ipmi", .compatible = "ipmi-kcs",  .data = (void *)(unsigned long) SI_KCS },
+        { .type = "ipmi", .compatible = "ipmi-smic", .data = (void *)(unsigned long) SI_SMIC },
+        { .type = "ipmi", .compatible = "ipmi-bt",   .data = (void *)(unsigned long) SI_BT },
+        {},
+};
+
+static struct of_platform_driver ipmi_of_platform_driver =
+{
+        .name           = "ipmi",
+        .match_table    = ipmi_match,
+        .probe          = ipmi_of_probe,
+        .remove         = __devexit_p(ipmi_of_remove),
+};
+#endif /* CONFIG_PPC_OF */
+
+
 static int try_get_dev_id(struct smi_info *smi_info)
 {
         unsigned char         msg[2];
@@ -2801,6 +2953,10 @@ static __devinit int init_ipmi_si(void)
         }
 #endif
 
+#ifdef CONFIG_PPC_OF
+        of_register_platform_driver(&ipmi_of_platform_driver);
+#endif
+
         if (si_trydefaults) {
                 mutex_lock(&smi_infos_lock);
                 if (list_empty(&smi_infos)) {
@@ -2818,6 +2974,10 @@ static __devinit int init_ipmi_si(void)
 #ifdef CONFIG_PCI
                 pci_unregister_driver(&ipmi_pci_driver);
 #endif
+
+#ifdef CONFIG_PPC_OF
+                of_unregister_platform_driver(&ipmi_of_platform_driver);
+#endif
                 driver_unregister(&ipmi_driver);
                 printk("ipmi_si: Unable to find any System Interface(s)\n");
                 return -ENODEV;
@@ -2838,28 +2998,33 @@ static void cleanup_one_si(struct smi_info *to_clean)
 
         list_del(&to_clean->link);
 
-        /* Tell the timer and interrupt handlers that we are shutting
-           down. */
-        spin_lock_irqsave(&(to_clean->si_lock), flags);
-        spin_lock(&(to_clean->msg_lock));
-
+        /* Tell the driver that we are shutting down. */
         atomic_inc(&to_clean->stop_operation);
 
-        if (to_clean->irq_cleanup)
-                to_clean->irq_cleanup(to_clean);
-
-        spin_unlock(&(to_clean->msg_lock));
-        spin_unlock_irqrestore(&(to_clean->si_lock), flags);
-
-        /* Wait until we know that we are out of any interrupt
-           handlers might have been running before we freed the
-           interrupt. */
-        synchronize_sched();
-
+        /* Make sure the timer and thread are stopped and will not run
+           again. */
         wait_for_timer_and_thread(to_clean);
 
-        /* Interrupts and timeouts are stopped, now make sure the
-           interface is in a clean state. */
+        /* Timeouts are stopped, now make sure the interrupts are off
+           for the device.  A little tricky with locks to make sure
+           there are no races. */
+        spin_lock_irqsave(&to_clean->si_lock, flags);
+        while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {
+                spin_unlock_irqrestore(&to_clean->si_lock, flags);
+                poll(to_clean);
+                schedule_timeout_uninterruptible(1);
+                spin_lock_irqsave(&to_clean->si_lock, flags);
+        }
+        disable_si_irq(to_clean);
+        spin_unlock_irqrestore(&to_clean->si_lock, flags);
+        while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {
+                poll(to_clean);
+                schedule_timeout_uninterruptible(1);
+        }
+
+        /* Clean up interrupts and make sure that everything is done. */
+        if (to_clean->irq_cleanup)
+                to_clean->irq_cleanup(to_clean);
         while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {
                 poll(to_clean);
                 schedule_timeout_uninterruptible(1);
@@ -2898,6 +3063,10 @@ static __exit void cleanup_ipmi_si(void)
         pci_unregister_driver(&ipmi_pci_driver);
 #endif
 
+#ifdef CONFIG_PPC_OF
+        of_unregister_platform_driver(&ipmi_of_platform_driver);
+#endif
+
         mutex_lock(&smi_infos_lock);
         list_for_each_entry_safe(e, tmp_e, &smi_infos, link)
                 cleanup_one_si(e);
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 6b634e8d9519..41f78e2c158f 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -39,6 +39,7 @@
 #include <linux/miscdevice.h>
 #include <linux/init.h>
 #include <linux/completion.h>
+#include <linux/kdebug.h>
 #include <linux/rwsem.h>
 #include <linux/errno.h>
 #include <asm/uaccess.h>
@@ -50,6 +51,7 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <asm/atomic.h>
+
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/apic.h>
 #endif
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 43ab9edc76f5..761f77740d67 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -137,11 +137,10 @@
 #define InterruptTheCard(base) outw(0, (base) + 0xc)
 #define ClearInterrupt(base) inw((base) + 0x0a)
 
+#define pr_dbg(str...) pr_debug("ISICOM: " str)
 #ifdef DEBUG
-#define pr_dbg(str...) printk(KERN_DEBUG "ISICOM: " str)
 #define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c))
 #else
-#define pr_dbg(str...) do { } while (0)
 #define isicom_paranoia_check(a, b, c) 0
 #endif
 
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index c06e86ad1dab..1b094509b1d2 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -109,7 +109,7 @@ struct kbd_struct kbd_table[MAX_NR_CONSOLES];
 static struct kbd_struct *kbd = kbd_table;
 
 struct vt_spawn_console vt_spawn_con = {
-        .lock = SPIN_LOCK_UNLOCKED,
+        .lock = __SPIN_LOCK_UNLOCKED(vt_spawn_con.lock),
         .pid  = NULL,
         .sig  = 0,
 };
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index b51d08be0bcf..62051f8b0910 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -118,7 +118,6 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>
@@ -139,9 +138,6 @@
 /* if you have more than 8 printers, remember to increase LP_NO */
 #define LP_NO 8
 
-/* ROUND_UP macro from fs/select.c */
-#define ROUND_UP(x,y) (((x)+(y)-1)/(y))
-
 static struct lp_struct lp_table[LP_NO];
 
 static unsigned int lp_count = 0;
@@ -652,7 +648,7 @@ static int lp_ioctl(struct inode *inode, struct file *file,
                             (par_timeout.tv_usec < 0)) {
                                 return -EINVAL;
                         }
-                        to_jiffies = ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
+                        to_jiffies = DIV_ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
                         to_jiffies += par_timeout.tv_sec * (long) HZ;
                         if (to_jiffies <= 0) {
                                 return -EINVAL;
@@ -803,7 +799,7 @@ static int lp_register(int nr, struct parport *port)
         if (reset)
                 lp_reset(nr);
 
-        class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL,
+        class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), port->dev,
                                 "lp%d", nr);
 
         printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 5f066963f171..cc9a9d0df979 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -18,7 +18,6 @@
 #include <linux/raw.h>
 #include <linux/tty.h>
 #include <linux/capability.h>
-#include <linux/smp_lock.h>
 #include <linux/ptrace.h>
 #include <linux/device.h>
 #include <linux/highmem.h>
@@ -552,7 +551,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
         return virtr + wrote;
 }
 
-#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
+#ifdef CONFIG_DEVPORT
 static ssize_t read_port(struct file * file, char __user * buf,
                          size_t count, loff_t *ppos)
 {
@@ -835,7 +834,7 @@ static const struct file_operations null_fops = {
         .splice_write   = splice_write_null,
 };
 
-#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
+#ifdef CONFIG_DEVPORT
 static const struct file_operations port_fops = {
         .llseek         = memory_lseek,
         .read           = read_port,
@@ -913,7 +912,7 @@ static int memory_open(struct inode * inode, struct file * filp)
                 case 3:
                         filp->f_op = &null_fops;
                         break;
-#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
+#ifdef CONFIG_DEVPORT
                 case 4:
                         filp->f_op = &port_fops;
                         break;
@@ -960,7 +959,7 @@ static const struct {
         {1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
         {2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops},
         {3, "null",    S_IRUGO | S_IWUGO,           &null_fops},
-#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
+#ifdef CONFIG_DEVPORT
         {4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
 #endif
         {5, "zero",    S_IRUGO | S_IWUGO,           &zero_fops},
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 7e975f606924..4e6fb9651a16 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -41,6 +41,7 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/stat.h>
@@ -53,7 +54,7 @@
  * Head entry for the doubly linked miscdevice list
  */
 static LIST_HEAD(misc_list);
-static DECLARE_MUTEX(misc_sem);
+static DEFINE_MUTEX(misc_mtx);
 
 /*
  * Assigned numbers, used for dynamic minors
@@ -69,7 +70,7 @@ static void *misc_seq_start(struct seq_file *seq, loff_t *pos)
         struct miscdevice *p;
         loff_t off = 0;
 
-        down(&misc_sem);
+        mutex_lock(&misc_mtx);
         list_for_each_entry(p, &misc_list, list) {
                 if (*pos == off++) 
                         return p;
@@ -89,7 +90,7 @@ static void *misc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 
 static void misc_seq_stop(struct seq_file *seq, void *v)
 {
-        up(&misc_sem);
+        mutex_unlock(&misc_mtx);
 }
 
 static int misc_seq_show(struct seq_file *seq, void *v)
@@ -129,7 +130,7 @@ static int misc_open(struct inode * inode, struct file * file)
         int err = -ENODEV;
         const struct file_operations *old_fops, *new_fops = NULL;
         
-        down(&misc_sem);
+        mutex_lock(&misc_mtx);
         
         list_for_each_entry(c, &misc_list, list) {
                 if (c->minor == minor) {
@@ -139,9 +140,9 @@ static int misc_open(struct inode * inode, struct file * file)
         }
                 
         if (!new_fops) {
-                up(&misc_sem);
+                mutex_unlock(&misc_mtx);
                 request_module("char-major-%d-%d", MISC_MAJOR, minor);
-                down(&misc_sem);
+                mutex_lock(&misc_mtx);
 
                 list_for_each_entry(c, &misc_list, list) {
                         if (c->minor == minor) {
@@ -165,7 +166,7 @@ static int misc_open(struct inode * inode, struct file * file)
         }
         fops_put(old_fops);
 fail:
-        up(&misc_sem);
+        mutex_unlock(&misc_mtx);
         return err;
 }
 
@@ -201,10 +202,10 @@ int misc_register(struct miscdevice * misc)
 
         INIT_LIST_HEAD(&misc->list);
 
-        down(&misc_sem);
+        mutex_lock(&misc_mtx);
         list_for_each_entry(c, &misc_list, list) {
                 if (c->minor == misc->minor) {
-                        up(&misc_sem);
+                        mutex_unlock(&misc_mtx);
                         return -EBUSY;
                 }
         }
@@ -215,7 +216,7 @@ int misc_register(struct miscdevice * misc)
                         if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
                                 break;
                 if (i<0) {
-                        up(&misc_sem);
+                        mutex_unlock(&misc_mtx);
                         return -EBUSY;
                 }
                 misc->minor = i;
@@ -238,7 +239,7 @@ int misc_register(struct miscdevice * misc)
          */
         list_add(&misc->list, &misc_list);
  out:
-        up(&misc_sem);
+        mutex_unlock(&misc_mtx);
         return err;
 }
 
@@ -259,13 +260,13 @@ int misc_deregister(struct miscdevice * misc)
         if (list_empty(&misc->list))
                 return -EINVAL;
 
-        down(&misc_sem);
+        mutex_lock(&misc_mtx);
         list_del(&misc->list);
         device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
         if (i < DYNAMIC_MINORS && i>0) {
                 misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
         }
-        up(&misc_sem);
+        mutex_unlock(&misc_mtx);
         return 0;
 }
 
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index c09160383a53..6e55cfb9c65a 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -705,15 +705,13 @@ static int __init mmtimer_init(void)
         maxn++;
 
         /* Allocate list of node ptrs to mmtimer_t's */
-        timers = kmalloc(sizeof(mmtimer_t *)*maxn, GFP_KERNEL);
+        timers = kzalloc(sizeof(mmtimer_t *)*maxn, GFP_KERNEL);
         if (timers == NULL) {
                 printk(KERN_ERR "%s: failed to allocate memory for device\n",
                                 MMTIMER_NAME);
                 goto out3;
         }
 
-        memset(timers,0,(sizeof(mmtimer_t *)*maxn));
-
         /* Allocate mmtimer_t's for each online node */
         for_each_online_node(node) {
                 timers[node] = kmalloc_node(sizeof(mmtimer_t)*NUM_COMPARATORS, GFP_KERNEL, node);
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 7dbaee8d9402..e0d35c20c04f 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -1582,7 +1582,7 @@ copy:
 
         if(copy_from_user(&dltmp, argp, sizeof(struct dl_str)))
                 return -EFAULT;
-        if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS)
+        if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS || dltmp.len < 0)
                 return -EINVAL;
 
         switch(cmd)
@@ -2529,6 +2529,8 @@ static int moxaloadbios(int cardno, unsigned char __user *tmp, int len)
         void __iomem *baseAddr;
         int i;
 
+        if(len < 0 || len > sizeof(moxaBuff))
+                return -EINVAL;
         if(copy_from_user(moxaBuff, tmp, len))
                 return -EFAULT;
         baseAddr = moxa_boards[cardno].basemem;
@@ -2576,7 +2578,7 @@ static int moxaload320b(int cardno, unsigned char __user *tmp, int len)
         void __iomem *baseAddr;
         int i;
 
-        if(len > sizeof(moxaBuff))
+        if(len < 0 || len > sizeof(moxaBuff))
                 return -EINVAL;
         if(copy_from_user(moxaBuff, tmp, len))
                 return -EFAULT;
@@ -2596,6 +2598,8 @@ static int moxaloadcode(int cardno, unsigned char __user *tmp, int len)
         void __iomem *baseAddr, *ofsAddr;
         int retval, port, i;
 
+        if(len < 0 || len > sizeof(moxaBuff))
+                return -EINVAL;
         if(copy_from_user(moxaBuff, tmp, len))
                 return -EFAULT;
         baseAddr = moxa_boards[cardno].basemem;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 80a01150b86c..5953a45d7e96 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -54,7 +54,6 @@
 #include <linux/gfp.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
 
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index f7603b6aeb87..6cde448cd5b2 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -37,7 +37,6 @@
 #include <linux/gfp.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
 
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index 65f2d3a96b85..14557a4822c0 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -1088,13 +1088,13 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
                         /* block until there is a message: */
                         add_wait_queue(&pInfo->read_wait, &wait);
 repeat:
-                        current->state = TASK_INTERRUPTIBLE;
+                        __set_current_state(TASK_INTERRUPTIBLE);
                         pMsg = remove_msg(pInfo, pClient);
                         if (!pMsg && !signal_pending(current)) {
                                 schedule();
                                 goto repeat;
                         }
-                        current->state = TASK_RUNNING;
+                        __set_current_state(TASK_RUNNING);
                         remove_wait_queue(&pInfo->read_wait, &wait);
                 }
 
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 6ac3ca4c723c..b3d4ccc33a47 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1544,21 +1544,18 @@ static unsigned int normal_poll(struct tty_struct * tty, struct file * file, pol
 }
 
 struct tty_ldisc tty_ldisc_N_TTY = {
-        TTY_LDISC_MAGIC,        /* magic */
-        "n_tty",                /* name */
-        0,                      /* num */
-        0,                      /* flags */
-        n_tty_open,             /* open */
-        n_tty_close,            /* close */
-        n_tty_flush_buffer,     /* flush_buffer */
-        n_tty_chars_in_buffer,  /* chars_in_buffer */
-        read_chan,              /* read */
-        write_chan,             /* write */
-        n_tty_ioctl,            /* ioctl */
-        n_tty_set_termios,      /* set_termios */
-        normal_poll,            /* poll */
-        NULL,                   /* hangup */
-        n_tty_receive_buf,      /* receive_buf */
-        n_tty_write_wakeup      /* write_wakeup */
+        .magic           = TTY_LDISC_MAGIC,
+        .name            = "n_tty",
+        .open            = n_tty_open,
+        .close           = n_tty_close,
+        .flush_buffer    = n_tty_flush_buffer,
+        .chars_in_buffer = n_tty_chars_in_buffer,
+        .read            = read_chan,
+        .write           = write_chan,
+        .ioctl           = n_tty_ioctl,
+        .set_termios     = n_tty_set_termios,
+        .poll            = normal_poll,
+        .receive_buf     = n_tty_receive_buf,
+        .write_wakeup    = n_tty_write_wakeup
 };
 
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index 27c1179ee527..f25facd97bb4 100644
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -21,6 +21,7 @@ config SYNCLINK_CS
 config CARDMAN_4000
         tristate "Omnikey Cardman 4000 support"
         depends on PCMCIA
+        select BITREVERSE
         help
           Enable support for the Omnikey Cardman 4000 PCMCIA Smartcard
           reader.
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index e91b43a014b0..fee58e03dbe2 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/delay.h>
+#include <linux/bitrev.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -194,41 +195,17 @@ static inline unsigned char xinb(unsigned short port)
 }
 #endif
 
-#define b_0000  15
-#define b_0001  14
-#define b_0010  13
-#define b_0011  12
-#define b_0100  11
-#define b_0101  10
-#define b_0110  9
-#define b_0111  8
-#define b_1000  7
-#define b_1001  6
-#define b_1010  5
-#define b_1011  4
-#define b_1100  3
-#define b_1101  2
-#define b_1110  1
-#define b_1111  0
-
-static unsigned char irtab[16] = {
-        b_0000, b_1000, b_0100, b_1100,
-        b_0010, b_1010, b_0110, b_1110,
-        b_0001, b_1001, b_0101, b_1101,
-        b_0011, b_1011, b_0111, b_1111
-};
+static inline unsigned char invert_revert(unsigned char ch)
+{
+        return bitrev8(~ch);
+}
 
 static void str_invert_revert(unsigned char *b, int len)
 {
         int i;
 
         for (i = 0; i < len; i++)
-                b[i] = (irtab[b[i] & 0x0f] << 4) | irtab[b[i] >> 4];
-}
-
-static unsigned char invert_revert(unsigned char ch)
-{
-        return (irtab[ch & 0x0f] << 4) | irtab[ch >> 4];
+                b[i] = invert_revert(b[i]);
 }
 
 #define ATRLENCK(dev,pos) \
@@ -1114,7 +1091,7 @@ static ssize_t cmm_write(struct file *filp, const char __user *buf,
         /*
          * wait for atr to become valid.
          * note: it is important to lock this code. if we dont, the monitor
-         * could be run between test_bit and the the call the sleep on the
+         * could be run between test_bit and the call to sleep on the
          * atr-queue.  if *then* the monitor detects atr valid, it will wake up
          * any process on the atr-queue, *but* since we have been interrupted,
          * we do not yet sleep on this queue. this would result in a missed
@@ -1881,8 +1858,11 @@ static int cm4000_probe(struct pcmcia_device *link)
         init_waitqueue_head(&dev->readq);
 
         ret = cm4000_config(link, i);
-        if (ret)
+        if (ret) {
+                dev_table[i] = NULL;
+                kfree(dev);
                 return ret;
+        }
 
         class_device_create(cmm_class, NULL, MKDEV(major, i), NULL,
                             "cmm%d", i);
@@ -1907,7 +1887,7 @@ static void cm4000_detach(struct pcmcia_device *link)
         cm4000_release(link);
 
         dev_table[devno] = NULL;
-        kfree(dev);
+        kfree(dev);
 
         class_device_destroy(cmm_class, MKDEV(major, devno));
 
@@ -1956,12 +1936,14 @@ static int __init cmm_init(void)
         if (major < 0) {
                 printk(KERN_WARNING MODULE_NAME
                         ": could not get major number\n");
+                class_destroy(cmm_class);
                 return major;
         }
 
         rc = pcmcia_register_driver(&cm4000_driver);
         if (rc < 0) {
                 unregister_chrdev(major, DEVICE_NAME);
+                class_destroy(cmm_class);
                 return rc;
         }
 
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index f2e4ec4fd407..af88181a17f4 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -636,8 +636,11 @@ static int reader_probe(struct pcmcia_device *link)
         setup_timer(&dev->poll_timer, cm4040_do_poll, 0);
 
         ret = reader_config(link, i);
-        if (ret)
+        if (ret) {
+                dev_table[i] = NULL;
+                kfree(dev);
                 return ret;
+        }
 
         class_device_create(cmx_class, NULL, MKDEV(major, i), NULL,
                             "cmx%d", i);
@@ -708,12 +711,14 @@ static int __init cm4040_init(void)
         if (major < 0) {
                 printk(KERN_WARNING MODULE_NAME
                         ": could not get major number\n");
+                class_destroy(cmx_class);
                 return major;
         }
 
         rc = pcmcia_register_driver(&reader_driver);
         if (rc < 0) {
                 unregister_chrdev(major, DEVICE_NAME);
+                class_destroy(cmx_class);
                 return rc;
         }
 
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 4abd1eff61d6..84ac64fc48a1 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -66,7 +66,6 @@
 #include <linux/poll.h>
 #include <linux/major.h>
 #include <linux/ppdev.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <asm/uaccess.h>
 
@@ -752,7 +751,7 @@ static const struct file_operations pp_fops = {
 
 static void pp_attach(struct parport *port)
 {
-        device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number),
+        device_create(ppdev_class, port->dev, MKDEV(PP_MAJOR, port->number),
                         "parport%d", port->number);
 }
 
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 245f03195b7c..8cc60b693460 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -402,7 +402,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                 rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: Host number %Zd, name ``%s''\n", HostP - p->RIOHosts, HostP->Name);
                 rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: Rup number  0x%x\n", rup);
 
-                if (Rup >= (unsigned short) MAX_RUP) {
+                if (Rup < (unsigned short) MAX_RUP) {
                         rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for RTA ``%s''\n", HostP->Mapping[Rup].Name);
                 } else
                         rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for link ``%c'' of host ``%s''\n", ('A' + Rup - MAX_RUP), HostP->Name);
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 70145254fb9d..3494e3fc44bf 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -980,7 +980,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 }
                 schedule();
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&port->open_wait, &wait);
         if (!tty_hung_up_p(filp))
                 port->count++;
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 76357c855ce3..a3fd7e7ba5a9 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -65,10 +65,6 @@
 
 /****** Kernel includes ******/
 
-#ifdef MODVERSIONS
-#include <config/modversions.h>
-#endif                          
-
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/major.h>
@@ -85,6 +81,7 @@
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
+#include <linux/mutex.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/wait.h>
@@ -93,7 +90,6 @@
 #include <asm/atomic.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
 #include <linux/init.h>
 
 /****** RocketPort includes ******/
@@ -702,7 +698,7 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
                 }
         }
         spin_lock_init(&info->slock);
-        sema_init(&info->write_sem, 1);
+        mutex_init(&info->write_mtx);
         rp_table[line] = info;
         if (pci_dev)
                 tty_register_device(rocket_driver, line, &pci_dev->dev);
@@ -947,7 +943,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 #endif
                 schedule();     /*  Don't hold spinlock here, will hang PC */
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
 
         spin_lock_irqsave(&info->slock, flags);
@@ -1018,9 +1014,6 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
         /*
          * Info->count is now 1; so it's safe to sleep now.
          */
-        info->session = process_session(current);
-        info->pgrp = process_group(current);
-
         if ((info->flags & ROCKET_INITIALIZED) == 0) {
                 cp = &info->channel;
                 sSetRxTrigger(cp, TRIG_1);
@@ -1602,7 +1595,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
                 if (signal_pending(current))
                         break;
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
 #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
         printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies);
 #endif
@@ -1661,8 +1654,11 @@ static void rp_put_char(struct tty_struct *tty, unsigned char ch)
         if (rocket_paranoia_check(info, "rp_put_char"))
                 return;
 
-        /*  Grab the port write semaphore, locking out other processes that try to write to this port */
-        down(&info->write_sem);
+        /*
+         * Grab the port write mutex, locking out other processes that try to
+         * write to this port
+         */
+        mutex_lock(&info->write_mtx);
 
 #ifdef ROCKET_DEBUG_WRITE
         printk(KERN_INFO "rp_put_char %c...", ch);
@@ -1684,12 +1680,12 @@ static void rp_put_char(struct tty_struct *tty, unsigned char ch)
                 info->xmit_fifo_room--;
         }
         spin_unlock_irqrestore(&info->slock, flags);
-        up(&info->write_sem);
+        mutex_unlock(&info->write_mtx);
 }
 
 /*
  *  Exception handler - write routine, called when user app writes to the device.
- *  A per port write semaphore is used to protect from another process writing to
+ *  A per port write mutex is used to protect from another process writing to
  *  this port at the same time.  This other process could be running on the other CPU
  *  or get control of the CPU if the copy_from_user() blocks due to a page fault (swapped out). 
  *  Spinlocks protect the info xmit members.
@@ -1706,7 +1702,7 @@ static int rp_write(struct tty_struct *tty,
         if (count <= 0 || rocket_paranoia_check(info, "rp_write"))
                 return 0;
 
-        down_interruptible(&info->write_sem);
+        mutex_lock_interruptible(&info->write_mtx);
 
 #ifdef ROCKET_DEBUG_WRITE
         printk(KERN_INFO "rp_write %d chars...", count);
@@ -1777,7 +1773,7 @@ end:
                 wake_up_interruptible(&tty->poll_wait);
 #endif
         }
-        up(&info->write_sem);
+        mutex_unlock(&info->write_mtx);
         return retval;
 }
 
@@ -1852,6 +1848,12 @@ static void rp_flush_buffer(struct tty_struct *tty)
 
 #ifdef CONFIG_PCI
 
+static struct pci_device_id __devinitdata rocket_pci_ids[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
+        { }
+};
+MODULE_DEVICE_TABLE(pci, rocket_pci_ids);
+
 /*
  *  Called when a PCI card is found.  Retrieves and stores model information,
  *  init's aiopic and serial port hardware.
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 3a8bcc85bc14..b4c53dfa7951 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -15,6 +15,8 @@
 #define ROCKET_TYPE_MODEMIII    3
 #define ROCKET_TYPE_PC104       4
 
+#include <linux/mutex.h>
+
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
@@ -1156,8 +1158,6 @@ struct r_port {
         int xmit_head;
         int xmit_tail;
         int xmit_cnt;
-        int session;
-        int pgrp;
         int cd_status;
         int ignore_status_mask;
         int read_status_mask;
@@ -1171,7 +1171,7 @@ struct r_port {
         struct wait_queue *close_wait;
 #endif
         spinlock_t slock;
-        struct semaphore write_sem;
+        struct mutex write_mtx;
 };
 
 #define RPORT_MAGIC 0x525001
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index c7dac9b13351..20380a2c4dee 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -388,7 +388,7 @@ static ssize_t rtc_read(struct file *file, char __user *buf,
         if (!retval)
                 retval = count;
  out:
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&rtc_wait, &wait);
 
         return retval;
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index 74cff839c857..a69f094d1ed3 100644
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -299,7 +299,7 @@ int paste_selection(struct tty_struct *tty)
                 pasted += count;
         }
         remove_wait_queue(&vc->paste_wait, &wait);
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
 
         tty_ldisc_deref(ld);
         return 0;
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 5fd314adc1f2..c585b4738f86 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1892,7 +1892,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 #endif
                     schedule();
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
         if (!tty_hung_up_p(filp)) {
                 info->count++;
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index 2f56e8c54897..1b75b0b7d542 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -203,8 +203,6 @@ scdrv_dispatch_event(char *event, int len)
         class = (code & EV_CLASS_MASK);
 
         if (class == EV_CLASS_PWRD_NOTIFY || code == ENV_PWRDN_PEND) {
-                struct task_struct *p;
-
                 if (snsc_shutting_down)
                         return;
 
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index ce4db6f52362..f02a0795983f 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -4010,8 +4010,13 @@ static int mgsl_alloc_intermediate_txbuffer_memory(struct mgsl_struct *info)
         for ( i=0; i<info->num_tx_holding_buffers; ++i) {
                 info->tx_holding_buffers[i].buffer =
                         kmalloc(info->max_frame_size, GFP_KERNEL);
-                if ( info->tx_holding_buffers[i].buffer == NULL )
+                if (info->tx_holding_buffers[i].buffer == NULL) {
+                        for (--i; i >= 0; i--) {
+                                kfree(info->tx_holding_buffers[i].buffer);
+                                info->tx_holding_buffers[i].buffer = NULL;
+                        }
                         return -ENOMEM;
+                }
         }
 
         return 0;
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 0a367cd4121f..02b49bc00028 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1171,6 +1171,112 @@ static int ioctl(struct tty_struct *tty, struct file *file,
 }
 
 /*
+ * support for 32 bit ioctl calls on 64 bit systems
+ */
+#ifdef CONFIG_COMPAT
+static long get_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *user_params)
+{
+        struct MGSL_PARAMS32 tmp_params;
+
+        DBGINFO(("%s get_params32\n", info->device_name));
+        tmp_params.mode            = (compat_ulong_t)info->params.mode;
+        tmp_params.loopback        = info->params.loopback;
+        tmp_params.flags           = info->params.flags;
+        tmp_params.encoding        = info->params.encoding;
+        tmp_params.clock_speed     = (compat_ulong_t)info->params.clock_speed;
+        tmp_params.addr_filter     = info->params.addr_filter;
+        tmp_params.crc_type        = info->params.crc_type;
+        tmp_params.preamble_length = info->params.preamble_length;
+        tmp_params.preamble        = info->params.preamble;
+        tmp_params.data_rate       = (compat_ulong_t)info->params.data_rate;
+        tmp_params.data_bits       = info->params.data_bits;
+        tmp_params.stop_bits       = info->params.stop_bits;
+        tmp_params.parity          = info->params.parity;
+        if (copy_to_user(user_params, &tmp_params, sizeof(struct MGSL_PARAMS32)))
+                return -EFAULT;
+        return 0;
+}
+
+static long set_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *new_params)
+{
+        struct MGSL_PARAMS32 tmp_params;
+
+        DBGINFO(("%s set_params32\n", info->device_name));
+        if (copy_from_user(&tmp_params, new_params, sizeof(struct MGSL_PARAMS32)))
+                return -EFAULT;
+
+        spin_lock(&info->lock);
+        info->params.mode            = tmp_params.mode;
+        info->params.loopback        = tmp_params.loopback;
+        info->params.flags           = tmp_params.flags;
+        info->params.encoding        = tmp_params.encoding;
+        info->params.clock_speed     = tmp_params.clock_speed;
+        info->params.addr_filter     = tmp_params.addr_filter;
+        info->params.crc_type        = tmp_params.crc_type;
+        info->params.preamble_length = tmp_params.preamble_length;
+        info->params.preamble        = tmp_params.preamble;
+        info->params.data_rate       = tmp_params.data_rate;
+        info->params.data_bits       = tmp_params.data_bits;
+        info->params.stop_bits       = tmp_params.stop_bits;
+        info->params.parity          = tmp_params.parity;
+        spin_unlock(&info->lock);
+
+        change_params(info);
+
+        return 0;
+}
+
+static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
+                         unsigned int cmd, unsigned long arg)
+{
+        struct slgt_info *info = tty->driver_data;
+        int rc = -ENOIOCTLCMD;
+
+        if (sanity_check(info, tty->name, "compat_ioctl"))
+                return -ENODEV;
+        DBGINFO(("%s compat_ioctl() cmd=%08X\n", info->device_name, cmd));
+
+        switch (cmd) {
+
+        case MGSL_IOCSPARAMS32:
+                rc = set_params32(info, compat_ptr(arg));
+                break;
+
+        case MGSL_IOCGPARAMS32:
+                rc = get_params32(info, compat_ptr(arg));
+                break;
+
+        case MGSL_IOCGPARAMS:
+        case MGSL_IOCSPARAMS:
+        case MGSL_IOCGTXIDLE:
+        case MGSL_IOCGSTATS:
+        case MGSL_IOCWAITEVENT:
+        case MGSL_IOCGIF:
+        case MGSL_IOCSGPIO:
+        case MGSL_IOCGGPIO:
+        case MGSL_IOCWAITGPIO:
+        case TIOCGICOUNT:
+                rc = ioctl(tty, file, cmd, (unsigned long)(compat_ptr(arg)));
+                break;
+
+        case MGSL_IOCSTXIDLE:
+        case MGSL_IOCTXENABLE:
+        case MGSL_IOCRXENABLE:
+        case MGSL_IOCTXABORT:
+        case TIOCMIWAIT:
+        case MGSL_IOCSIF:
+                rc = ioctl(tty, file, cmd, arg);
+                break;
+        }
+
+        DBGINFO(("%s compat_ioctl() cmd=%08X rc=%d\n", info->device_name, cmd, rc));
+        return rc;
+}
+#else
+#define slgt_compat_ioctl NULL
+#endif /* ifdef CONFIG_COMPAT */
+
+/*
  * proc fs support
  */
 static inline int line_info(char *buf, struct slgt_info *info)
@@ -3415,6 +3521,9 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
                         }
                 }
         }
+
+        for (i=0; i < port_count; ++i)
+                tty_register_device(serial_driver, port_array[i]->line, &(port_array[i]->pdev->dev));
 }
 
 static int __devinit init_one(struct pci_dev *dev,
@@ -3443,6 +3552,7 @@ static const struct tty_operations ops = {
         .chars_in_buffer = chars_in_buffer,
         .flush_buffer = flush_buffer,
         .ioctl = ioctl,
+        .compat_ioctl = slgt_compat_ioctl,
         .throttle = throttle,
         .unthrottle = unthrottle,
         .send_xchar = send_xchar,
@@ -3466,6 +3576,8 @@ static void slgt_cleanup(void)
         printk("unload %s %s\n", driver_name, driver_version);
 
         if (serial_driver) {
+                for (info=slgt_device_list ; info != NULL ; info=info->next_device)
+                        tty_unregister_device(serial_driver, info->line);
                 if ((rc = tty_unregister_driver(serial_driver)))
                         DBGERR(("tty_unregister_driver error=%d\n", rc));
                 put_tty_driver(serial_driver);
@@ -3506,23 +3618,10 @@ static int __init slgt_init(void)
 
         printk("%s %s\n", driver_name, driver_version);
 
-        slgt_device_count = 0;
-        if ((rc = pci_register_driver(&pci_driver)) < 0) {
-                printk("%s pci_register_driver error=%d\n", driver_name, rc);
-                return rc;
-        }
-        pci_registered = 1;
-
-        if (!slgt_device_list) {
-                printk("%s no devices found\n",driver_name);
-                pci_unregister_driver(&pci_driver);
-                return -ENODEV;
-        }
-
         serial_driver = alloc_tty_driver(MAX_DEVICES);
         if (!serial_driver) {
-                rc = -ENOMEM;
-                goto error;
+                printk("%s can't allocate tty driver\n", driver_name);
+                return -ENOMEM;
         }
 
         /* Initialize the tty_driver structure */
@@ -3539,7 +3638,7 @@ static int __init slgt_init(void)
                 B9600 | CS8 | CREAD | HUPCL | CLOCAL;
         serial_driver->init_termios.c_ispeed = 9600;
         serial_driver->init_termios.c_ospeed = 9600;
-        serial_driver->flags = TTY_DRIVER_REAL_RAW;
+        serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         tty_set_operations(serial_driver, &ops);
         if ((rc = tty_register_driver(serial_driver)) < 0) {
                 DBGERR(("%s can't register serial driver\n", driver_name));
@@ -3552,6 +3651,16 @@ static int __init slgt_init(void)
                 driver_name, driver_version,
                 serial_driver->major);
 
+        slgt_device_count = 0;
+        if ((rc = pci_register_driver(&pci_driver)) < 0) {
+                printk("%s pci_register_driver error=%d\n", driver_name, rc);
+                goto error;
+        }
+        pci_registered = 1;
+
+        if (!slgt_device_list)
+                printk("%s no devices found\n",driver_name);
+
         return 0;
 
 error:
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 1d8c4ae61551..39cc318011ea 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -24,7 +24,6 @@
 #include <linux/sysrq.h>
 #include <linux/kbd_kern.h>
 #include <linux/quotaops.h>
-#include <linux/smp_lock.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 47fb20f69695..35b40b996534 100644
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -442,7 +442,7 @@ tipar_register(int nr, struct parport *port)
         }
 
         class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR,
-                        TIPAR_MINOR + nr), NULL, "par%d", nr);
+                        TIPAR_MINOR + nr), port->dev, "par%d", nr);
 
         /* Display informations */
         pr_info("tipar%d: using %s (%s)\n", nr, port->name, (port->irq ==
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index fe00c7dfb649..dc4e1ff7f56f 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "TPM devices"
+        depends on HAS_IOMEM
 
 config TCG_TPM
         tristate "TPM Hardware Support"
@@ -33,7 +34,7 @@ config TCG_NSC
         tristate "National Semiconductor TPM Interface"
         depends on TCG_TPM && PNPACPI
         ---help---
-          If you have a TPM security chip from National Semicondutor 
+          If you have a TPM security chip from National Semiconductor 
           say Yes and it will be accessible from within Linux.  To 
           compile this driver as a module, choose M here; the module 
           will be called tpm_nsc.
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index e5a254a434f8..9bb542913b86 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -24,7 +24,9 @@
  */
 
 #include <linux/poll.h>
+#include <linux/mutex.h>
 #include <linux/spinlock.h>
+
 #include "tpm.h"
 
 enum tpm_const {
@@ -328,10 +330,10 @@ static void timeout_work(struct work_struct *work)
 {
         struct tpm_chip *chip = container_of(work, struct tpm_chip, work);
 
-        down(&chip->buffer_mutex);
+        mutex_lock(&chip->buffer_mutex);
         atomic_set(&chip->data_pending, 0);
         memset(chip->data_buffer, 0, TPM_BUFSIZE);
-        up(&chip->buffer_mutex);
+        mutex_unlock(&chip->buffer_mutex);
 }
 
 /*
@@ -380,7 +382,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
                 return -E2BIG;
         }
 
-        down(&chip->tpm_mutex);
+        mutex_lock(&chip->tpm_mutex);
 
         if ((rc = chip->vendor.send(chip, (u8 *) buf, count)) < 0) {
                 dev_err(chip->dev,
@@ -419,7 +421,7 @@ out_recv:
                 dev_err(chip->dev,
                         "tpm_transmit: tpm_recv: error %zd\n", rc);
 out:
-        up(&chip->tpm_mutex);
+        mutex_unlock(&chip->tpm_mutex);
         return rc;
 }
 
@@ -942,12 +944,12 @@ int tpm_release(struct inode *inode, struct file *file)
 {
         struct tpm_chip *chip = file->private_data;
 
+        flush_scheduled_work();
         spin_lock(&driver_lock);
         file->private_data = NULL;
-        chip->num_opens--;
         del_singleshot_timer_sync(&chip->user_read_timer);
-        flush_scheduled_work();
         atomic_set(&chip->data_pending, 0);
+        chip->num_opens--;
         put_device(chip->dev);
         kfree(chip->data_buffer);
         spin_unlock(&driver_lock);
@@ -966,14 +968,14 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
         while (atomic_read(&chip->data_pending) != 0)
                 msleep(TPM_TIMEOUT);
 
-        down(&chip->buffer_mutex);
+        mutex_lock(&chip->buffer_mutex);
 
         if (in_size > TPM_BUFSIZE)
                 in_size = TPM_BUFSIZE;
 
         if (copy_from_user
             (chip->data_buffer, (void __user *) buf, in_size)) {
-                up(&chip->buffer_mutex);
+                mutex_unlock(&chip->buffer_mutex);
                 return -EFAULT;
         }
 
@@ -981,7 +983,7 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
         out_size = tpm_transmit(chip, chip->data_buffer, TPM_BUFSIZE);
 
         atomic_set(&chip->data_pending, out_size);
-        up(&chip->buffer_mutex);
+        mutex_unlock(&chip->buffer_mutex);
 
         /* Set a timeout by which the reader must come claim the result */
         mod_timer(&chip->user_read_timer, jiffies + (60 * HZ));
@@ -1004,10 +1006,10 @@ ssize_t tpm_read(struct file *file, char __user *buf,
                 if (size < ret_size)
                         ret_size = size;
 
-                down(&chip->buffer_mutex);
+                mutex_lock(&chip->buffer_mutex);
                 if (copy_to_user(buf, chip->data_buffer, ret_size))
                         ret_size = -EFAULT;
-                up(&chip->buffer_mutex);
+                mutex_unlock(&chip->buffer_mutex);
         }
 
         return ret_size;
@@ -1097,11 +1099,16 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
 
         /* Driver specific per-device data */
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL)
+        devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL);
+
+        if (chip == NULL || devname == NULL) {
+                kfree(chip);
+                kfree(devname);
                 return NULL;
+        }
 
-        init_MUTEX(&chip->buffer_mutex);
-        init_MUTEX(&chip->tpm_mutex);
+        mutex_init(&chip->buffer_mutex);
+        mutex_init(&chip->tpm_mutex);
         INIT_LIST_HEAD(&chip->list);
 
         INIT_WORK(&chip->work, timeout_work);
@@ -1124,7 +1131,6 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
 
         set_bit(chip->dev_num, dev_mask);
 
-        devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL);
         scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num);
         chip->vendor.miscdev.name = devname;
 
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 9f273f032b0f..b2e2b002a1bb 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
@@ -94,11 +95,11 @@ struct tpm_chip {
         /* Data passed to and from the tpm via the read/write calls */
         u8 *data_buffer;
         atomic_t data_pending;
-        struct semaphore buffer_mutex;
+        struct mutex buffer_mutex;
 
         struct timer_list user_read_timer;      /* user needs to claim result */
         struct work_struct work;
-        struct semaphore tpm_mutex;     /* tpm is processing */
+        struct mutex tpm_mutex; /* tpm is processing */
 
         struct tpm_vendor_specific vendor;
 
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index 3c852009196e..9363bcf0a402 100644
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -23,6 +23,9 @@
  */
 
 #ifdef CONFIG_PPC64
+
+#include <asm/prom.h>
+
 #define atmel_getb(chip, offset) readb(chip->vendor->iobase + offset);
 #define atmel_putb(val, chip, offset) writeb(val, chip->vendor->iobase + offset)
 #define atmel_request_region request_mem_region
@@ -47,12 +50,12 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
         if (!dn)
                 return NULL;
 
-        if (!device_is_compatible(dn, "AT97SC3201")) {
+        if (!of_device_is_compatible(dn, "AT97SC3201")) {
                 of_node_put(dn);
                 return NULL;
         }
 
-        reg = get_property(dn, "reg", &reglen);
+        reg = of_get_property(dn, "reg", &reglen);
         naddrc = of_n_addr_cells(dn);
         nsizec = of_n_size_cells(dn);
 
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 1353b5a6bae8..967002a5a1e5 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -30,12 +30,60 @@
 #define TPM_MAX_TRIES           5000
 #define TPM_INFINEON_DEV_VEN_VALUE      0x15D1
 
-/* These values will be filled after PnP-call */
-static int TPM_INF_DATA;
-static int TPM_INF_ADDR;
-static int TPM_INF_BASE;
-static int TPM_INF_ADDR_LEN;
-static int TPM_INF_PORT_LEN;
+#define TPM_INF_IO_PORT         0x0
+#define TPM_INF_IO_MEM          0x1
+
+#define TPM_INF_ADDR            0x0
+#define TPM_INF_DATA            0x1
+
+struct tpm_inf_dev {
+        int iotype;
+
+        void __iomem *mem_base;         /* MMIO ioremap'd addr */
+        unsigned long map_base;         /* phys MMIO base */
+        unsigned long map_size;         /* MMIO region size */
+        unsigned int index_off;         /* index register offset */
+
+        unsigned int data_regs;         /* Data registers */
+        unsigned int data_size;
+
+        unsigned int config_port;       /* IO Port config index reg */
+        unsigned int config_size;
+};
+
+static struct tpm_inf_dev tpm_dev;
+
+static inline void tpm_data_out(unsigned char data, unsigned char offset)
+{
+        if (tpm_dev.iotype == TPM_INF_IO_PORT)
+                outb(data, tpm_dev.data_regs + offset);
+        else
+                writeb(data, tpm_dev.mem_base + tpm_dev.data_regs + offset);
+}
+
+static inline unsigned char tpm_data_in(unsigned char offset)
+{
+        if (tpm_dev.iotype == TPM_INF_IO_PORT)
+                return inb(tpm_dev.data_regs + offset);
+        else
+                return readb(tpm_dev.mem_base + tpm_dev.data_regs + offset);
+}
+
+static inline void tpm_config_out(unsigned char data, unsigned char offset)
+{
+        if (tpm_dev.iotype == TPM_INF_IO_PORT)
+                outb(data, tpm_dev.config_port + offset);
+        else
+                writeb(data, tpm_dev.mem_base + tpm_dev.index_off + offset);
+}
+
+static inline unsigned char tpm_config_in(unsigned char offset)
+{
+        if (tpm_dev.iotype == TPM_INF_IO_PORT)
+                return inb(tpm_dev.config_port + offset);
+        else
+                return readb(tpm_dev.mem_base + tpm_dev.index_off + offset);
+}
 
 /* TPM header definitions */
 enum infineon_tpm_header {
@@ -105,7 +153,7 @@ static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo)
 
         if (clear_wrfifo) {
                 for (i = 0; i < 4096; i++) {
-                        status = inb(chip->vendor.base + WRFIFO);
+                        status = tpm_data_in(WRFIFO);
                         if (status == 0xff) {
                                 if (check == 5)
                                         break;
@@ -125,8 +173,8 @@ static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo)
          */
         i = 0;
         do {
-                status = inb(chip->vendor.base + RDFIFO);
-                status = inb(chip->vendor.base + STAT);
+                status = tpm_data_in(RDFIFO);
+                status = tpm_data_in(STAT);
                 i++;
                 if (i == TPM_MAX_TRIES)
                         return -EIO;
@@ -139,7 +187,7 @@ static int wait(struct tpm_chip *chip, int wait_for_bit)
         int status;
         int i;
         for (i = 0; i < TPM_MAX_TRIES; i++) {
-                status = inb(chip->vendor.base + STAT);
+                status = tpm_data_in(STAT);
                 /* check the status-register if wait_for_bit is set */
                 if (status & 1 << wait_for_bit)
                         break;
@@ -158,7 +206,7 @@ static int wait(struct tpm_chip *chip, int wait_for_bit)
 static void wait_and_send(struct tpm_chip *chip, u8 sendbyte)
 {
         wait(chip, STAT_XFE);
-        outb(sendbyte, chip->vendor.base + WRFIFO);
+        tpm_data_out(sendbyte, WRFIFO);
 }
 
     /* Note: WTX means Waiting-Time-Extension. Whenever the TPM needs more
@@ -205,7 +253,7 @@ recv_begin:
                 ret = wait(chip, STAT_RDA);
                 if (ret)
                         return -EIO;
-                buf[i] = inb(chip->vendor.base + RDFIFO);
+                buf[i] = tpm_data_in(RDFIFO);
         }
 
         if (buf[0] != TPM_VL_VER) {
@@ -220,7 +268,7 @@ recv_begin:
 
                 for (i = 0; i < size; i++) {
                         wait(chip, STAT_RDA);
-                        buf[i] = inb(chip->vendor.base + RDFIFO);
+                        buf[i] = tpm_data_in(RDFIFO);
                 }
 
                 if ((size == 0x6D00) && (buf[1] == 0x80)) {
@@ -269,7 +317,7 @@ static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count)
         u8 count_high, count_low, count_4, count_3, count_2, count_1;
 
         /* Disabling Reset, LP and IRQC */
-        outb(RESET_LP_IRQC_DISABLE, chip->vendor.base + CMD);
+        tpm_data_out(RESET_LP_IRQC_DISABLE, CMD);
 
         ret = empty_fifo(chip, 1);
         if (ret) {
@@ -320,7 +368,7 @@ static void tpm_inf_cancel(struct tpm_chip *chip)
 
 static u8 tpm_inf_status(struct tpm_chip *chip)
 {
-        return inb(chip->vendor.base + STAT);
+        return tpm_data_in(STAT);
 }
 
 static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL);
@@ -381,51 +429,88 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
         /* read IO-ports through PnP */
         if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) &&
             !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) {
-                TPM_INF_ADDR = pnp_port_start(dev, 0);
-                TPM_INF_ADDR_LEN = pnp_port_len(dev, 0);
-                TPM_INF_DATA = (TPM_INF_ADDR + 1);
-                TPM_INF_BASE = pnp_port_start(dev, 1);
-                TPM_INF_PORT_LEN = pnp_port_len(dev, 1);
-                if ((TPM_INF_PORT_LEN < 4) || (TPM_INF_ADDR_LEN < 2)) {
+
+                tpm_dev.iotype = TPM_INF_IO_PORT;
+
+                tpm_dev.config_port = pnp_port_start(dev, 0);
+                tpm_dev.config_size = pnp_port_len(dev, 0);
+                tpm_dev.data_regs = pnp_port_start(dev, 1);
+                tpm_dev.data_size = pnp_port_len(dev, 1);
+                if ((tpm_dev.data_size < 4) || (tpm_dev.config_size < 2)) {
                         rc = -EINVAL;
                         goto err_last;
                 }
                 dev_info(&dev->dev, "Found %s with ID %s\n",
                          dev->name, dev_id->id);
-                if (!((TPM_INF_BASE >> 8) & 0xff)) {
+                if (!((tpm_dev.data_regs >> 8) & 0xff)) {
                         rc = -EINVAL;
                         goto err_last;
                 }
                 /* publish my base address and request region */
-                if (request_region
-                    (TPM_INF_BASE, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) {
+                if (request_region(tpm_dev.data_regs, tpm_dev.data_size,
+                                   "tpm_infineon0") == NULL) {
                         rc = -EINVAL;
                         goto err_last;
                 }
-                if (request_region
-                    (TPM_INF_ADDR, TPM_INF_ADDR_LEN, "tpm_infineon0") == NULL) {
+                if (request_region(tpm_dev.config_port, tpm_dev.config_size,
+                                   "tpm_infineon0") == NULL) {
+                        release_region(tpm_dev.data_regs, tpm_dev.data_size);
                         rc = -EINVAL;
                         goto err_last;
                 }
+        } else if (pnp_mem_valid(dev, 0) &&
+                   !(pnp_mem_flags(dev, 0) & IORESOURCE_DISABLED)) {
+
+                tpm_dev.iotype = TPM_INF_IO_MEM;
+
+                tpm_dev.map_base = pnp_mem_start(dev, 0);
+                tpm_dev.map_size = pnp_mem_len(dev, 0);
+
+                dev_info(&dev->dev, "Found %s with ID %s\n",
+                         dev->name, dev_id->id);
+
+                /* publish my base address and request region */
+                if (request_mem_region(tpm_dev.map_base, tpm_dev.map_size,
+                                       "tpm_infineon0") == NULL) {
+                        rc = -EINVAL;
+                        goto err_last;
+                }
+
+                tpm_dev.mem_base = ioremap(tpm_dev.map_base, tpm_dev.map_size);
+                if (tpm_dev.mem_base == NULL) {
+                        release_mem_region(tpm_dev.map_base, tpm_dev.map_size);
+                        rc = -EINVAL;
+                        goto err_last;
+                }
+
+                /*
+                 * The only known MMIO based Infineon TPM system provides
+                 * a single large mem region with the device config
+                 * registers at the default TPM_ADDR.  The data registers
+                 * seem like they could be placed anywhere within the MMIO
+                 * region, but lets just put them at zero offset.
+                 */
+                tpm_dev.index_off = TPM_ADDR;
+                tpm_dev.data_regs = 0x0;
         } else {
                 rc = -EINVAL;
                 goto err_last;
         }
 
         /* query chip for its vendor, its version number a.s.o. */
-        outb(ENABLE_REGISTER_PAIR, TPM_INF_ADDR);
-        outb(IDVENL, TPM_INF_ADDR);
-        vendorid[1] = inb(TPM_INF_DATA);
-        outb(IDVENH, TPM_INF_ADDR);
-        vendorid[0] = inb(TPM_INF_DATA);
-        outb(IDPDL, TPM_INF_ADDR);
-        productid[1] = inb(TPM_INF_DATA);
-        outb(IDPDH, TPM_INF_ADDR);
-        productid[0] = inb(TPM_INF_DATA);
-        outb(CHIP_ID1, TPM_INF_ADDR);
-        version[1] = inb(TPM_INF_DATA);
-        outb(CHIP_ID2, TPM_INF_ADDR);
-        version[0] = inb(TPM_INF_DATA);
+        tpm_config_out(ENABLE_REGISTER_PAIR, TPM_INF_ADDR);
+        tpm_config_out(IDVENL, TPM_INF_ADDR);
+        vendorid[1] = tpm_config_in(TPM_INF_DATA);
+        tpm_config_out(IDVENH, TPM_INF_ADDR);
+        vendorid[0] = tpm_config_in(TPM_INF_DATA);
+        tpm_config_out(IDPDL, TPM_INF_ADDR);
+        productid[1] = tpm_config_in(TPM_INF_DATA);
+        tpm_config_out(IDPDH, TPM_INF_ADDR);
+        productid[0] = tpm_config_in(TPM_INF_DATA);
+        tpm_config_out(CHIP_ID1, TPM_INF_ADDR);
+        version[1] = tpm_config_in(TPM_INF_DATA);
+        tpm_config_out(CHIP_ID2, TPM_INF_ADDR);
+        version[0] = tpm_config_in(TPM_INF_DATA);
 
         switch ((productid[0] << 8) | productid[1]) {
         case 6:
@@ -442,51 +527,54 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
         if ((vendorid[0] << 8 | vendorid[1]) == (TPM_INFINEON_DEV_VEN_VALUE)) {
 
                 /* configure TPM with IO-ports */
-                outb(IOLIMH, TPM_INF_ADDR);
-                outb(((TPM_INF_BASE >> 8) & 0xff), TPM_INF_DATA);
-                outb(IOLIML, TPM_INF_ADDR);
-                outb((TPM_INF_BASE & 0xff), TPM_INF_DATA);
+                tpm_config_out(IOLIMH, TPM_INF_ADDR);
+                tpm_config_out((tpm_dev.data_regs >> 8) & 0xff, TPM_INF_DATA);
+                tpm_config_out(IOLIML, TPM_INF_ADDR);
+                tpm_config_out((tpm_dev.data_regs & 0xff), TPM_INF_DATA);
 
                 /* control if IO-ports are set correctly */
-                outb(IOLIMH, TPM_INF_ADDR);
-                ioh = inb(TPM_INF_DATA);
-                outb(IOLIML, TPM_INF_ADDR);
-                iol = inb(TPM_INF_DATA);
+                tpm_config_out(IOLIMH, TPM_INF_ADDR);
+                ioh = tpm_config_in(TPM_INF_DATA);
+                tpm_config_out(IOLIML, TPM_INF_ADDR);
+                iol = tpm_config_in(TPM_INF_DATA);
 
-                if ((ioh << 8 | iol) != TPM_INF_BASE) {
+                if ((ioh << 8 | iol) != tpm_dev.data_regs) {
                         dev_err(&dev->dev,
-                                "Could not set IO-ports to 0x%x\n",
-                                TPM_INF_BASE);
+                                "Could not set IO-data registers to 0x%x\n",
+                                tpm_dev.data_regs);
                         rc = -EIO;
                         goto err_release_region;
                 }
 
                 /* activate register */
-                outb(TPM_DAR, TPM_INF_ADDR);
-                outb(0x01, TPM_INF_DATA);
-                outb(DISABLE_REGISTER_PAIR, TPM_INF_ADDR);
+                tpm_config_out(TPM_DAR, TPM_INF_ADDR);
+                tpm_config_out(0x01, TPM_INF_DATA);
+                tpm_config_out(DISABLE_REGISTER_PAIR, TPM_INF_ADDR);
 
                 /* disable RESET, LP and IRQC */
-                outb(RESET_LP_IRQC_DISABLE, TPM_INF_BASE + CMD);
+                tpm_data_out(RESET_LP_IRQC_DISABLE, CMD);
 
                 /* Finally, we're done, print some infos */
                 dev_info(&dev->dev, "TPM found: "
-                         "config base 0x%x, "
-                         "io base 0x%x, "
+                         "config base 0x%lx, "
+                         "data base 0x%lx, "
                          "chip version 0x%02x%02x, "
                          "vendor id 0x%x%x (Infineon), "
                          "product id 0x%02x%02x"
                          "%s\n",
-                         TPM_INF_ADDR,
-                         TPM_INF_BASE,
+                         tpm_dev.iotype == TPM_INF_IO_PORT ?
+                                tpm_dev.config_port :
+                                tpm_dev.map_base + tpm_dev.index_off,
+                         tpm_dev.iotype == TPM_INF_IO_PORT ?
+                                tpm_dev.data_regs :
+                                tpm_dev.map_base + tpm_dev.data_regs,
                          version[0], version[1],
                          vendorid[0], vendorid[1],
                          productid[0], productid[1], chipname);
 
-                if (!(chip = tpm_register_hardware(&dev->dev, &tpm_inf))) {
+                if (!(chip = tpm_register_hardware(&dev->dev, &tpm_inf)))
                         goto err_release_region;
-                }
-                chip->vendor.base = TPM_INF_BASE;
+
                 return 0;
         } else {
                 rc = -ENODEV;
@@ -494,8 +582,13 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
         }
 
 err_release_region:
-        release_region(TPM_INF_BASE, TPM_INF_PORT_LEN);
-        release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN);
+        if (tpm_dev.iotype == TPM_INF_IO_PORT) {
+                release_region(tpm_dev.data_regs, tpm_dev.data_size);
+                release_region(tpm_dev.config_port, tpm_dev.config_size);
+        } else {
+                iounmap(tpm_dev.mem_base);
+                release_mem_region(tpm_dev.map_base, tpm_dev.map_size);
+        }
 
 err_last:
         return rc;
@@ -506,8 +599,14 @@ static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev)
         struct tpm_chip *chip = pnp_get_drvdata(dev);
 
         if (chip) {
-                release_region(TPM_INF_BASE, TPM_INF_PORT_LEN);
-                release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN);
+                if (tpm_dev.iotype == TPM_INF_IO_PORT) {
+                        release_region(tpm_dev.data_regs, tpm_dev.data_size);
+                        release_region(tpm_dev.config_port,
+                                       tpm_dev.config_size);
+                } else {
+                        iounmap(tpm_dev.mem_base);
+                        release_mem_region(tpm_dev.map_base, tpm_dev.map_size);
+                }
                 tpm_remove_hardware(chip->dev);
         }
 }
@@ -539,5 +638,5 @@ module_exit(cleanup_inf);
 
 MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>");
 MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");
-MODULE_VERSION("1.8");
+MODULE_VERSION("1.9");
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 389da364e6b6..75d2a46e106f 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -141,8 +141,6 @@ static DECLARE_MUTEX(allocated_ptys_lock);
 static int ptmx_open(struct inode *, struct file *);
 #endif
 
-extern void disable_early_printk(void);
-
 static void initialize_tty_struct(struct tty_struct *tty);
 
 static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
@@ -153,10 +151,16 @@ static int tty_open(struct inode *, struct file *);
 static int tty_release(struct inode *, struct file *);
 int tty_ioctl(struct inode * inode, struct file * file,
               unsigned int cmd, unsigned long arg);
+#ifdef CONFIG_COMPAT
+static long tty_compat_ioctl(struct file * file, unsigned int cmd,
+                                unsigned long arg);
+#else
+#define tty_compat_ioctl NULL
+#endif
 static int tty_fasync(int fd, struct file * filp, int on);
 static void release_tty(struct tty_struct *tty, int idx);
-static struct pid *__proc_set_tty(struct task_struct *tsk,
-                                struct tty_struct *tty);
+static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
 
 /**
  *      alloc_tty_struct        -       allocate a tty object
@@ -365,6 +369,29 @@ static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)
 }
 
 /**
+ *      tty_buffer_flush                -       flush full tty buffers
+ *      @tty: tty to flush
+ *
+ *      flush all the buffers containing receive data
+ *
+ *      Locking: none
+ */
+
+static void tty_buffer_flush(struct tty_struct *tty)
+{
+        struct tty_buffer *thead;
+        unsigned long flags;
+
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        while((thead = tty->buf.head) != NULL) {
+                tty->buf.head = thead->next;
+                tty_buffer_free(tty, thead);
+        }
+        tty->buf.tail = NULL;
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+}
+
+/**
  *      tty_buffer_find         -       find a free tty buffer
  *      @tty: tty owning the buffer
  *      @size: characters wanted
@@ -936,13 +963,6 @@ restart:
                 return -EINVAL;
 
         /*
-         *      No more input please, we are switching. The new ldisc
-         *      will update this value in the ldisc open function
-         */
-
-        tty->receive_room = 0;
-
-        /*
          *      Problem: What do we do if this blocks ?
          */
 
@@ -953,6 +973,13 @@ restart:
                 return 0;
         }
 
+        /*
+         *      No more input please, we are switching. The new ldisc
+         *      will update this value in the ldisc open function
+         */
+
+        tty->receive_room = 0;
+
         o_ldisc = tty->ldisc;
         o_tty = tty->link;
 
@@ -1145,8 +1172,8 @@ static unsigned int hung_up_tty_poll(struct file * filp, poll_table * wait)
         return POLLIN | POLLOUT | POLLERR | POLLHUP | POLLRDNORM | POLLWRNORM;
 }
 
-static int hung_up_tty_ioctl(struct inode * inode, struct file * file,
-                             unsigned int cmd, unsigned long arg)
+static long hung_up_tty_ioctl(struct file * file,
+                              unsigned int cmd, unsigned long arg)
 {
         return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
 }
@@ -1157,6 +1184,7 @@ static const struct file_operations tty_fops = {
         .write          = tty_write,
         .poll           = tty_poll,
         .ioctl          = tty_ioctl,
+        .compat_ioctl   = tty_compat_ioctl,
         .open           = tty_open,
         .release        = tty_release,
         .fasync         = tty_fasync,
@@ -1169,6 +1197,7 @@ static const struct file_operations ptmx_fops = {
         .write          = tty_write,
         .poll           = tty_poll,
         .ioctl          = tty_ioctl,
+        .compat_ioctl   = tty_compat_ioctl,
         .open           = ptmx_open,
         .release        = tty_release,
         .fasync         = tty_fasync,
@@ -1181,6 +1210,7 @@ static const struct file_operations console_fops = {
         .write          = redirected_tty_write,
         .poll           = tty_poll,
         .ioctl          = tty_ioctl,
+        .compat_ioctl   = tty_compat_ioctl,
         .open           = tty_open,
         .release        = tty_release,
         .fasync         = tty_fasync,
@@ -1191,7 +1221,8 @@ static const struct file_operations hung_up_tty_fops = {
         .read           = hung_up_tty_read,
         .write          = hung_up_tty_write,
         .poll           = hung_up_tty_poll,
-        .ioctl          = hung_up_tty_ioctl,
+        .unlocked_ioctl = hung_up_tty_ioctl,
+        .compat_ioctl   = hung_up_tty_ioctl,
         .release        = tty_release,
 };
 
@@ -1240,6 +1271,7 @@ void tty_ldisc_flush(struct tty_struct *tty)
                         ld->flush_buffer(tty);
                 tty_ldisc_deref(ld);
         }
+        tty_buffer_flush(tty);
 }
 
 EXPORT_SYMBOL_GPL(tty_ldisc_flush);
@@ -1534,10 +1566,9 @@ void disassociate_ctty(int on_exit)
         }
 
         spin_lock_irq(&current->sighand->siglock);
-        tty_pgrp = current->signal->tty_old_pgrp;
+        put_pid(current->signal->tty_old_pgrp);
         current->signal->tty_old_pgrp = NULL;
         spin_unlock_irq(&current->sighand->siglock);
-        put_pid(tty_pgrp);
 
         mutex_lock(&tty_mutex);
         /* It is possible that do_tty_hangup has free'd this tty */
@@ -1562,13 +1593,25 @@ void disassociate_ctty(int on_exit)
         unlock_kernel();
 }
 
+/**
+ *
+ *      no_tty  - Ensure the current process does not have a controlling tty
+ */
+void no_tty(void)
+{
+        struct task_struct *tsk = current;
+        if (tsk->signal->leader)
+                disassociate_ctty(0);
+        proc_clear_tty(tsk);
+}
+
 
 /**
- *      stop_tty        -       propogate flow control
+ *      stop_tty        -       propagate flow control
  *      @tty: tty to stop
  *
  *      Perform flow control to the driver. For PTY/TTY pairs we
- *      must also propogate the TIOCKPKT status. May be called
+ *      must also propagate the TIOCKPKT status. May be called
  *      on an already stopped device and will not re-call the driver
  *      method.
  *
@@ -1598,11 +1641,11 @@ void stop_tty(struct tty_struct *tty)
 EXPORT_SYMBOL(stop_tty);
 
 /**
- *      start_tty       -       propogate flow control
+ *      start_tty       -       propagate flow control
  *      @tty: tty to start
  *
  *      Start a tty that has been stopped if at all possible. Perform
- *      any neccessary wakeups and propogate the TIOCPKT status. If this
+ *      any neccessary wakeups and propagate the TIOCPKT status. If this
  *      is the tty was previous stopped and is being started then the
  *      driver start method is invoked and the line discipline woken.
  *
@@ -2508,7 +2551,6 @@ static int tty_open(struct inode * inode, struct file * filp)
         int index;
         dev_t device = inode->i_rdev;
         unsigned short saved_flags = filp->f_flags;
-        struct pid *old_pgrp;
 
         nonseekable_open(inode, filp);
         
@@ -2602,17 +2644,15 @@ got_driver:
                 goto retry_open;
         }
 
-        old_pgrp = NULL;
         mutex_lock(&tty_mutex);
         spin_lock_irq(&current->sighand->siglock);
         if (!noctty &&
             current->signal->leader &&
             !current->signal->tty &&
             tty->session == NULL)
-                old_pgrp = __proc_set_tty(current, tty);
+                __proc_set_tty(current, tty);
         spin_unlock_irq(&current->sighand->siglock);
         mutex_unlock(&tty_mutex);
-        put_pid(old_pgrp);
         return 0;
 }
 
@@ -3287,9 +3327,7 @@ int tty_ioctl(struct inode * inode, struct file * file,
                 case TIOCNOTTY:
                         if (current->signal->tty != tty)
                                 return -ENOTTY;
-                        if (current->signal->leader)
-                                disassociate_ctty(0);
-                        proc_clear_tty(current);
+                        no_tty();
                         return 0;
                 case TIOCSCTTY:
                         return tiocsctty(tty, arg);
@@ -3336,6 +3374,15 @@ int tty_ioctl(struct inode * inode, struct file * file,
                 case TIOCMBIC:
                 case TIOCMBIS:
                         return tty_tiocmset(tty, file, cmd, p);
+                case TCFLSH:
+                        switch (arg) {
+                        case TCIFLUSH:
+                        case TCIOFLUSH:
+                                /* flush tty buffer and allow ldisc to process ioctl */
+                                tty_buffer_flush(tty);
+                                break;
+                        }
+                        break;
         }
         if (tty->driver->ioctl) {
                 retval = (tty->driver->ioctl)(tty, file, cmd, arg);
@@ -3353,6 +3400,32 @@ int tty_ioctl(struct inode * inode, struct file * file,
         return retval;
 }
 
+#ifdef CONFIG_COMPAT
+static long tty_compat_ioctl(struct file * file, unsigned int cmd,
+                                unsigned long arg)
+{
+        struct inode *inode = file->f_dentry->d_inode;
+        struct tty_struct *tty = file->private_data;
+        struct tty_ldisc *ld;
+        int retval = -ENOIOCTLCMD;
+
+        if (tty_paranoia_check(tty, inode, "tty_ioctl"))
+                return -EINVAL;
+
+        if (tty->driver->compat_ioctl) {
+                retval = (tty->driver->compat_ioctl)(tty, file, cmd, arg);
+                if (retval != -ENOIOCTLCMD)
+                        return retval;
+        }
+
+        ld = tty_ldisc_ref_wait(tty);
+        if (ld->compat_ioctl)
+                retval = ld->compat_ioctl(tty, file, cmd, arg);
+        tty_ldisc_deref(ld);
+
+        return retval;
+}
+#endif
 
 /*
  * This implements the "Secure Attention Key" ---  the idea is to
@@ -3685,6 +3758,7 @@ void tty_set_operations(struct tty_driver *driver,
         driver->write_room = op->write_room;
         driver->chars_in_buffer = op->chars_in_buffer;
         driver->ioctl = op->ioctl;
+        driver->compat_ioctl = op->compat_ioctl;
         driver->set_termios = op->set_termios;
         driver->throttle = op->throttle;
         driver->unthrottle = op->unthrottle;
@@ -3766,7 +3840,9 @@ int tty_register_driver(struct tty_driver *driver)
         if (!driver->put_char)
                 driver->put_char = tty_default_put_char;
         
+        mutex_lock(&tty_mutex);
         list_add(&driver->tty_drivers, &tty_drivers);
+        mutex_unlock(&tty_mutex);
         
         if ( !(driver->flags & TTY_DRIVER_DYNAMIC_DEV) ) {
                 for(i = 0; i < driver->num; i++)
@@ -3792,8 +3868,9 @@ int tty_unregister_driver(struct tty_driver *driver)
 
         unregister_chrdev_region(MKDEV(driver->major, driver->minor_start),
                                 driver->num);
-
+        mutex_lock(&tty_mutex);
         list_del(&driver->tty_drivers);
+        mutex_unlock(&tty_mutex);
 
         /*
          * Free the termios and termios_locked structures because
@@ -3838,9 +3915,8 @@ void proc_clear_tty(struct task_struct *p)
 }
 EXPORT_SYMBOL(proc_clear_tty);
 
-static struct pid *__proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
+static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
 {
-        struct pid *old_pgrp;
         if (tty) {
                 /* We should not have a session or pgrp to here but.... */
                 put_pid(tty->session);
@@ -3848,21 +3924,16 @@ static struct pid *__proc_set_tty(struct task_struct *tsk, struct tty_struct *tt
                 tty->session = get_pid(task_session(tsk));
                 tty->pgrp = get_pid(task_pgrp(tsk));
         }
-        old_pgrp = tsk->signal->tty_old_pgrp;
+        put_pid(tsk->signal->tty_old_pgrp);
         tsk->signal->tty = tty;
         tsk->signal->tty_old_pgrp = NULL;
-        return old_pgrp;
 }
 
-void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
+static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
 {
-        struct pid *old_pgrp;
-
         spin_lock_irq(&tsk->sighand->siglock);
-        old_pgrp = __proc_set_tty(tsk, tty);
+        __proc_set_tty(tsk, tty);
         spin_unlock_irq(&tsk->sighand->siglock);
-
-        put_pid(old_pgrp);
 }
 
 struct tty_struct *get_current_tty(void)
@@ -3897,9 +3968,6 @@ void __init console_init(void)
          * set up the console device so that later boot sequences can 
          * inform about problems etc..
          */
-#ifdef CONFIG_EARLY_PRINTK
-        disable_early_printk();
-#endif
         call = __con_initcall_start;
         while (call < __con_initcall_end) {
                 (*call)();
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 791930320a13..83aeedda200c 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -28,12 +28,13 @@
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/kbd_kern.h>
 #include <linux/console.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
+
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
@@ -70,11 +71,11 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
 {
         int size;
 
-        down(&con_buf_sem);
+        mutex_lock(&con_buf_mtx);
         size = vcs_size(file->f_path.dentry->d_inode);
         switch (orig) {
                 default:
-                        up(&con_buf_sem);
+                        mutex_unlock(&con_buf_mtx);
                         return -EINVAL;
                 case 2:
                         offset += size;
@@ -85,11 +86,11 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
                         break;
         }
         if (offset < 0 || offset > size) {
-                up(&con_buf_sem);
+                mutex_unlock(&con_buf_mtx);
                 return -EINVAL;
         }
         file->f_pos = offset;
-        up(&con_buf_sem);
+        mutex_unlock(&con_buf_mtx);
         return file->f_pos;
 }
 
@@ -106,7 +107,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         unsigned short *org = NULL;
         ssize_t ret;
 
-        down(&con_buf_sem);
+        mutex_lock(&con_buf_mtx);
 
         pos = *ppos;
 
@@ -263,7 +264,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 ret = read;
 unlock_out:
         release_console_sem();
-        up(&con_buf_sem);
+        mutex_unlock(&con_buf_mtx);
         return ret;
 }
 
@@ -280,7 +281,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         u16 *org0 = NULL, *org = NULL;
         size_t ret;
 
-        down(&con_buf_sem);
+        mutex_lock(&con_buf_mtx);
 
         pos = *ppos;
 
@@ -450,7 +451,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 unlock_out:
         release_console_sem();
 
-        up(&con_buf_sem);
+        mutex_unlock(&con_buf_mtx);
 
         return ret;
 }
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 1bbb45b937fd..bbd9fc412877 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -86,6 +86,7 @@
 #include <linux/mm.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/tiocl.h>
@@ -157,6 +158,8 @@ static void blank_screen_t(unsigned long dummy);
 static void set_palette(struct vc_data *vc);
 
 static int printable;           /* Is console ready for printing? */
+static int default_utf8;
+module_param(default_utf8, int, S_IRUGO | S_IWUSR);
 
 /*
  * ignore_poke: don't unblank the screen when things are typed.  This is
@@ -348,10 +351,12 @@ void update_region(struct vc_data *vc, unsigned long start, int count)
 
 /* Structure of attributes is hardware-dependent */
 
-static u8 build_attr(struct vc_data *vc, u8 _color, u8 _intensity, u8 _blink, u8 _underline, u8 _reverse)
+static u8 build_attr(struct vc_data *vc, u8 _color, u8 _intensity, u8 _blink,
+    u8 _underline, u8 _reverse, u8 _italic)
 {
         if (vc->vc_sw->con_build_attr)
-                return vc->vc_sw->con_build_attr(vc, _color, _intensity, _blink, _underline, _reverse);
+                return vc->vc_sw->con_build_attr(vc, _color, _intensity,
+                       _blink, _underline, _reverse, _italic);
 
 #ifndef VT_BUF_VRAM_ONLY
 /*
@@ -368,10 +373,13 @@ static u8 build_attr(struct vc_data *vc, u8 _color, u8 _intensity, u8 _blink, u8
         u8 a = vc->vc_color;
         if (!vc->vc_can_do_color)
                 return _intensity |
+                       (_italic ? 2 : 0) |
                        (_underline ? 4 : 0) |
                        (_reverse ? 8 : 0) |
                        (_blink ? 0x80 : 0);
-        if (_underline)
+        if (_italic)
+                a = (a & 0xF0) | vc->vc_itcolor;
+        else if (_underline)
                 a = (a & 0xf0) | vc->vc_ulcolor;
         else if (_intensity == 0)
                 a = (a & 0xf0) | vc->vc_ulcolor;
@@ -392,8 +400,10 @@ static u8 build_attr(struct vc_data *vc, u8 _color, u8 _intensity, u8 _blink, u8
 
 static void update_attr(struct vc_data *vc)
 {
-        vc->vc_attr = build_attr(vc, vc->vc_color, vc->vc_intensity, vc->vc_blink, vc->vc_underline, vc->vc_reverse ^ vc->vc_decscnm);
-        vc->vc_video_erase_char = (build_attr(vc, vc->vc_color, 1, vc->vc_blink, 0, vc->vc_decscnm) << 8) | ' ';
+        vc->vc_attr = build_attr(vc, vc->vc_color, vc->vc_intensity,
+                      vc->vc_blink, vc->vc_underline,
+                      vc->vc_reverse ^ vc->vc_decscnm, vc->vc_italic);
+        vc->vc_video_erase_char = (build_attr(vc, vc->vc_color, 1, vc->vc_blink, 0, vc->vc_decscnm, 0) << 8) | ' ';
 }
 
 /* Note: inverting the screen twice should revert to the original state */
@@ -934,6 +944,10 @@ int default_grn[] = {0x00,0x00,0xaa,0x55,0x00,0x00,0xaa,0xaa,
 int default_blu[] = {0x00,0x00,0x00,0x00,0xaa,0xaa,0xaa,0xaa,
     0x55,0x55,0x55,0x55,0xff,0xff,0xff,0xff};
 
+module_param_array(default_red, int, NULL, S_IRUGO | S_IWUSR);
+module_param_array(default_grn, int, NULL, S_IRUGO | S_IWUSR);
+module_param_array(default_blu, int, NULL, S_IRUGO | S_IWUSR);
+
 /*
  * gotoxy() must verify all boundaries, because the arguments
  * might also be negative. If the given position is out of
@@ -1132,6 +1146,7 @@ static void csi_X(struct vc_data *vc, int vpar) /* erase the following vpar posi
 static void default_attr(struct vc_data *vc)
 {
         vc->vc_intensity = 1;
+        vc->vc_italic = 0;
         vc->vc_underline = 0;
         vc->vc_reverse = 0;
         vc->vc_blink = 0;
@@ -1154,6 +1169,9 @@ static void csi_m(struct vc_data *vc)
                         case 2:
                                 vc->vc_intensity = 0;
                                 break;
+                        case 3:
+                                vc->vc_italic = 1;
+                                break;
                         case 4:
                                 vc->vc_underline = 1;
                                 break;
@@ -1194,6 +1212,9 @@ static void csi_m(struct vc_data *vc)
                         case 22:
                                 vc->vc_intensity = 1;
                                 break;
+                        case 23:
+                                vc->vc_italic = 0;
+                                break;
                         case 24:
                                 vc->vc_underline = 0;
                                 break;
@@ -1454,6 +1475,7 @@ static void save_cur(struct vc_data *vc)
         vc->vc_saved_x          = vc->vc_x;
         vc->vc_saved_y          = vc->vc_y;
         vc->vc_s_intensity      = vc->vc_intensity;
+        vc->vc_s_italic         = vc->vc_italic;
         vc->vc_s_underline      = vc->vc_underline;
         vc->vc_s_blink          = vc->vc_blink;
         vc->vc_s_reverse        = vc->vc_reverse;
@@ -1468,6 +1490,7 @@ static void restore_cur(struct vc_data *vc)
 {
         gotoxy(vc, vc->vc_saved_x, vc->vc_saved_y);
         vc->vc_intensity        = vc->vc_s_intensity;
+        vc->vc_italic           = vc->vc_s_italic;
         vc->vc_underline        = vc->vc_s_underline;
         vc->vc_blink            = vc->vc_s_blink;
         vc->vc_reverse          = vc->vc_s_reverse;
@@ -1497,7 +1520,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
         vc->vc_charset          = 0;
         vc->vc_need_wrap        = 0;
         vc->vc_report_mouse     = 0;
-        vc->vc_utf              = 0;
+        vc->vc_utf              = default_utf8;
         vc->vc_utf_count        = 0;
 
         vc->vc_disp_ctrl        = 0;
@@ -1930,7 +1953,47 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
  * kernel memory allocation is available.
  */
 char con_buf[CON_BUF_SIZE];
-DECLARE_MUTEX(con_buf_sem);
+DEFINE_MUTEX(con_buf_mtx);
+
+/* is_double_width() is based on the wcwidth() implementation by
+ * Markus Kuhn -- 2003-05-20 (Unicode 4.0)
+ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ */
+struct interval {
+        uint32_t first;
+        uint32_t last;
+};
+
+static int bisearch(uint32_t ucs, const struct interval *table, int max)
+{
+        int min = 0;
+        int mid;
+
+        if (ucs < table[0].first || ucs > table[max].last)
+                return 0;
+        while (max >= min) {
+                mid = (min + max) / 2;
+                if (ucs > table[mid].last)
+                        min = mid + 1;
+                else if (ucs < table[mid].first)
+                        max = mid - 1;
+                else
+                        return 1;
+        }
+        return 0;
+}
+
+static int is_double_width(uint32_t ucs)
+{
+        static const struct interval double_width[] = {
+                { 0x1100, 0x115F }, { 0x2329, 0x232A }, { 0x2E80, 0x303E },
+                { 0x3040, 0xA4CF }, { 0xAC00, 0xD7A3 }, { 0xF900, 0xFAFF },
+                { 0xFE30, 0xFE6F }, { 0xFF00, 0xFF60 }, { 0xFFE0, 0xFFE6 },
+                { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD }
+        };
+        return bisearch(ucs, double_width,
+                sizeof(double_width) / sizeof(*double_width) - 1);
+}
 
 /* acquires console_sem */
 static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int count)
@@ -1948,6 +2011,10 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
         unsigned int currcons;
         unsigned long draw_from = 0, draw_to = 0;
         struct vc_data *vc;
+        unsigned char vc_attr;
+        uint8_t rescan;
+        uint8_t inverse;
+        uint8_t width;
         u16 himask, charmask;
         const unsigned char *orig_buf = NULL;
         int orig_count;
@@ -1983,7 +2050,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 
         /* At this point 'buf' is guaranteed to be a kernel buffer
          * and therefore no access to userspace (and therefore sleeping)
-         * will be needed.  The con_buf_sem serializes all tty based
+         * will be needed.  The con_buf_mtx serializes all tty based
          * console rendering and vcs write/read operations.  We hold
          * the console spinlock during the entire write.
          */
@@ -2010,53 +2077,86 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
                 buf++;
                 n++;
                 count--;
+                rescan = 0;
+                inverse = 0;
+                width = 1;
 
                 /* Do no translation at all in control states */
                 if (vc->vc_state != ESnormal) {
                         tc = c;
                 } else if (vc->vc_utf && !vc->vc_disp_ctrl) {
-                    /* Combine UTF-8 into Unicode */
-                    /* Malformed sequences as sequences of replacement glyphs */
+                    /* Combine UTF-8 into Unicode in vc_utf_char.
+                     * vc_utf_count is the number of continuation bytes still
+                     * expected to arrive.
+                     * vc_npar is the number of continuation bytes arrived so
+                     * far
+                     */
 rescan_last_byte:
-                    if(c > 0x7f) {
+                    if ((c & 0xc0) == 0x80) {
+                        /* Continuation byte received */
+                        static const uint32_t utf8_length_changes[] = { 0x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff };
                         if (vc->vc_utf_count) {
-                               if ((c & 0xc0) == 0x80) {
-                                       vc->vc_utf_char = (vc->vc_utf_char << 6) | (c & 0x3f);
-                                       if (--vc->vc_utf_count) {
-                                               vc->vc_npar++;
-                                               continue;
-                                       }
-                                       tc = c = vc->vc_utf_char;
-                               } else
-                                       goto replacement_glyph;
-                        } else {
-                                vc->vc_npar = 0;
-                                if ((c & 0xe0) == 0xc0) {
-                                    vc->vc_utf_count = 1;
-                                    vc->vc_utf_char = (c & 0x1f);
-                                } else if ((c & 0xf0) == 0xe0) {
-                                    vc->vc_utf_count = 2;
-                                    vc->vc_utf_char = (c & 0x0f);
-                                } else if ((c & 0xf8) == 0xf0) {
-                                    vc->vc_utf_count = 3;
-                                    vc->vc_utf_char = (c & 0x07);
-                                } else if ((c & 0xfc) == 0xf8) {
-                                    vc->vc_utf_count = 4;
-                                    vc->vc_utf_char = (c & 0x03);
-                                } else if ((c & 0xfe) == 0xfc) {
-                                    vc->vc_utf_count = 5;
-                                    vc->vc_utf_char = (c & 0x01);
-                                } else
-                                    goto replacement_glyph;
+                            vc->vc_utf_char = (vc->vc_utf_char << 6) | (c & 0x3f);
+                            vc->vc_npar++;
+                            if (--vc->vc_utf_count) {
+                                /* Still need some bytes */
                                 continue;
-                              }
+                            }
+                            /* Got a whole character */
+                            c = vc->vc_utf_char;
+                            /* Reject overlong sequences */
+                            if (c <= utf8_length_changes[vc->vc_npar - 1] ||
+                                        c > utf8_length_changes[vc->vc_npar])
+                                c = 0xfffd;
+                        } else {
+                            /* Unexpected continuation byte */
+                            vc->vc_utf_count = 0;
+                            c = 0xfffd;
+                        }
                     } else {
-                      if (vc->vc_utf_count)
-                              goto replacement_glyph;
-                      tc = c;
+                        /* Single ASCII byte or first byte of a sequence received */
+                        if (vc->vc_utf_count) {
+                            /* Continuation byte expected */
+                            rescan = 1;
+                            vc->vc_utf_count = 0;
+                            c = 0xfffd;
+                        } else if (c > 0x7f) {
+                            /* First byte of a multibyte sequence received */
+                            vc->vc_npar = 0;
+                            if ((c & 0xe0) == 0xc0) {
+                                vc->vc_utf_count = 1;
+                                vc->vc_utf_char = (c & 0x1f);
+                            } else if ((c & 0xf0) == 0xe0) {
+                                vc->vc_utf_count = 2;
+                                vc->vc_utf_char = (c & 0x0f);
+                            } else if ((c & 0xf8) == 0xf0) {
+                                vc->vc_utf_count = 3;
+                                vc->vc_utf_char = (c & 0x07);
+                            } else if ((c & 0xfc) == 0xf8) {
+                                vc->vc_utf_count = 4;
+                                vc->vc_utf_char = (c & 0x03);
+                            } else if ((c & 0xfe) == 0xfc) {
+                                vc->vc_utf_count = 5;
+                                vc->vc_utf_char = (c & 0x01);
+                            } else {
+                                /* 254 and 255 are invalid */
+                                c = 0xfffd;
+                            }
+                            if (vc->vc_utf_count) {
+                                /* Still need some bytes */
+                                continue;
+                            }
+                        }
+                        /* Nothing to do if an ASCII byte was received */
                     }
+                    /* End of UTF-8 decoding. */
+                    /* c is the received character, or U+FFFD for invalid sequences. */
+                    /* Replace invalid Unicode code points with U+FFFD too */
+                    if ((c >= 0xd800 && c <= 0xdfff) || c == 0xfffe || c == 0xffff)
+                        c = 0xfffd;
+                    tc = c;
                 } else {        /* no utf or alternate charset mode */
-                  tc = vc->vc_translate[vc->vc_toggle_meta ? (c | 0x80) : c];
+                    tc = vc->vc_translate[vc->vc_toggle_meta ? (c | 0x80) : c];
                 }
 
                 /* If the original code was a control character we
@@ -2076,56 +2176,80 @@ rescan_last_byte:
                         && (c != 128+27);
 
                 if (vc->vc_state == ESnormal && ok) {
+                        if (vc->vc_utf && !vc->vc_disp_ctrl) {
+                                if (is_double_width(c))
+                                        width = 2;
+                        }
                         /* Now try to find out how to display it */
                         tc = conv_uni_to_pc(vc, tc);
                         if (tc & ~charmask) {
-                                if ( tc == -4 ) {
-                                /* If we got -4 (not found) then see if we have
-                                   defined a replacement character (U+FFFD) */
-replacement_glyph:
-                                        tc = conv_uni_to_pc(vc, 0xfffd);
-                                        if (!(tc & ~charmask))
-                                                goto display_glyph;
-                                } else if ( tc != -3 )
-                                        continue; /* nothing to display */
-                                /* no hash table or no replacement --
-                                 * hope for the best */
-                                if ( c & ~charmask )
-                                        tc = '?';
-                                else
-                                        tc = c;
+                                if (tc == -1 || tc == -2) {
+                                    continue; /* nothing to display */
+                                }
+                                /* Glyph not found */
+                                if (!(vc->vc_utf && !vc->vc_disp_ctrl) && !(c & ~charmask)) {
+                                    /* In legacy mode use the glyph we get by a 1:1 mapping.
+                                       This would make absolutely no sense with Unicode in mind. */
+                                    tc = c;
+                                } else {
+                                    /* Display U+FFFD. If it's not found, display an inverse question mark. */
+                                    tc = conv_uni_to_pc(vc, 0xfffd);
+                                    if (tc < 0) {
+                                        inverse = 1;
+                                        tc = conv_uni_to_pc(vc, '?');
+                                        if (tc < 0) tc = '?';
+                                    }
+                                }
                         }
 
-display_glyph:
-                        if (vc->vc_need_wrap || vc->vc_decim)
-                                FLUSH
-                        if (vc->vc_need_wrap) {
-                                cr(vc);
-                                lf(vc);
-                        }
-                        if (vc->vc_decim)
-                                insert_char(vc, 1);
-                        scr_writew(himask ?
-                                     ((vc->vc_attr << 8) & ~himask) + ((tc & 0x100) ? himask : 0) + (tc & 0xff) :
-                                     (vc->vc_attr << 8) + tc,
-                                   (u16 *) vc->vc_pos);
-                        if (DO_UPDATE(vc) && draw_x < 0) {
-                                draw_x = vc->vc_x;
-                                draw_from = vc->vc_pos;
-                        }
-                        if (vc->vc_x == vc->vc_cols - 1) {
-                                vc->vc_need_wrap = vc->vc_decawm;
-                                draw_to = vc->vc_pos + 2;
+                        if (!inverse) {
+                                vc_attr = vc->vc_attr;
                         } else {
-                                vc->vc_x++;
-                                draw_to = (vc->vc_pos += 2);
+                                /* invert vc_attr */
+                                if (!vc->vc_can_do_color) {
+                                        vc_attr = (vc->vc_attr) ^ 0x08;
+                                } else if (vc->vc_hi_font_mask == 0x100) {
+                                        vc_attr = ((vc->vc_attr) & 0x11) | (((vc->vc_attr) & 0xe0) >> 4) | (((vc->vc_attr) & 0x0e) << 4);
+                                } else {
+                                        vc_attr = ((vc->vc_attr) & 0x88) | (((vc->vc_attr) & 0x70) >> 4) | (((vc->vc_attr) & 0x07) << 4);
+                                }
                         }
-                        if (vc->vc_utf_count) {
-                                if (vc->vc_npar) {
-                                        vc->vc_npar--;
-                                        goto display_glyph;
+
+                        while (1) {
+                                if (vc->vc_need_wrap || vc->vc_decim)
+                                        FLUSH
+                                if (vc->vc_need_wrap) {
+                                        cr(vc);
+                                        lf(vc);
+                                }
+                                if (vc->vc_decim)
+                                        insert_char(vc, 1);
+                                scr_writew(himask ?
+                                             ((vc_attr << 8) & ~himask) + ((tc & 0x100) ? himask : 0) + (tc & 0xff) :
+                                             (vc_attr << 8) + tc,
+                                           (u16 *) vc->vc_pos);
+                                if (DO_UPDATE(vc) && draw_x < 0) {
+                                        draw_x = vc->vc_x;
+                                        draw_from = vc->vc_pos;
+                                }
+                                if (vc->vc_x == vc->vc_cols - 1) {
+                                        vc->vc_need_wrap = vc->vc_decawm;
+                                        draw_to = vc->vc_pos + 2;
+                                } else {
+                                        vc->vc_x++;
+                                        draw_to = (vc->vc_pos += 2);
                                 }
-                                vc->vc_utf_count = 0;
+
+                                if (!--width) break;
+
+                                tc = conv_uni_to_pc(vc, ' '); /* A space is printed in the second column */
+                                if (tc < 0) tc = ' ';
+                        }
+
+                        if (rescan) {
+                                rescan = 0;
+                                inverse = 0;
+                                width = 1;
                                 c = orig;
                                 goto rescan_last_byte;
                         }
@@ -2581,6 +2705,11 @@ static void con_close(struct tty_struct *tty, struct file *filp)
         mutex_unlock(&tty_mutex);
 }
 
+static int default_italic_color    = 2; // green (ASCII)
+static int default_underline_color = 3; // cyan (ASCII)
+module_param_named(italic, default_italic_color, int, S_IRUGO | S_IWUSR);
+module_param_named(underline, default_underline_color, int, S_IRUGO | S_IWUSR);
+
 static void vc_init(struct vc_data *vc, unsigned int rows,
                     unsigned int cols, int do_clear)
 {
@@ -2600,7 +2729,8 @@ static void vc_init(struct vc_data *vc, unsigned int rows,
                 vc->vc_palette[k++] = default_blu[j] ;
         }
         vc->vc_def_color       = 0x07;   /* white */
-        vc->vc_ulcolor          = 0x0f;   /* bold white */
+        vc->vc_ulcolor         = default_underline_color;
+        vc->vc_itcolor         = default_italic_color;
         vc->vc_halfcolor       = 0x08;   /* grey */
         init_waitqueue_head(&vc->paste_wait);
         reset_terminal(vc, do_clear);
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index c9f2dd620e87..c6f6f4209739 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -1061,7 +1061,7 @@ int vt_waitactive(int vt)
                 schedule();
         }
         remove_wait_queue(&vt_activate_queue, &wait);
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         return retval;
 }
 
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 60198a78974c..1cad32c62ed3 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -2,9 +2,7 @@
 # Watchdog device configuration
 #
 
-menu "Watchdog Cards"
-
-config WATCHDOG
+menuconfig WATCHDOG
         bool "Watchdog Timer Support"
         ---help---
           If you say Y here (and to one of the following options) and create a
@@ -28,9 +26,10 @@ config WATCHDOG
 
           If unsure, say N.
 
+if WATCHDOG
+
 config WATCHDOG_NOWAYOUT
         bool "Disable watchdog shutdown on close"
-        depends on WATCHDOG
         help
           The default watchdog behaviour (which you get if you say N here) is
           to stop the timer if the process managing it closes the file
@@ -43,13 +42,11 @@ config WATCHDOG_NOWAYOUT
 #
 
 comment "Watchdog Device Drivers"
-        depends on WATCHDOG
 
 # Architecture Independent
 
 config SOFT_WATCHDOG
         tristate "Software watchdog"
-        depends on WATCHDOG
         help
           A software monitoring watchdog. This will fail to reboot your system
           from some situations that the hardware watchdog will recover
@@ -62,14 +59,14 @@ config SOFT_WATCHDOG
 
 config AT91RM9200_WATCHDOG
         tristate "AT91RM9200 watchdog"
-        depends on WATCHDOG && ARCH_AT91RM9200
+        depends on ARCH_AT91RM9200
         help
           Watchdog timer embedded into AT91RM9200 chips. This will reboot your
           system when the timeout is reached.
 
 config 21285_WATCHDOG
         tristate "DC21285 watchdog"
-        depends on WATCHDOG && FOOTBRIDGE
+        depends on FOOTBRIDGE
         help
           The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
           here if you wish to use this. Alternatively say M to compile the
@@ -83,7 +80,7 @@ config 21285_WATCHDOG
 
 config 977_WATCHDOG
         tristate "NetWinder WB83C977 watchdog"
-        depends on WATCHDOG && FOOTBRIDGE && ARCH_NETWINDER
+        depends on FOOTBRIDGE && ARCH_NETWINDER
         help
           Say Y here to include support for the WB977 watchdog included in
           NetWinder machines. Alternatively say M to compile the driver as
@@ -93,7 +90,7 @@ config 977_WATCHDOG
 
 config IXP2000_WATCHDOG
         tristate "IXP2000 Watchdog"
-        depends on WATCHDOG && ARCH_IXP2000
+        depends on ARCH_IXP2000
         help
           Say Y here if to include support for the watchdog timer
           in the Intel IXP2000(2400, 2800, 2850) network processors.
@@ -104,7 +101,7 @@ config IXP2000_WATCHDOG
 
 config IXP4XX_WATCHDOG
         tristate "IXP4xx Watchdog"
-        depends on WATCHDOG && ARCH_IXP4XX
+        depends on ARCH_IXP4XX
         help
           Say Y here if to include support for the watchdog timer
           in the Intel IXP4xx network processors. This driver can
@@ -120,7 +117,7 @@ config IXP4XX_WATCHDOG
 
 config S3C2410_WATCHDOG
         tristate "S3C2410 Watchdog"
-        depends on WATCHDOG && ARCH_S3C2410
+        depends on ARCH_S3C2410
         help
           Watchdog timer block in the Samsung S3C2410 chips. This will
           reboot the system when the timer expires with the watchdog
@@ -136,7 +133,7 @@ config S3C2410_WATCHDOG
 
 config SA1100_WATCHDOG
         tristate "SA1100/PXA2xx watchdog"
-        depends on WATCHDOG && ( ARCH_SA1100 || ARCH_PXA )
+        depends on ARCH_SA1100 || ARCH_PXA
         help
           Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
           reboot your system when timeout is reached.
@@ -148,7 +145,7 @@ config SA1100_WATCHDOG
 
 config MPCORE_WATCHDOG
         tristate "MPcore watchdog"
-        depends on WATCHDOG && ARM_MPCORE_PLATFORM && LOCAL_TIMERS
+        depends on ARM_MPCORE_PLATFORM && LOCAL_TIMERS
         help
           Watchdog timer embedded into the MPcore system.
 
@@ -157,7 +154,7 @@ config MPCORE_WATCHDOG
 
 config EP93XX_WATCHDOG
         tristate "EP93xx Watchdog"
-        depends on WATCHDOG && ARCH_EP93XX
+        depends on ARCH_EP93XX
         help
           Say Y here if to include support for the watchdog timer
           embedded in the Cirrus Logic EP93xx family of devices.
@@ -167,14 +164,14 @@ config EP93XX_WATCHDOG
 
 config OMAP_WATCHDOG
         tristate "OMAP Watchdog"
-        depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX)
+        depends on ARCH_OMAP16XX || ARCH_OMAP24XX
         help
           Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to
           enable the OMAP1610/OMAP1710 watchdog timer.
 
 config PNX4008_WATCHDOG
         tristate "PNX4008 Watchdog"
-        depends on WATCHDOG && ARCH_PNX4008
+        depends on ARCH_PNX4008
         help
           Say Y here if to include support for the watchdog timer
           in the PNX4008 processor.
@@ -187,7 +184,7 @@ config PNX4008_WATCHDOG
 
 config ACQUIRE_WDT
         tristate "Acquire SBC Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on Single Board
           Computers produced by Acquire Inc (and others). This watchdog
@@ -201,7 +198,7 @@ config ACQUIRE_WDT
 
 config ADVANTECH_WDT
         tristate "Advantech SBC Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           If you are configuring a Linux kernel for the Advantech single-board
           computer, say `Y' here to support its built-in watchdog timer
@@ -210,7 +207,7 @@ config ADVANTECH_WDT
 
 config ALIM1535_WDT
         tristate "ALi M1535 PMU Watchdog Timer"
-        depends on WATCHDOG && X86 && PCI
+        depends on X86 && PCI
         ---help---
           This is the driver for the hardware watchdog on the ALi M1535 PMU.
 
@@ -221,7 +218,7 @@ config ALIM1535_WDT
 
 config ALIM7101_WDT
         tristate "ALi M7101 PMU Computer Watchdog"
-        depends on WATCHDOG && X86 && PCI
+        depends on X86 && PCI
         help
           This is the driver for the hardware watchdog on the ALi M7101 PMU
           as used in the x86 Cobalt servers.
@@ -233,7 +230,7 @@ config ALIM7101_WDT
 
 config SC520_WDT
         tristate "AMD Elan SC520 processor Watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           This is the driver for the hardware watchdog built in to the
           AMD "Elan" SC520 microcomputer commonly used in embedded systems.
@@ -246,7 +243,7 @@ config SC520_WDT
 
 config EUROTECH_WDT
         tristate "Eurotech CPU-1220/1410 Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           Enable support for the watchdog timer on the Eurotech CPU-1220 and
           CPU-1410 cards.  These are PC/104 SBCs. Spec sheets and product
@@ -254,7 +251,7 @@ config EUROTECH_WDT
 
 config IB700_WDT
         tristate "IB700 SBC Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on the IB700 Single
           Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog
@@ -270,7 +267,7 @@ config IB700_WDT
 
 config IBMASR
         tristate "IBM Automatic Server Restart"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           This is the driver for the IBM Automatic Server Restart watchdog
           timer built-in into some eServer xSeries machines.
@@ -280,7 +277,7 @@ config IBMASR
 
 config WAFER_WDT
         tristate "ICP Wafer 5823 Single Board Computer Watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           This is a driver for the hardware watchdog on the ICP Wafer 5823
           Single Board Computer (and probably other similar models).
@@ -290,7 +287,7 @@ config WAFER_WDT
 
 config I6300ESB_WDT
         tristate "Intel 6300ESB Timer/Watchdog"
-        depends on WATCHDOG && X86 && PCI
+        depends on X86 && PCI
         ---help---
           Hardware driver for the watchdog timer built into the Intel
           6300ESB controller hub.
@@ -298,31 +295,9 @@ config I6300ESB_WDT
           To compile this driver as a module, choose M here: the
           module will be called i6300esb.
 
-config I8XX_TCO
-        tristate "Intel i8xx TCO Timer/Watchdog"
-        depends on WATCHDOG && (X86 || IA64) && PCI
-        default n
-        ---help---
-          Hardware driver for the TCO timer built into the Intel 82801
-          I/O Controller Hub family.  The TCO (Total Cost of Ownership)
-          timer is a watchdog timer that will reboot the machine after
-          its second expiration. The expiration time can be configured
-          with the "heartbeat" parameter.
-
-          On some motherboards the driver may fail to reset the chipset's
-          NO_REBOOT flag which prevents the watchdog from rebooting the
-          machine. If this is the case you will get a kernel message like
-          "failed to reset NO_REBOOT flag, reboot disabled by hardware".
-
-          To compile this driver as a module, choose M here: the
-          module will be called i8xx_tco.
-
-          Note: This driver will be removed in the near future. Please
-          use the Intel TCO Timer/Watchdog driver.
-
 config ITCO_WDT
         tristate "Intel TCO Timer/Watchdog"
-        depends on WATCHDOG && (X86 || IA64) && PCI
+        depends on (X86 || IA64) && PCI
         ---help---
           Hardware driver for the intel TCO timer based watchdog devices.
           These drivers are included in the Intel 82801 I/O Controller
@@ -351,7 +326,7 @@ config ITCO_VENDOR_SUPPORT
 
 config SC1200_WDT
         tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           This is a driver for National Semiconductor PC87307/PC97307 hardware
           watchdog cards as found on the SC1200. This watchdog is mainly used
@@ -365,7 +340,7 @@ config SC1200_WDT
 
 config SCx200_WDT
         tristate "National Semiconductor SCx200 Watchdog"
-        depends on WATCHDOG && SCx200 && PCI
+        depends on SCx200 && PCI
         help
           Enable the built-in watchdog timer support on the National
           Semiconductor SCx200 processors.
@@ -374,7 +349,7 @@ config SCx200_WDT
 
 config PC87413_WDT
         tristate "NS PC87413 watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on the PC87413 chipset
           This watchdog simply watches your kernel to make sure it doesn't
@@ -388,7 +363,7 @@ config PC87413_WDT
  
 config 60XX_WDT
         tristate "SBC-60XX Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         help
           This driver can be used with the watchdog timer found on some
           single board computers, namely the 6010 PII based computer.
@@ -402,7 +377,7 @@ config 60XX_WDT
 
 config SBC8360_WDT
         tristate "SBC8360 Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
 
           This is the driver for the hardware watchdog on the SBC8360 Single
@@ -415,7 +390,7 @@ config SBC8360_WDT
 
 config CPU5_WDT
         tristate "SMA CPU5 Watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           TBD.
           To compile this driver as a module, choose M here: the
@@ -423,7 +398,7 @@ config CPU5_WDT
 
 config SMSC37B787_WDT
         tristate "Winbond SMsC37B787 Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog component on the
           Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
@@ -443,7 +418,7 @@ config SMSC37B787_WDT
 
 config W83627HF_WDT
         tristate "W83627HF Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on the W83627HF chipset
           as used in Advantech PC-9578 and Tyan S2721-533 motherboards
@@ -458,7 +433,7 @@ config W83627HF_WDT
 
 config W83697HF_WDT
         tristate "W83697HF/W83697HG Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on the W83697HF/HG
           chipset as used in Dedibox/VIA motherboards (and likely others).
@@ -473,7 +448,7 @@ config W83697HF_WDT
 
 config W83877F_WDT
         tristate "W83877F (EMACS) Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on the W83877F chipset
           as used in EMACS PC-104 motherboards (and likely others).  This
@@ -488,7 +463,7 @@ config W83877F_WDT
 
 config W83977F_WDT
         tristate "W83977F (PCM-5335) Watchdog Timer"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the hardware watchdog on the W83977F I/O chip
           as used in AAEON's PCM-5335 SBC (and likely others).  This
@@ -501,7 +476,7 @@ config W83977F_WDT
 
 config MACHZ_WDT
         tristate "ZF MachZ Watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           If you are using a ZF Micro MachZ processor, say Y here, otherwise
           N.  This is the driver for the watchdog timer built-in on that
@@ -514,7 +489,7 @@ config MACHZ_WDT
 
 config SBC_EPX_C3_WATCHDOG
         tristate "Winsystems SBC EPX-C3 watchdog"
-        depends on WATCHDOG && X86
+        depends on X86
         ---help---
           This is the driver for the built-in watchdog timer on the EPX-C3
           Single-board computer made by Winsystems, Inc.
@@ -537,19 +512,19 @@ config SBC_EPX_C3_WATCHDOG
 
 config 8xx_WDT
         tristate "MPC8xx Watchdog Timer"
-        depends on WATCHDOG && 8xx
+        depends on 8xx
 
 config 83xx_WDT
         tristate "MPC83xx Watchdog Timer"
-        depends on WATCHDOG && PPC_83xx
+        depends on PPC_83xx
 
 config MV64X60_WDT
         tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
-        depends on WATCHDOG && MV64X60
+        depends on MV64X60
 
 config BOOKE_WDT
         bool "PowerPC Book-E Watchdog Timer"
-        depends on WATCHDOG && (BOOKE || 4xx)
+        depends on BOOKE || 4xx
         ---help---
           Please see Documentation/watchdog/watchdog-api.txt for
           more information.
@@ -558,7 +533,7 @@ config BOOKE_WDT
 
 config WATCHDOG_RTAS
         tristate "RTAS watchdog"
-        depends on WATCHDOG && PPC_RTAS
+        depends on PPC_RTAS
         help
           This driver adds watchdog support for the RTAS watchdog.
 
@@ -569,16 +544,23 @@ config WATCHDOG_RTAS
 
 config INDYDOG
         tristate "Indy/I2 Hardware Watchdog"
-        depends on WATCHDOG && SGI_IP22
+        depends on SGI_IP22
         help
           Hardware driver for the Indy's/I2's watchdog. This is a
           watchdog timer that will reboot the machine after a 60 second
           timer expired and no process has written to /dev/watchdog during
           that time.
 
+config WDT_MTX1
+        tristate "MTX-1 Hardware Watchdog"
+        depends on MIPS_MTX1
+        help
+          Hardware driver for the MTX-1 boards. This is a watchdog timer that
+          will reboot the machine after a 100 seconds timer expired.
+
 config WDT_RM9K_GPI
         tristate "RM9000/GPI hardware watchdog"
-        depends on WATCHDOG && CPU_RM9000
+        depends on CPU_RM9000
         help
           Watchdog implementation using the GPI hardware found on
           PMC-Sierra RM9xxx CPUs.
@@ -590,7 +572,7 @@ config WDT_RM9K_GPI
 
 config ZVM_WATCHDOG
         tristate "z/VM Watchdog Timer"
-        depends on WATCHDOG && S390
+        depends on S390
         help
           IBM s/390 and zSeries machines running under z/VM 5.1 or later
           provide a virtual watchdog timer to their guest that cause a
@@ -604,7 +586,7 @@ config ZVM_WATCHDOG
 
 config SH_WDT
         tristate "SuperH Watchdog"
-        depends on WATCHDOG && SUPERH
+        depends on SUPERH
         help
           This driver adds watchdog support for the integrated watchdog in the
           SuperH processors. If you have one of these processors and wish
@@ -631,7 +613,7 @@ config SH_WDT_MMAP
 
 config WATCHDOG_CP1XXX
         tristate "CP1XXX Hardware Watchdog support"
-        depends on WATCHDOG && SPARC64 && PCI
+        depends on SPARC64 && PCI
         ---help---
           This is the driver for the hardware watchdog timers present on
           Sun Microsystems CompactPCI models CP1400 and CP1500.
@@ -645,7 +627,7 @@ config WATCHDOG_CP1XXX
 
 config WATCHDOG_RIO
         tristate "RIO Hardware Watchdog support"
-        depends on WATCHDOG && SPARC64 && PCI
+        depends on SPARC64 && PCI
         help
           Say Y here to support the hardware watchdog capability on Sun RIO
           machines.  The watchdog timeout period is normally one minute but
@@ -656,11 +638,11 @@ config WATCHDOG_RIO
 #
 
 comment "ISA-based Watchdog Cards"
-        depends on WATCHDOG && ISA
+        depends on ISA
 
 config PCWATCHDOG
         tristate "Berkshire Products ISA-PC Watchdog"
-        depends on WATCHDOG && ISA
+        depends on ISA
         ---help---
           This is the driver for the Berkshire Products ISA-PC Watchdog card.
           This card simply watches your kernel to make sure it doesn't freeze,
@@ -676,7 +658,7 @@ config PCWATCHDOG
 
 config MIXCOMWD
         tristate "Mixcom Watchdog"
-        depends on WATCHDOG && ISA
+        depends on ISA
         ---help---
           This is a driver for the Mixcom hardware watchdog cards.  This
           watchdog simply watches your kernel to make sure it doesn't freeze,
@@ -690,7 +672,7 @@ config MIXCOMWD
 
 config WDT
         tristate "WDT Watchdog timer"
-        depends on WATCHDOG && ISA
+        depends on ISA
         ---help---
           If you have a WDT500P or WDT501P watchdog board, say Y here,
           otherwise N. It is not possible to probe for this board, which means
@@ -720,11 +702,11 @@ config WDT_501
 #
 
 comment "PCI-based Watchdog Cards"
-        depends on WATCHDOG && PCI
+        depends on PCI
 
 config PCIPCWATCHDOG
         tristate "Berkshire Products PCI-PC Watchdog"
-        depends on WATCHDOG && PCI
+        depends on PCI
         ---help---
           This is the driver for the Berkshire Products PCI-PC Watchdog card.
           This card simply watches your kernel to make sure it doesn't freeze,
@@ -739,7 +721,7 @@ config PCIPCWATCHDOG
 
 config WDTPCI
         tristate "PCI-WDT500/501 Watchdog timer"
-        depends on WATCHDOG && PCI
+        depends on PCI
         ---help---
           If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
 
@@ -766,11 +748,11 @@ config WDT_501_PCI
 #
 
 comment "USB-based Watchdog Cards"
-        depends on WATCHDOG && USB
+        depends on USB
 
 config USBPCWATCHDOG
         tristate "Berkshire Products USB-PC Watchdog"
-        depends on WATCHDOG && USB
+        depends on USB
         ---help---
           This is the driver for the Berkshire Products USB-PC Watchdog card.
           This card simply watches your kernel to make sure it doesn't freeze,
@@ -783,4 +765,4 @@ config USBPCWATCHDOG
 
           Most people will say N.
 
-endmenu
+endif # WATCHDOG
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 2cd8ff8d10ac..8bfc00cc7c2b 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -46,7 +46,6 @@ obj-$(CONFIG_IB700_WDT) += ib700wdt.o
 obj-$(CONFIG_IBMASR) += ibmasr.o
 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
 obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
-obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
 obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
@@ -73,6 +72,7 @@ obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 
 # MIPS Architecture
 obj-$(CONFIG_INDYDOG) += indydog.o
+obj-$(CONFIG_WDT_MTX1)  += mtx-1_wdt.o
 obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
 
 # S390 Architecture
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index 0e23f29f71ab..0f5c77ddd39d 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -24,7 +24,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-/* If the kernel parameter wdt_enable=1, the watchdog will be enabled at boot.
+/* If the kernel parameter wdt=1, the watchdog will be enabled at boot.
  * Also, the wdt_period sets the watchdog timer period timeout.
  * For E500 cpus the wdt_period sets which bit changing from 0->1 will
  * trigger a watchog timeout. This watchdog timeout will occur 3 times, the
diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
index bcd7e36ca0aa..d0d45a8b09f0 100644
--- a/drivers/char/watchdog/cpu5wdt.c
+++ b/drivers/char/watchdog/cpu5wdt.c
@@ -220,17 +220,17 @@ static int __devinit cpu5wdt_init(void)
         if ( verbose )
                 printk(KERN_DEBUG PFX "port=0x%x, verbose=%i\n", port, verbose);
 
-        if ( (err = misc_register(&cpu5wdt_misc)) < 0 ) {
-                printk(KERN_ERR PFX "misc_register failed\n");
-                goto no_misc;
-        }
-
         if ( !request_region(port, CPU5WDT_EXTENT, PFX) ) {
                 printk(KERN_ERR PFX "request_region failed\n");
                 err = -EBUSY;
                 goto no_port;
         }
 
+        if ( (err = misc_register(&cpu5wdt_misc)) < 0 ) {
+                printk(KERN_ERR PFX "misc_register failed\n");
+                goto no_misc;
+        }
+
         /* watchdog reboot? */
         val = inb(port + CPU5WDT_STATUS_REG);
         val = (val >> 2) & 1;
@@ -250,9 +250,9 @@ static int __devinit cpu5wdt_init(void)
 
         return 0;
 
-no_port:
-        misc_deregister(&cpu5wdt_misc);
 no_misc:
+        release_region(port, CPU5WDT_EXTENT);
+no_port:
         return err;
 }
 
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c
index f70387f01b2b..b070324e27a6 100644
--- a/drivers/char/watchdog/eurotechwdt.c
+++ b/drivers/char/watchdog/eurotechwdt.c
@@ -413,17 +413,10 @@ static int __init eurwdt_init(void)
 {
         int ret;
 
-        ret = misc_register(&eurwdt_miscdev);
-        if (ret) {
-                printk(KERN_ERR "eurwdt: can't misc_register on minor=%d\n",
-                WATCHDOG_MINOR);
-                goto out;
-        }
-
         ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL);
         if(ret) {
                 printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
-                goto outmisc;
+                goto out;
         }
 
         if (!request_region(io, 2, "eurwdt")) {
@@ -438,6 +431,13 @@ static int __init eurwdt_init(void)
                 goto outreg;
         }
 
+        ret = misc_register(&eurwdt_miscdev);
+        if (ret) {
+                printk(KERN_ERR "eurwdt: can't misc_register on minor=%d\n",
+                WATCHDOG_MINOR);
+                goto outreboot;
+        }
+
         eurwdt_unlock_chip();
 
         ret = 0;
@@ -448,14 +448,14 @@ static int __init eurwdt_init(void)
 out:
         return ret;
 
+outreboot:
+        unregister_reboot_notifier(&eurwdt_notifier);
+
 outreg:
         release_region(io, 2);
 
 outirq:
         free_irq(irq, NULL);
-
-outmisc:
-        misc_deregister(&eurwdt_miscdev);
         goto out;
 }
 
diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
deleted file mode 100644
index a62ef48a15ae..000000000000
--- a/drivers/char/watchdog/i8xx_tco.c
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- *      i8xx_tco:       TCO timer driver for i8xx chipsets
- *
- *      (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved.
- *                              http://www.kernelconcepts.de
- *
- *      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.
- *
- *      Neither kernel concepts nor Nils Faerber admit liability nor provide
- *      warranty for any of this software. This material is provided
- *      "AS-IS" and at no charge.
- *
- *      (c) Copyright 2000      kernel concepts <nils@kernelconcepts.de>
- *                              developed for
- *                              Jentro AG, Haar/Munich (Germany)
- *
- *      TCO timer driver for i8xx chipsets
- *      based on softdog.c by Alan Cox <alan@redhat.com>
- *
- *      The TCO timer is implemented in the following I/O controller hubs:
- *      (See the intel documentation on http://developer.intel.com.)
- *      82801AA  (ICH)    : document number 290655-003, 290677-014,
- *      82801AB  (ICHO)   : document number 290655-003, 290677-014,
- *      82801BA  (ICH2)   : document number 290687-002, 298242-027,
- *      82801BAM (ICH2-M) : document number 290687-002, 298242-027,
- *      82801CA  (ICH3-S) : document number 290733-003, 290739-013,
- *      82801CAM (ICH3-M) : document number 290716-001, 290718-007,
- *      82801DB  (ICH4)   : document number 290744-001, 290745-020,
- *      82801DBM (ICH4-M) : document number 252337-001, 252663-005,
- *      82801E   (C-ICH)  : document number 273599-001, 273645-002,
- *      82801EB  (ICH5)   : document number 252516-001, 252517-003,
- *      82801ER  (ICH5R)  : document number 252516-001, 252517-003,
- *
- *  20000710 Nils Faerber
- *      Initial Version 0.01
- *  20000728 Nils Faerber
- *      0.02 Fix for SMI_EN->TCO_EN bit, some cleanups
- *  20011214 Matt Domsch <Matt_Domsch@dell.com>
- *      0.03 Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
- *           Didn't add timeout option as i810_margin already exists.
- *  20020224 Joel Becker, Wim Van Sebroeck
- *      0.04 Support for 82801CA(M) chipset, timer margin needs to be > 3,
- *           add support for WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT.
- *  20020412 Rob Radez <rob@osinvestor.com>, Wim Van Sebroeck
- *      0.05 Fix possible timer_alive race, add expect close support,
- *           clean up ioctls (WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS and
- *           WDIOC_SETOPTIONS), made i810tco_getdevice __init,
- *           removed boot_status, removed tco_timer_read,
- *           added support for 82801DB and 82801E chipset,
- *           added support for 82801EB and 8280ER chipset,
- *           general cleanup.
- *  20030921 Wim Van Sebroeck <wim@iguana.be>
- *      0.06 change i810_margin to heartbeat, use module_param,
- *           added notify system support, renamed module to i8xx_tco.
- *  20050128 Wim Van Sebroeck <wim@iguana.be>
- *      0.07 Added support for the ICH4-M, ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW
- *           chipsets. Also added support for the "undocumented" ICH7 chipset.
- *  20050807 Wim Van Sebroeck <wim@iguana.be>
- *      0.08 Make sure that the watchdog is only "armed" when started.
- *           (Kernel Bug 4251)
- *  20060416 Wim Van Sebroeck <wim@iguana.be>
- *      0.09 Remove support for the ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW and
- *           ICH7 chipsets. (See Kernel Bug 6031 - other code will support these
- *           chipsets)
- */
-
-/*
- *      Includes, defines, variables, module parameters, ...
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-
-#include "i8xx_tco.h"
-
-/* Module and version information */
-#define TCO_VERSION "0.09"
-#define TCO_MODULE_NAME "i8xx TCO timer"
-#define TCO_DRIVER_NAME   TCO_MODULE_NAME ", v" TCO_VERSION
-#define PFX TCO_MODULE_NAME ": "
-
-/* internal variables */
-static unsigned int ACPIBASE;
-static spinlock_t tco_lock;     /* Guards the hardware */
-static unsigned long timer_alive;
-static char tco_expect_close;
-static struct pci_dev *i8xx_tco_pci;
-
-/* module parameters */
-#define WATCHDOG_HEARTBEAT 30   /* 30 sec default heartbeat (2<heartbeat<39) */
-static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */
-module_param(heartbeat, int, 0);
-MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
-
-static int nowayout = WATCHDOG_NOWAYOUT;
-module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-
-/*
- * Some TCO specific functions
- */
-
-static inline unsigned char seconds_to_ticks(int seconds)
-{
-        /* the internal timer is stored as ticks which decrement
-         * every 0.6 seconds */
-        return (seconds * 10) / 6;
-}
-
-static int tco_timer_start (void)
-{
-        unsigned char val;
-
-        spin_lock(&tco_lock);
-
-        /* disable chipset's NO_REBOOT bit */
-        pci_read_config_byte (i8xx_tco_pci, 0xd4, &val);
-        val &= 0xfd;
-        pci_write_config_byte (i8xx_tco_pci, 0xd4, val);
-
-        /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled to count */
-        val = inb (TCO1_CNT + 1);
-        val &= 0xf7;
-        outb (val, TCO1_CNT + 1);
-        val = inb (TCO1_CNT + 1);
-
-        spin_unlock(&tco_lock);
-
-        if (val & 0x08)
-                return -1;
-        return 0;
-}
-
-static int tco_timer_stop (void)
-{
-        unsigned char val, val1;
-
-        spin_lock(&tco_lock);
-        /* Bit 11: TCO Timer Halt -> 1 = The TCO timer is disabled */
-        val = inb (TCO1_CNT + 1);
-        val |= 0x08;
-        outb (val, TCO1_CNT + 1);
-        val = inb (TCO1_CNT + 1);
-
-        /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
-        pci_read_config_byte (i8xx_tco_pci, 0xd4, &val1);
-        val1 |= 0x02;
-        pci_write_config_byte (i8xx_tco_pci, 0xd4, val1);
-
-        spin_unlock(&tco_lock);
-
-        if ((val & 0x08) == 0)
-                return -1;
-        return 0;
-}
-
-static int tco_timer_keepalive (void)
-{
-        spin_lock(&tco_lock);
-        /* Reload the timer by writing to the TCO Timer Reload register */
-        outb (0x01, TCO1_RLD);
-        spin_unlock(&tco_lock);
-        return 0;
-}
-
-static int tco_timer_set_heartbeat (int t)
-{
-        unsigned char val;
-        unsigned char tmrval;
-
-        tmrval = seconds_to_ticks(t);
-        /* from the specs: */
-        /* "Values of 0h-3h are ignored and should not be attempted" */
-        if (tmrval > 0x3f || tmrval < 0x04)
-                return -EINVAL;
-
-        /* Write new heartbeat to watchdog */
-        spin_lock(&tco_lock);
-        val = inb (TCO1_TMR);
-        val &= 0xc0;
-        val |= tmrval;
-        outb (val, TCO1_TMR);
-        val = inb (TCO1_TMR);
-        spin_unlock(&tco_lock);
-
-        if ((val & 0x3f) != tmrval)
-                return -EINVAL;
-
-        heartbeat = t;
-        return 0;
-}
-
-static int tco_timer_get_timeleft (int *time_left)
-{
-        unsigned char val;
-
-        spin_lock(&tco_lock);
-
-        /* read the TCO Timer */
-        val = inb (TCO1_RLD);
-        val &= 0x3f;
-
-        spin_unlock(&tco_lock);
-
-        *time_left = (int)((val * 6) / 10);
-
-        return 0;
-}
-
-/*
- *      /dev/watchdog handling
- */
-
-static int i8xx_tco_open (struct inode *inode, struct file *file)
-{
-        /* /dev/watchdog can only be opened once */
-        if (test_and_set_bit(0, &timer_alive))
-                return -EBUSY;
-
-        /*
-         *      Reload and activate timer
-         */
-        tco_timer_keepalive ();
-        tco_timer_start ();
-        return nonseekable_open(inode, file);
-}
-
-static int i8xx_tco_release (struct inode *inode, struct file *file)
-{
-        /*
-         *      Shut off the timer.
-         */
-        if (tco_expect_close == 42) {
-                tco_timer_stop ();
-        } else {
-                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
-                tco_timer_keepalive ();
-        }
-        clear_bit(0, &timer_alive);
-        tco_expect_close = 0;
-        return 0;
-}
-
-static ssize_t i8xx_tco_write (struct file *file, const char __user *data,
-                              size_t len, loff_t * ppos)
-{
-        /* See if we got the magic character 'V' and reload the timer */
-        if (len) {
-                if (!nowayout) {
-                        size_t i;
-
-                        /* note: just in case someone wrote the magic character
-                         * five months ago... */
-                        tco_expect_close = 0;
-
-                        /* scan to see whether or not we got the magic character */
-                        for (i = 0; i != len; i++) {
-                                char c;
-                                if(get_user(c, data+i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        tco_expect_close = 42;
-                        }
-                }
-
-                /* someone wrote to us, we should reload the timer */
-                tco_timer_keepalive ();
-        }
-        return len;
-}
-
-static int i8xx_tco_ioctl (struct inode *inode, struct file *file,
-                          unsigned int cmd, unsigned long arg)
-{
-        int new_options, retval = -EINVAL;
-        int new_heartbeat;
-        int time_left;
-        void __user *argp = (void __user *)arg;
-        int __user *p = argp;
-        static struct watchdog_info ident = {
-                .options =              WDIOF_SETTIMEOUT |
-                                        WDIOF_KEEPALIVEPING |
-                                        WDIOF_MAGICCLOSE,
-                .firmware_version =     0,
-                .identity =             TCO_MODULE_NAME,
-        };
-
-        switch (cmd) {
-                case WDIOC_GETSUPPORT:
-                        return copy_to_user(argp, &ident,
-                                sizeof (ident)) ? -EFAULT : 0;
-
-                case WDIOC_GETSTATUS:
-                case WDIOC_GETBOOTSTATUS:
-                        return put_user (0, p);
-
-                case WDIOC_KEEPALIVE:
-                        tco_timer_keepalive ();
-                        return 0;
-
-                case WDIOC_SETOPTIONS:
-                {
-                        if (get_user (new_options, p))
-                                return -EFAULT;
-
-                        if (new_options & WDIOS_DISABLECARD) {
-                                tco_timer_stop ();
-                                retval = 0;
-                        }
-
-                        if (new_options & WDIOS_ENABLECARD) {
-                                tco_timer_keepalive ();
-                                tco_timer_start ();
-                                retval = 0;
-                        }
-
-                        return retval;
-                }
-
-                case WDIOC_SETTIMEOUT:
-                {
-                        if (get_user(new_heartbeat, p))
-                                return -EFAULT;
-
-                        if (tco_timer_set_heartbeat(new_heartbeat))
-                                return -EINVAL;
-
-                        tco_timer_keepalive ();
-                        /* Fall */
-                }
-
-                case WDIOC_GETTIMEOUT:
-                        return put_user(heartbeat, p);
-
-                case WDIOC_GETTIMELEFT:
-                {
-                        if (tco_timer_get_timeleft(&time_left))
-                                return -EINVAL;
-
-                        return put_user(time_left, p);
-                }
-
-                default:
-                        return -ENOTTY;
-        }
-}
-
-/*
- *      Notify system
- */
-
-static int i8xx_tco_notify_sys (struct notifier_block *this, unsigned long code, void *unused)
-{
-        if (code==SYS_DOWN || code==SYS_HALT) {
-                /* Turn the WDT off */
-                tco_timer_stop ();
-        }
-
-        return NOTIFY_DONE;
-}
-
-/*
- *      Kernel Interfaces
- */
-
-static const struct file_operations i8xx_tco_fops = {
-        .owner =        THIS_MODULE,
-        .llseek =       no_llseek,
-        .write =        i8xx_tco_write,
-        .ioctl =        i8xx_tco_ioctl,
-        .open =         i8xx_tco_open,
-        .release =      i8xx_tco_release,
-};
-
-static struct miscdevice i8xx_tco_miscdev = {
-        .minor =        WATCHDOG_MINOR,
-        .name =         "watchdog",
-        .fops =         &i8xx_tco_fops,
-};
-
-static struct notifier_block i8xx_tco_notifier = {
-        .notifier_call =        i8xx_tco_notify_sys,
-};
-
-/*
- * Data for PCI driver interface
- *
- * This data only exists for exporting the supported
- * PCI ids via MODULE_DEVICE_TABLE.  We do not actually
- * register a pci_driver, because someone else might one day
- * want to register another driver on the same PCI id.
- */
-static struct pci_device_id i8xx_tco_pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0) },
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1) },
-        { },                    /* End of list */
-};
-MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_tbl);
-
-/*
- *      Init & exit routines
- */
-
-static unsigned char __init i8xx_tco_getdevice (void)
-{
-        struct pci_dev *dev = NULL;
-        u8 val1, val2;
-        u16 badr;
-        /*
-         *      Find the PCI device
-         */
-
-        for_each_pci_dev(dev)
-                if (pci_match_id(i8xx_tco_pci_tbl, dev)) {
-                        i8xx_tco_pci = dev;
-                        break;
-                }
-
-        if (i8xx_tco_pci) {
-                /*
-                 *      Find the ACPI base I/O address which is the base
-                 *      for the TCO registers (TCOBASE=ACPIBASE + 0x60)
-                 *      ACPIBASE is bits [15:7] from 0x40-0x43
-                 */
-                pci_read_config_byte (i8xx_tco_pci, 0x40, &val1);
-                pci_read_config_byte (i8xx_tco_pci, 0x41, &val2);
-                badr = ((val2 << 1) | (val1 >> 7)) << 7;
-                ACPIBASE = badr;
-                /* Something's wrong here, ACPIBASE has to be set */
-                if (badr == 0x0001 || badr == 0x0000) {
-                        printk (KERN_ERR PFX "failed to get TCOBASE address\n");
-                        pci_dev_put(i8xx_tco_pci);
-                        return 0;
-                }
-
-                /* Check chipset's NO_REBOOT bit */
-                pci_read_config_byte (i8xx_tco_pci, 0xd4, &val1);
-                if (val1 & 0x02) {
-                        val1 &= 0xfd;
-                        pci_write_config_byte (i8xx_tco_pci, 0xd4, val1);
-                        pci_read_config_byte (i8xx_tco_pci, 0xd4, &val1);
-                        if (val1 & 0x02) {
-                                printk (KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
-                                pci_dev_put(i8xx_tco_pci);
-                                return 0;       /* Cannot reset NO_REBOOT bit */
-                        }
-                }
-                /* Disable reboots untill the watchdog starts */
-                val1 |= 0x02;
-                pci_write_config_byte (i8xx_tco_pci, 0xd4, val1);
-
-                /* Set the TCO_EN bit in SMI_EN register */
-                if (!request_region (SMI_EN + 1, 1, "i8xx TCO")) {
-                        printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                                SMI_EN + 1);
-                        pci_dev_put(i8xx_tco_pci);
-                        return 0;
-                }
-                val1 = inb (SMI_EN + 1);
-                val1 &= 0xdf;
-                outb (val1, SMI_EN + 1);
-                release_region (SMI_EN + 1, 1);
-                return 1;
-        }
-        return 0;
-}
-
-static int __init watchdog_init (void)
-{
-        int ret;
-
-        spin_lock_init(&tco_lock);
-
-        /* Check whether or not the hardware watchdog is there */
-        if (!i8xx_tco_getdevice () || i8xx_tco_pci == NULL)
-                return -ENODEV;
-
-        if (!request_region (TCOBASE, 0x10, "i8xx TCO")) {
-                printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                        TCOBASE);
-                ret = -EIO;
-                goto out;
-        }
-
-        /* Clear out the (probably old) status */
-        outb (0, TCO1_STS);
-        outb (3, TCO2_STS);
-
-        /* Check that the heartbeat value is within it's range ; if not reset to the default */
-        if (tco_timer_set_heartbeat (heartbeat)) {
-                heartbeat = WATCHDOG_HEARTBEAT;
-                tco_timer_set_heartbeat (heartbeat);
-                printk(KERN_INFO PFX "heartbeat value must be 2<heartbeat<39, using %d\n",
-                        heartbeat);
-        }
-
-        ret = register_reboot_notifier(&i8xx_tco_notifier);
-        if (ret != 0) {
-                printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
-                        ret);
-                goto unreg_region;
-        }
-
-        ret = misc_register(&i8xx_tco_miscdev);
-        if (ret != 0) {
-                printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
-                        WATCHDOG_MINOR, ret);
-                goto unreg_notifier;
-        }
-
-        tco_timer_stop ();
-
-        printk (KERN_INFO PFX "initialized (0x%04x). heartbeat=%d sec (nowayout=%d)\n",
-                TCOBASE, heartbeat, nowayout);
-
-        return 0;
-
-unreg_notifier:
-        unregister_reboot_notifier(&i8xx_tco_notifier);
-unreg_region:
-        release_region (TCOBASE, 0x10);
-out:
-        pci_dev_put(i8xx_tco_pci);
-        return ret;
-}
-
-static void __exit watchdog_cleanup (void)
-{
-        /* Stop the timer before we leave */
-        if (!nowayout)
-                tco_timer_stop ();
-
-        /* Deregister */
-        misc_deregister (&i8xx_tco_miscdev);
-        unregister_reboot_notifier(&i8xx_tco_notifier);
-        release_region (TCOBASE, 0x10);
-
-        pci_dev_put(i8xx_tco_pci);
-}
-
-module_init(watchdog_init);
-module_exit(watchdog_cleanup);
-
-MODULE_AUTHOR("Nils Faerber");
-MODULE_DESCRIPTION("TCO timer driver for i8xx chipsets");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/i8xx_tco.h b/drivers/char/watchdog/i8xx_tco.h
deleted file mode 100644
index cc14eb8ac3d6..000000000000
--- a/drivers/char/watchdog/i8xx_tco.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *      i8xx_tco:       TCO timer driver for i8xx chipsets
- *
- *      (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved.
- *                              http://www.kernelconcepts.de
- *
- *      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.
- *
- *      Neither kernel concepts nor Nils Faerber admit liability nor provide
- *      warranty for any of this software. This material is provided
- *      "AS-IS" and at no charge.
- *
- *      (c) Copyright 2000      kernel concepts <nils@kernelconcepts.de>
- *                              developed for
- *                              Jentro AG, Haar/Munich (Germany)
- *
- *      TCO timer driver for i8xx chipsets
- *      based on softdog.c by Alan Cox <alan@redhat.com>
- *
- *      For history and the complete list of supported I/O Controller Hub's
- *      see i8xx_tco.c
- */
-
-
-/*
- * Some address definitions for the TCO
- */
-
-#define TCOBASE         ACPIBASE + 0x60 /* TCO base address             */
-#define TCO1_RLD        TCOBASE + 0x00  /* TCO Timer Reload and Current Value */
-#define TCO1_TMR        TCOBASE + 0x01  /* TCO Timer Initial Value      */
-#define TCO1_DAT_IN     TCOBASE + 0x02  /* TCO Data In Register         */
-#define TCO1_DAT_OUT    TCOBASE + 0x03  /* TCO Data Out Register        */
-#define TCO1_STS        TCOBASE + 0x04  /* TCO1 Status Register         */
-#define TCO2_STS        TCOBASE + 0x06  /* TCO2 Status Register         */
-#define TCO1_CNT        TCOBASE + 0x08  /* TCO1 Control Register        */
-#define TCO2_CNT        TCOBASE + 0x0a  /* TCO2 Control Register        */
-
-#define SMI_EN          ACPIBASE + 0x30 /* SMI Control and Enable Register */
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c
index 3c9684ccd2f9..eac4f9b9f007 100644
--- a/drivers/char/watchdog/iTCO_wdt.c
+++ b/drivers/char/watchdog/iTCO_wdt.c
@@ -571,7 +571,7 @@ static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent,
          *      ACPIBASE is bits [15:7] from 0x40-0x43
          */
         pci_read_config_dword(pdev, 0x40, &base_address);
-        base_address &= 0x00007f80;
+        base_address &= 0x0000ff80;
         if (base_address == 0x00000000) {
                 /* Something's wrong here, ACPIBASE has to be set */
                 printk(KERN_ERR PFX "failed to get TCOBASE address\n");
diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c
index 8195f5023d85..94155f6136c2 100644
--- a/drivers/char/watchdog/ibmasr.c
+++ b/drivers/char/watchdog/ibmasr.c
@@ -367,18 +367,17 @@ static int __init ibmasr_init(void)
         if (!asr_type)
                 return -ENODEV;
 
+        rc = asr_get_base_address();
+        if (rc)
+                return rc;
+
         rc = misc_register(&asr_miscdev);
         if (rc < 0) {
+                release_region(asr_base, asr_length);
                 printk(KERN_ERR PFX "failed to register misc device\n");
                 return rc;
         }
 
-        rc = asr_get_base_address();
-        if (rc) {
-                misc_deregister(&asr_miscdev);
-                return rc;
-        }
-
         return 0;
 }
 
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 76c7fa37fa6c..a0d27160c80e 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -440,13 +440,6 @@ static int __init zf_init(void)
         spin_lock_init(&zf_lock);
         spin_lock_init(&zf_port_lock);
 
-        ret = misc_register(&zf_miscdev);
-        if (ret){
-                printk(KERN_ERR "can't misc_register on minor=%d\n",
-                                                        WATCHDOG_MINOR);
-                goto out;
-        }
-
         if(!request_region(ZF_IOBASE, 3, "MachZ ZFL WDT")){
                 printk(KERN_ERR "cannot reserve I/O ports at %d\n",
                                                         ZF_IOBASE);
@@ -461,16 +454,23 @@ static int __init zf_init(void)
                 goto no_reboot;
         }
 
+        ret = misc_register(&zf_miscdev);
+        if (ret){
+                printk(KERN_ERR "can't misc_register on minor=%d\n",
+                                                        WATCHDOG_MINOR);
+                goto no_misc;
+        }
+
         zf_set_status(0);
         zf_set_control(0);
 
         return 0;
 
+no_misc:
+        unregister_reboot_notifier(&zf_notifier);
 no_reboot:
         release_region(ZF_IOBASE, 3);
 no_region:
-        misc_deregister(&zf_miscdev);
-out:
         return ret;
 }
 
diff --git a/drivers/char/watchdog/mtx-1_wdt.c b/drivers/char/watchdog/mtx-1_wdt.c
new file mode 100644
index 000000000000..419ab445c944
--- /dev/null
+++ b/drivers/char/watchdog/mtx-1_wdt.c
@@ -0,0 +1,238 @@
+/*
+ *      Driver for the MTX-1 Watchdog.
+ *
+ *      (C) Copyright 2005 4G Systems <info@4g-systems.biz>, All Rights Reserved.
+ *                              http://www.4g-systems.biz
+ *
+ *      (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      Neither Michael Stickel nor 4G Systems admit liability nor provide
+ *      warranty for any of this software. This material is provided
+ *      "AS-IS" and at no charge.
+ *
+ *      (c) Copyright 2005    4G Systems <info@4g-systems.biz>
+ *
+ *      Release 0.01.
+ *      Author: Michael Stickel  michael.stickel@4g-systems.biz
+ *
+ *      Release 0.02.
+ *      Author: Florian Fainelli florian@openwrt.org
+ *              use the Linux watchdog/timer APIs
+ *
+ *      The Watchdog is configured to reset the MTX-1
+ *      if it is not triggered for 100 seconds.
+ *      It should not be triggered more often than 1.6 seconds.
+ *
+ *      A timer triggers the watchdog every 5 seconds, until
+ *      it is opened for the first time. After the first open
+ *      it MUST be triggered every 2..95 seconds.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/timer.h>
+#include <linux/completion.h>
+#include <linux/jiffies.h>
+#include <linux/watchdog.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+
+#include <asm/mach-au1x00/au1000.h>
+
+#define MTX1_WDT_INTERVAL       (5 * HZ)
+
+static int ticks = 100 * HZ;
+
+static struct {
+        struct completion stop;
+        volatile int running;
+        struct timer_list timer;
+        volatile int queue;
+        int default_ticks;
+        unsigned long inuse;
+} mtx1_wdt_device;
+
+static void mtx1_wdt_trigger(unsigned long unused)
+{
+        u32 tmp;
+
+        if (mtx1_wdt_device.running)
+                ticks--;
+        /*
+         * toggle GPIO2_15
+         */
+        tmp = au_readl(GPIO2_DIR);
+        tmp = (tmp & ~(1<<15)) | ((~tmp) & (1<<15));
+        au_writel (tmp, GPIO2_DIR);
+
+        if (mtx1_wdt_device.queue && ticks)
+                mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
+        else {
+                complete(&mtx1_wdt_device.stop);
+        }
+}
+
+static void mtx1_wdt_reset(void)
+{
+        ticks = mtx1_wdt_device.default_ticks;
+}
+
+
+static void mtx1_wdt_start(void)
+{
+        if (!mtx1_wdt_device.queue) {
+                mtx1_wdt_device.queue = 1;
+                au_writel (au_readl(GPIO2_DIR) | (u32)(1<<15), GPIO2_DIR);
+                mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
+        }
+        mtx1_wdt_device.running++;
+}
+
+static int mtx1_wdt_stop(void)
+{
+        if (mtx1_wdt_device.queue) {
+                mtx1_wdt_device.queue = 0;
+                au_writel (au_readl(GPIO2_DIR) & ~((u32)(1<<15)), GPIO2_DIR);
+        }
+
+        ticks = mtx1_wdt_device.default_ticks;
+
+        return 0;
+}
+
+/* Filesystem functions */
+
+static int mtx1_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(0, &mtx1_wdt_device.inuse))
+                return -EBUSY;
+
+        return nonseekable_open(inode, file);
+}
+
+
+static int mtx1_wdt_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &mtx1_wdt_device.inuse);
+        return 0;
+}
+
+static int mtx1_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        unsigned int value;
+        static struct watchdog_info ident =
+        {
+                .options = WDIOF_CARDRESET,
+                .identity = "MTX-1 WDT",
+        };
+
+        switch(cmd) {
+                case WDIOC_KEEPALIVE:
+                        mtx1_wdt_reset();
+                        break;
+                case WDIOC_GETSTATUS:
+                        if ( copy_to_user(argp, &value, sizeof(int)) )
+                                return -EFAULT;
+                        break;
+                case WDIOC_GETSUPPORT:
+                        if ( copy_to_user(argp, &ident, sizeof(ident)) )
+                                return -EFAULT;
+                        break;
+                case WDIOC_SETOPTIONS:
+                        if ( copy_from_user(&value, argp, sizeof(int)) )
+                                return -EFAULT;
+                        switch(value) {
+                                case WDIOS_ENABLECARD:
+                                        mtx1_wdt_start();
+                                        break;
+                                case WDIOS_DISABLECARD:
+                                        return mtx1_wdt_stop();
+                                default:
+                                        return -EINVAL;
+                        }
+                        break;
+                default:
+                        return -ENOTTY;
+        }
+        return 0;
+}
+
+
+static ssize_t mtx1_wdt_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+{
+        if (!count)
+                return -EIO;
+
+        mtx1_wdt_reset();
+        return count;
+}
+
+static struct file_operations mtx1_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .ioctl          = mtx1_wdt_ioctl,
+        .open           = mtx1_wdt_open,
+        .write          = mtx1_wdt_write,
+        .release        = mtx1_wdt_release
+};
+
+
+static struct miscdevice mtx1_wdt_misc = {
+        .minor  = WATCHDOG_MINOR,
+        .name   = "watchdog",
+        .fops   = &mtx1_wdt_fops
+};
+
+
+static int __init mtx1_wdt_init(void)
+{
+        int ret;
+
+        if ((ret = misc_register(&mtx1_wdt_misc)) < 0) {
+                printk(KERN_ERR " mtx-1_wdt : failed to register\n");
+                return ret;
+        }
+
+        init_completion(&mtx1_wdt_device.stop);
+        mtx1_wdt_device.queue = 0;
+
+        clear_bit(0, &mtx1_wdt_device.inuse);
+
+        setup_timer(&mtx1_wdt_device.timer, mtx1_wdt_trigger, 0L);
+
+        mtx1_wdt_device.default_ticks = ticks;
+
+        mtx1_wdt_start();
+
+        printk(KERN_INFO "MTX-1 Watchdog driver\n");
+
+        return 0;
+}
+
+static void __exit mtx1_wdt_exit(void)
+{
+        if (mtx1_wdt_device.queue) {
+                mtx1_wdt_device.queue = 0;
+                wait_for_completion(&mtx1_wdt_device.stop);
+        }
+        misc_deregister(&mtx1_wdt_misc);
+}
+
+module_init(mtx1_wdt_init);
+module_exit(mtx1_wdt_exit);
+
+MODULE_AUTHOR("Michael Stickel, Florian Fainelli");
+MODULE_DESCRIPTION("Driver for the MTX-1 watchdog");
+MODULE_LICENSE("GPL");
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index 84074a697dce..b36fa8de2131 100644
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -34,7 +34,6 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/reboot.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 6e8b5705b5b7..7b41434fac8c 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -59,10 +59,10 @@
 #include <linux/jiffies.h>      /* For jiffies stuff */
 #include <linux/miscdevice.h>   /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */
 #include <linux/watchdog.h>     /* For the watchdog specific items */
-#include <linux/notifier.h>     /* For notifier support */
-#include <linux/reboot.h>       /* For reboot_notifier stuff */
+#include <linux/reboot.h>       /* For kernel_power_off() */
 #include <linux/init.h>         /* For __init/__exit/... */
 #include <linux/fs.h>           /* For file operations */
+#include <linux/isa.h>          /* For isa devices */
 #include <linux/ioport.h>       /* For io-port access */
 #include <linux/spinlock.h>     /* For spin_lock/spin_unlock/... */
 
@@ -70,8 +70,8 @@
 #include <asm/io.h>             /* For inb/outb/... */
 
 /* Module and version information */
-#define WATCHDOG_VERSION "1.18"
-#define WATCHDOG_DATE "21 Jan 2007"
+#define WATCHDOG_VERSION "1.20"
+#define WATCHDOG_DATE "18 Feb 2007"
 #define WATCHDOG_DRIVER_NAME "ISA-PC Watchdog"
 #define WATCHDOG_NAME "pcwd"
 #define PFX WATCHDOG_NAME ": "
@@ -89,6 +89,15 @@
 #define PCWD_REVISION_C         2
 
 /*
+ * These are the auto-probe addresses available.
+ *
+ * Revision A only uses ports 0x270 and 0x370.  Revision C introduced 0x350.
+ * Revision A has an address range of 2 addresses, while Revision C has 4.
+ */
+#define PCWD_ISA_NR_CARDS       3
+static int pcwd_ioports[] = { 0x270, 0x350, 0x370, 0x000 };
+
+/*
  * These are the defines that describe the control status bits for the
  * PCI-PC Watchdog card.
 */
@@ -485,7 +494,7 @@ static int pcwd_get_status(int *status)
                 if (control_status & WD_T110) {
                         *status |= WDIOF_OVERHEAT;
                         if (temp_panic) {
-                                printk (KERN_INFO PFX "Temperature overheat trip!\n");
+                                printk(KERN_INFO PFX "Temperature overheat trip!\n");
                                 kernel_power_off();
                                 /* or should we just do a: panic(PFX "Temperature overheat trip!\n"); */
                         }
@@ -497,7 +506,7 @@ static int pcwd_get_status(int *status)
                 if (control_status & WD_REVC_TTRP) {
                         *status |= WDIOF_OVERHEAT;
                         if (temp_panic) {
-                                printk (KERN_INFO PFX "Temperature overheat trip!\n");
+                                printk(KERN_INFO PFX "Temperature overheat trip!\n");
                                 kernel_power_off();
                                 /* or should we just do a: panic(PFX "Temperature overheat trip!\n"); */
                         }
@@ -734,20 +743,6 @@ static int pcwd_temp_close(struct inode *inode, struct file *file)
 }
 
 /*
- *      Notify system
- */
-
-static int pcwd_notify_sys(struct notifier_block *this, unsigned long code, void *unused)
-{
-        if (code==SYS_DOWN || code==SYS_HALT) {
-                /* Turn the WDT off */
-                pcwd_stop();
-        }
-
-        return NOTIFY_DONE;
-}
-
-/*
  *      Kernel Interfaces
  */
 
@@ -780,10 +775,6 @@ static struct miscdevice temp_miscdev = {
         .fops =         &pcwd_temp_fops,
 };
 
-static struct notifier_block pcwd_notifier = {
-        .notifier_call =        pcwd_notify_sys,
-};
-
 /*
  *      Init & exit routines
  */
@@ -803,10 +794,67 @@ static inline int get_revision(void)
         return r;
 }
 
-static int __devinit pcwatchdog_init(int base_addr)
+/*
+ *  The ISA cards have a heartbeat bit in one of the registers, which
+ *  register is card dependent.  The heartbeat bit is monitored, and if
+ *  found, is considered proof that a Berkshire card has been found.
+ *  The initial rate is once per second at board start up, then twice
+ *  per second for normal operation.
+ */
+static int __devinit pcwd_isa_match(struct device *dev, unsigned int id)
+{
+        int base_addr=pcwd_ioports[id];
+        int port0, last_port0;  /* Reg 0, in case it's REV A */
+        int port1, last_port1;  /* Register 1 for REV C cards */
+        int i;
+        int retval;
+
+        if (debug >= DEBUG)
+                printk(KERN_DEBUG PFX "pcwd_isa_match id=%d\n",
+                        id);
+
+        if (!request_region (base_addr, 4, "PCWD")) {
+                printk(KERN_INFO PFX "Port 0x%04x unavailable\n", base_addr);
+                return 0;
+        }
+
+        retval = 0;
+
+        port0 = inb_p(base_addr);       /* For REV A boards */
+        port1 = inb_p(base_addr + 1);   /* For REV C boards */
+        if (port0 != 0xff || port1 != 0xff) {
+                /* Not an 'ff' from a floating bus, so must be a card! */
+                for (i = 0; i < 4; ++i) {
+
+                        msleep(500);
+
+                        last_port0 = port0;
+                        last_port1 = port1;
+
+                        port0 = inb_p(base_addr);
+                        port1 = inb_p(base_addr + 1);
+
+                        /* Has either hearbeat bit changed?  */
+                        if ((port0 ^ last_port0) & WD_HRTBT ||
+                            (port1 ^ last_port1) & WD_REVC_HRBT) {
+                                retval = 1;
+                                break;
+                        }
+                }
+        }
+        release_region (base_addr, 4);
+
+        return retval;
+}
+
+static int __devinit pcwd_isa_probe(struct device *dev, unsigned int id)
 {
         int ret;
 
+        if (debug >= DEBUG)
+                printk(KERN_DEBUG PFX "pcwd_isa_probe id=%d\n",
+                        id);
+
         cards_found++;
         if (cards_found == 1)
                 printk(KERN_INFO PFX "v%s Ken Hollis (kenji@bitgate.com)\n", WD_VER);
@@ -816,11 +864,13 @@ static int __devinit pcwatchdog_init(int base_addr)
                 return -ENODEV;
         }
 
-        if (base_addr == 0x0000) {
+        if (pcwd_ioports[id] == 0x0000) {
                 printk(KERN_ERR PFX "No I/O-Address for card detected\n");
                 return -ENODEV;
         }
-        pcwd_private.io_addr = base_addr;
+        pcwd_private.io_addr = pcwd_ioports[id];
+
+        spin_lock_init(&pcwd_private.io_lock);
 
         /* Check card's revision */
         pcwd_private.revision = get_revision();
@@ -828,8 +878,8 @@ static int __devinit pcwatchdog_init(int base_addr)
         if (!request_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4, "PCWD")) {
                 printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
                         pcwd_private.io_addr);
-                pcwd_private.io_addr = 0x0000;
-                return -EIO;
+                ret=-EIO;
+                goto error_request_region;
         }
 
         /* Initial variables */
@@ -865,24 +915,12 @@ static int __devinit pcwatchdog_init(int base_addr)
                         WATCHDOG_HEARTBEAT);
         }
 
-        ret = register_reboot_notifier(&pcwd_notifier);
-        if (ret) {
-                printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
-                        ret);
-                release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-                pcwd_private.io_addr = 0x0000;
-                return ret;
-        }
-
         if (pcwd_private.supports_temp) {
                 ret = misc_register(&temp_miscdev);
                 if (ret) {
                         printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
                                 TEMP_MINOR, ret);
-                        unregister_reboot_notifier(&pcwd_notifier);
-                        release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-                        pcwd_private.io_addr = 0x0000;
-                        return ret;
+                        goto error_misc_register_temp;
                 }
         }
 
@@ -890,22 +928,34 @@ static int __devinit pcwatchdog_init(int base_addr)
         if (ret) {
                 printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
                         WATCHDOG_MINOR, ret);
-                if (pcwd_private.supports_temp)
-                        misc_deregister(&temp_miscdev);
-                unregister_reboot_notifier(&pcwd_notifier);
-                release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-                pcwd_private.io_addr = 0x0000;
-                return ret;
+                goto error_misc_register_watchdog;
         }
 
         printk(KERN_INFO PFX "initialized. heartbeat=%d sec (nowayout=%d)\n",
                 heartbeat, nowayout);
 
         return 0;
+
+error_misc_register_watchdog:
+        if (pcwd_private.supports_temp)
+                misc_deregister(&temp_miscdev);
+error_misc_register_temp:
+        release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
+error_request_region:
+        pcwd_private.io_addr = 0x0000;
+        cards_found--;
+        return ret;
 }
 
-static void __devexit pcwatchdog_exit(void)
+static int __devexit pcwd_isa_remove(struct device *dev, unsigned int id)
 {
+        if (debug >= DEBUG)
+                printk(KERN_DEBUG PFX "pcwd_isa_remove id=%d\n",
+                        id);
+
+        if (!pcwd_private.io_addr)
+                return 1;
+
         /*  Disable the board  */
         if (!nowayout)
                 pcwd_stop();
@@ -914,102 +964,50 @@ static void __devexit pcwatchdog_exit(void)
         misc_deregister(&pcwd_miscdev);
         if (pcwd_private.supports_temp)
                 misc_deregister(&temp_miscdev);
-        unregister_reboot_notifier(&pcwd_notifier);
         release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
         pcwd_private.io_addr = 0x0000;
         cards_found--;
+
+        return 0;
 }
 
-/*
- *  The ISA cards have a heartbeat bit in one of the registers, which
- *  register is card dependent.  The heartbeat bit is monitored, and if
- *  found, is considered proof that a Berkshire card has been found.
- *  The initial rate is once per second at board start up, then twice
- *  per second for normal operation.
- */
-static int __init pcwd_checkcard(int base_addr)
+static void pcwd_isa_shutdown(struct device *dev, unsigned int id)
 {
-        int port0, last_port0;  /* Reg 0, in case it's REV A */
-        int port1, last_port1;  /* Register 1 for REV C cards */
-        int i;
-        int retval;
-
-        if (!request_region (base_addr, 4, "PCWD")) {
-                printk (KERN_INFO PFX "Port 0x%04x unavailable\n", base_addr);
-                return 0;
-        }
-
-        retval = 0;
-
-        port0 = inb_p(base_addr);       /* For REV A boards */
-        port1 = inb_p(base_addr + 1);   /* For REV C boards */
-        if (port0 != 0xff || port1 != 0xff) {
-                /* Not an 'ff' from a floating bus, so must be a card! */
-                for (i = 0; i < 4; ++i) {
-
-                        msleep(500);
-
-                        last_port0 = port0;
-                        last_port1 = port1;
-
-                        port0 = inb_p(base_addr);
-                        port1 = inb_p(base_addr + 1);
-
-                        /* Has either hearbeat bit changed?  */
-                        if ((port0 ^ last_port0) & WD_HRTBT ||
-                            (port1 ^ last_port1) & WD_REVC_HRBT) {
-                                retval = 1;
-                                break;
-                        }
-                }
-        }
-        release_region (base_addr, 4);
+        if (debug >= DEBUG)
+                printk(KERN_DEBUG PFX "pcwd_isa_shutdown id=%d\n",
+                        id);
 
-        return retval;
+        pcwd_stop();
 }
 
-/*
- * These are the auto-probe addresses available.
- *
- * Revision A only uses ports 0x270 and 0x370.  Revision C introduced 0x350.
- * Revision A has an address range of 2 addresses, while Revision C has 4.
- */
-static int pcwd_ioports[] = { 0x270, 0x350, 0x370, 0x000 };
+static struct isa_driver pcwd_isa_driver = {
+        .match          = pcwd_isa_match,
+        .probe          = pcwd_isa_probe,
+        .remove         = __devexit_p(pcwd_isa_remove),
+        .shutdown       = pcwd_isa_shutdown,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = WATCHDOG_NAME,
+        },
+};
 
 static int __init pcwd_init_module(void)
 {
-        int i, found = 0;
-
-        spin_lock_init(&pcwd_private.io_lock);
-
-        for (i = 0; pcwd_ioports[i] != 0; i++) {
-                if (pcwd_checkcard(pcwd_ioports[i])) {
-                        if (!(pcwatchdog_init(pcwd_ioports[i])))
-                                found++;
-                }
-        }
-
-        if (!found) {
-                printk (KERN_INFO PFX "No card detected, or port not available\n");
-                return -ENODEV;
-        }
-
-        return 0;
+        return isa_register_driver(&pcwd_isa_driver, PCWD_ISA_NR_CARDS);
 }
 
 static void __exit pcwd_cleanup_module(void)
 {
-        if (pcwd_private.io_addr)
-                pcwatchdog_exit();
-
+        isa_unregister_driver(&pcwd_isa_driver);
         printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
 }
 
 module_init(pcwd_init_module);
 module_exit(pcwd_cleanup_module);
 
-MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>");
+MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>, Wim Van Sebroeck <wim@iguana.be>");
 MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver");
+MODULE_VERSION(WATCHDOG_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS_MISCDEV(TEMP_MINOR);
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index 31037f9c9ffe..1e7a6719d5ba 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -146,7 +146,7 @@ struct usb_pcwd_private {
         atomic_t                cmd_received;           /* true if we received a report after a command */
 
         int                     exists;                 /* Wether or not the device exists */
-        struct semaphore        sem;                    /* locks this structure */
+        struct mutex            mtx;                    /* locks this structure */
 };
 static struct usb_pcwd_private *usb_pcwd_device;
 
@@ -635,7 +635,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
 
         usb_pcwd_device = usb_pcwd;
 
-        init_MUTEX (&usb_pcwd->sem);
+        mutex_init(&usb_pcwd->mtx);
         usb_pcwd->udev = udev;
         usb_pcwd->interface = interface;
         usb_pcwd->interface_number = iface_desc->desc.bInterfaceNumber;
@@ -763,7 +763,7 @@ static void usb_pcwd_disconnect(struct usb_interface *interface)
         usb_pcwd = usb_get_intfdata (interface);
         usb_set_intfdata (interface, NULL);
 
-        down (&usb_pcwd->sem);
+        mutex_lock(&usb_pcwd->mtx);
 
         /* Stop the timer before we leave */
         if (!nowayout)
@@ -777,7 +777,7 @@ static void usb_pcwd_disconnect(struct usb_interface *interface)
         misc_deregister(&usb_pcwd_temperature_miscdev);
         unregister_reboot_notifier(&usb_pcwd_notifier);
 
-        up (&usb_pcwd->sem);
+        mutex_unlock(&usb_pcwd->mtx);
 
         /* Delete the USB PCWD device */
         usb_pcwd_delete(usb_pcwd);
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index dff6cb5dc9a7..20fa29ca7404 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -379,14 +379,14 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
 
         DBG("probe: mapped wdt_base=%p\n", wdt_base);
 
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (res == NULL) {
+        wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (wdt_irq == NULL) {
                 printk(KERN_INFO PFX "failed to get irq resource\n");
                 ret = -ENOENT;
                 goto err_map;
         }
 
-        ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);
+        ret = request_irq(wdt_irq->start, s3c2410wdt_irq, 0, pdev->name, pdev);
         if (ret != 0) {
                 printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
                 goto err_map;
diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c
index 67ae42685e75..285d85289532 100644
--- a/drivers/char/watchdog/sbc8360.c
+++ b/drivers/char/watchdog/sbc8360.c
@@ -333,18 +333,17 @@ static int __init sbc8360_init(void)
         int res;
         unsigned long int mseconds = 60000;
 
-        spin_lock_init(&sbc8360_lock);
-        res = misc_register(&sbc8360_miscdev);
-        if (res) {
-                printk(KERN_ERR PFX "failed to register misc device\n");
-                goto out_nomisc;
+        if (timeout < 0 || timeout > 63) {
+                printk(KERN_ERR PFX "Invalid timeout index (must be 0-63).\n");
+                res = -EINVAL;
+                goto out;
         }
 
         if (!request_region(SBC8360_ENABLE, 1, "SBC8360")) {
                 printk(KERN_ERR PFX "ENABLE method I/O %X is not available.\n",
                        SBC8360_ENABLE);
                 res = -EIO;
-                goto out_noenablereg;
+                goto out;
         }
         if (!request_region(SBC8360_BASETIME, 1, "SBC8360")) {
                 printk(KERN_ERR PFX
@@ -360,10 +359,11 @@ static int __init sbc8360_init(void)
                 goto out_noreboot;
         }
 
-        if (timeout < 0 || timeout > 63) {
-                printk(KERN_ERR PFX "Invalid timeout index (must be 0-63).\n");
-                res = -EINVAL;
-                goto out_noreboot;
+        spin_lock_init(&sbc8360_lock);
+        res = misc_register(&sbc8360_miscdev);
+        if (res) {
+                printk(KERN_ERR PFX "failed to register misc device\n");
+                goto out_nomisc;
         }
 
         wd_margin = wd_times[timeout][0];
@@ -383,13 +383,13 @@ static int __init sbc8360_init(void)
 
         return 0;
 
+      out_nomisc:
+        unregister_reboot_notifier(&sbc8360_notifier);
       out_noreboot:
-        release_region(SBC8360_ENABLE, 1);
         release_region(SBC8360_BASETIME, 1);
-      out_noenablereg:
       out_nobasetimereg:
-        misc_deregister(&sbc8360_miscdev);
-      out_nomisc:
+        release_region(SBC8360_ENABLE, 1);
+      out:
         return res;
 }
 
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
index 337ee42c90dd..b46e7f47d705 100644
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -1,5 +1,8 @@
 /*
- *      w83627hf WDT driver
+ *      w83627hf/thf WDT driver
+ *
+ *      (c) Copyright 2007 Vlad Drukker <vlad@storewiz.com>
+ *              added support for W83627THF.
  *
  *      (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
  *
@@ -39,7 +42,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#define WATCHDOG_NAME "w83627hf WDT"
+#define WATCHDOG_NAME "w83627hf/thf WDT"
 #define PFX WATCHDOG_NAME ": "
 #define WATCHDOG_TIMEOUT 60             /* 60 sec default timeout */
 
@@ -50,7 +53,7 @@ static spinlock_t io_lock;
 /* You must set this - there is no sane way to probe for this board. */
 static int wdt_io = 0x2E;
 module_param(wdt_io, int, 0);
-MODULE_PARM_DESC(wdt_io, "w83627hf WDT io port (default 0x2E)");
+MODULE_PARM_DESC(wdt_io, "w83627hf/thf WDT io port (default 0x2E)");
 
 static int timeout = WATCHDOG_TIMEOUT;  /* in seconds */
 module_param(timeout, int, 0);
@@ -71,9 +74,19 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" _
 static void
 w83627hf_select_wd_register(void)
 {
+        unsigned char c;
         outb_p(0x87, WDT_EFER); /* Enter extended function mode */
         outb_p(0x87, WDT_EFER); /* Again according to manual */
 
+        outb(0x20, WDT_EFER);   /* check chip version   */
+        c = inb(WDT_EFDR);
+        if (c == 0x82) {        /* W83627THF            */
+                outb_p(0x2b, WDT_EFER); /* select GPIO3 */
+                c = ((inb_p(WDT_EFDR) & 0xf7) | 0x04); /* select WDT0 */
+                outb_p(0x2b, WDT_EFER);
+                outb_p(c, WDT_EFDR);    /* set GPIO3 to WDT0 */
+        }
+
         outb_p(0x07, WDT_EFER); /* point to logical device number reg */
         outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */
         outb_p(0x30, WDT_EFER); /* select CR30 */
@@ -311,7 +324,7 @@ wdt_init(void)
 
         spin_lock_init(&io_lock);
 
-        printk(KERN_INFO "WDT driver for the Winbond(TM) W83627HF Super I/O chip initialising.\n");
+        printk(KERN_INFO "WDT driver for the Winbond(TM) W83627HF/THF Super I/O chip initialising.\n");
 
         if (wdt_set_heartbeat(timeout)) {
                 wdt_set_heartbeat(WATCHDOG_TIMEOUT);
@@ -367,5 +380,5 @@ module_exit(wdt_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>");
-MODULE_DESCRIPTION("w83627hf WDT driver");
+MODULE_DESCRIPTION("w83627hf/thf WDT driver");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 893dbaf386fb..eb37fba9b7ef 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1685,9 +1685,11 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
         if (sys_dev) {
                 switch (action) {
                 case CPU_ONLINE:
+                case CPU_ONLINE_FROZEN:
                         cpufreq_add_dev(sys_dev);
                         break;
                 case CPU_DOWN_PREPARE:
+                case CPU_DOWN_PREPARE_FROZEN:
                         if (unlikely(lock_policy_rwsem_write(cpu)))
                                 BUG();
 
@@ -1699,6 +1701,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
                         __cpufreq_remove_dev(sys_dev);
                         break;
                 case CPU_DOWN_FAILED:
+                case CPU_DOWN_FAILED_FROZEN:
                         cpufreq_add_dev(sys_dev);
                         break;
                 }
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 8d053f500fc2..8532bb79e5fc 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -470,7 +470,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
         dbs_info->enable = 1;
         ondemand_powersave_bias_init();
         dbs_info->sample_type = DBS_NORMAL_SAMPLE;
-        INIT_DELAYED_WORK(&dbs_info->work, do_dbs_timer);
+        INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
         queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,
                               delay);
 }
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index d1c7cac9316c..d2f0cbd8b8f3 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -313,9 +313,11 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
                 cpufreq_update_policy(cpu);
                 break;
         case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
                 cpufreq_stats_free_table(cpu);
                 break;
         }
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index f21fe66c9eef..bb90cbd7ca51 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,10 @@
 menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
-        bool "Support for VIA PadLock ACE"
+        tristate "Support for VIA PadLock ACE"
         depends on X86_32
         select CRYPTO_ALGAPI
-        default y
+        default m
         help
           Some VIA processors come with an integrated crypto engine
           (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -51,9 +51,31 @@ config CRYPTO_DEV_GEODE
         default m
         help
           Say 'Y' here to use the AMD Geode LX processor on-board AES
-          engine for the CryptoAPI AES alogrithm.
+          engine for the CryptoAPI AES algorithm.
 
           To compile this driver as a module, choose M here: the module
           will be called geode-aes.
 
+config ZCRYPT
+        tristate "Support for PCI-attached cryptographic adapters"
+        depends on S390
+        select ZCRYPT_MONOLITHIC if ZCRYPT="y"
+        default "m"
+        help
+          Select this option if you want to use a PCI-attached cryptographic
+          adapter like:
+          + PCI Cryptographic Accelerator (PCICA)
+          + PCI Cryptographic Coprocessor (PCICC)
+          + PCI-X Cryptographic Coprocessor (PCIXCC)
+          + Crypto Express2 Coprocessor (CEX2C)
+          + Crypto Express2 Accelerator (CEX2A)
+
+config ZCRYPT_MONOLITHIC
+        bool "Monolithic zcrypt module"
+        depends on ZCRYPT="m"
+        help
+          Select this option if you want to have a single module z90crypt.ko
+          that contains all parts of the crypto device driver (ap bus,
+          request router and all the card drivers).
+
 endmenu
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 30d021d1a07c..72be6c63edfc 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "DMA Engine support"
+        depends on !S390
 
 config DMA_ENGINE
         bool "Support for DMA engines"
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 4f0898400c6d..807c402df049 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -7,6 +7,7 @@
 #
 
 menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)'
+        depends on HAS_IOMEM
 
 config EDAC
         tristate "EDAC core system error reporting (EXPERIMENTAL)"
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 161fe09a6d38..2800b3e614a9 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -261,10 +261,6 @@ static void i82875p_check(struct mem_ctl_info *mci)
         i82875p_process_error_info(mci, &info, 1);
 }
 
-#ifdef CONFIG_PROC_FS
-extern int pci_proc_attach_device(struct pci_dev *);
-#endif
-
 /* Return 0 on success or 1 on failure. */
 static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
                 struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window)
@@ -287,17 +283,12 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 
                 if (dev == NULL)
                         return 1;
+
+                pci_bus_add_device(dev);
         }
 
         *ovrfl_pdev = dev;
 
-#ifdef CONFIG_PROC_FS
-        if ((dev->procent == NULL) && pci_proc_attach_device(dev)) {
-                i82875p_printk(KERN_ERR, "%s(): Failed to attach overflow "
-                               "device\n", __func__);
-                return 1;
-        }
-#endif  /* CONFIG_PROC_FS */
         if (pci_enable_device(dev)) {
                 i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "
                                "device\n", __func__);
diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c
index 9b4fcac03ad5..3074879f231f 100644
--- a/drivers/eisa/virtual_root.c
+++ b/drivers/eisa/virtual_root.c
@@ -47,7 +47,7 @@ static void virtual_eisa_release (struct device *dev)
         /* nothing really to do here */
 }
 
-static int virtual_eisa_root_init (void)
+static int __init virtual_eisa_root_init (void)
 {
         int r;
         
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
new file mode 100644
index 000000000000..5932c72f9e42
--- /dev/null
+++ b/drivers/firewire/Kconfig
@@ -0,0 +1,61 @@
+# -*- shell-script -*-
+
+comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
+        depends on EXPERIMENTAL=n
+
+config FIREWIRE
+        tristate "IEEE 1394 (FireWire) support (JUJU alternative stack, experimental)"
+        depends on EXPERIMENTAL
+        select CRC_ITU_T
+        help
+          IEEE 1394 describes a high performance serial bus, which is also
+          known as FireWire(tm) or i.Link(tm) and is used for connecting all
+          sorts of devices (most notably digital video cameras) to your
+          computer.
+
+          If you have FireWire hardware and want to use it, say Y here.  This
+          is the core support only, you will also need to select a driver for
+          your IEEE 1394 adapter.
+
+          To compile this driver as a module, say M here: the module will be
+          called fw-core.
+
+          This is the "JUJU" FireWire stack, an alternative implementation
+          designed for robustness and simplicity.  You can build either this
+          stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
+          or both.
+
+config FIREWIRE_OHCI
+        tristate "Support for OHCI FireWire host controllers"
+        depends on PCI && FIREWIRE
+        help
+          Enable this driver if you have a FireWire controller based
+          on the OHCI specification.  For all practical purposes, this
+          is the only chipset in use, so say Y here.
+
+          To compile this driver as a module, say M here:  The module will be
+          called fw-ohci.
+
+          If you also build ohci1394 of the classic IEEE 1394 driver stack,
+          blacklist either ohci1394 or fw-ohci to let hotplug load the desired
+          driver.
+
+config FIREWIRE_SBP2
+        tristate "Support for storage devices (SBP-2 protocol driver)"
+        depends on FIREWIRE && SCSI
+        help
+          This option enables you to use SBP-2 devices connected to a
+          FireWire bus.  SBP-2 devices include storage devices like
+          harddisks and DVD drives, also some other FireWire devices
+          like scanners.
+
+          To compile this driver as a module, say M here:  The module will be
+          called fw-sbp2.
+
+          You should also enable support for disks, CD-ROMs, etc. in the SCSI
+          configuration section.
+
+          If you also build sbp2 of the classic IEEE 1394 driver stack,
+          blacklist either sbp2 or fw-sbp2 to let hotplug load the desired
+          driver.
+
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
new file mode 100644
index 000000000000..fc7d59d4bce0
--- /dev/null
+++ b/drivers/firewire/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the Linux IEEE 1394 implementation
+#
+
+fw-core-y += fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
+        fw-device.o fw-cdev.o
+
+obj-$(CONFIG_FIREWIRE) += fw-core.o
+obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o
+obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
new file mode 100644
index 000000000000..636151a64add
--- /dev/null
+++ b/drivers/firewire/fw-card.c
@@ -0,0 +1,560 @@
+/*
+ * Copyright (C) 2005-2007  Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/device.h>
+#include <linux/mutex.h>
+#include <linux/crc-itu-t.h>
+#include "fw-transaction.h"
+#include "fw-topology.h"
+#include "fw-device.h"
+
+int fw_compute_block_crc(u32 *block)
+{
+        __be32 be32_block[256];
+        int i, length;
+
+        length = (*block >> 16) & 0xff;
+        for (i = 0; i < length; i++)
+                be32_block[i] = cpu_to_be32(block[i + 1]);
+        *block |= crc_itu_t(0, (u8 *) be32_block, length * 4);
+
+        return length;
+}
+
+static DEFINE_MUTEX(card_mutex);
+static LIST_HEAD(card_list);
+
+static LIST_HEAD(descriptor_list);
+static int descriptor_count;
+
+#define BIB_CRC(v)              ((v) <<  0)
+#define BIB_CRC_LENGTH(v)       ((v) << 16)
+#define BIB_INFO_LENGTH(v)      ((v) << 24)
+
+#define BIB_LINK_SPEED(v)       ((v) <<  0)
+#define BIB_GENERATION(v)       ((v) <<  4)
+#define BIB_MAX_ROM(v)          ((v) <<  8)
+#define BIB_MAX_RECEIVE(v)      ((v) << 12)
+#define BIB_CYC_CLK_ACC(v)      ((v) << 16)
+#define BIB_PMC                 ((1) << 27)
+#define BIB_BMC                 ((1) << 28)
+#define BIB_ISC                 ((1) << 29)
+#define BIB_CMC                 ((1) << 30)
+#define BIB_IMC                 ((1) << 31)
+
+static u32 *
+generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+{
+        struct fw_descriptor *desc;
+        static u32 config_rom[256];
+        int i, j, length;
+
+        /*
+         * Initialize contents of config rom buffer.  On the OHCI
+         * controller, block reads to the config rom accesses the host
+         * memory, but quadlet read access the hardware bus info block
+         * registers.  That's just crack, but it means we should make
+         * sure the contents of bus info block in host memory mathces
+         * the version stored in the OHCI registers.
+         */
+
+        memset(config_rom, 0, sizeof(config_rom));
+        config_rom[0] = BIB_CRC_LENGTH(4) | BIB_INFO_LENGTH(4) | BIB_CRC(0);
+        config_rom[1] = 0x31333934;
+
+        config_rom[2] =
+                BIB_LINK_SPEED(card->link_speed) |
+                BIB_GENERATION(card->config_rom_generation++ % 14 + 2) |
+                BIB_MAX_ROM(2) |
+                BIB_MAX_RECEIVE(card->max_receive) |
+                BIB_BMC | BIB_ISC | BIB_CMC | BIB_IMC;
+        config_rom[3] = card->guid >> 32;
+        config_rom[4] = card->guid;
+
+        /* Generate root directory. */
+        i = 5;
+        config_rom[i++] = 0;
+        config_rom[i++] = 0x0c0083c0; /* node capabilities */
+        j = i + descriptor_count;
+
+        /* Generate root directory entries for descriptors. */
+        list_for_each_entry (desc, &descriptor_list, link) {
+                if (desc->immediate > 0)
+                        config_rom[i++] = desc->immediate;
+                config_rom[i] = desc->key | (j - i);
+                i++;
+                j += desc->length;
+        }
+
+        /* Update root directory length. */
+        config_rom[5] = (i - 5 - 1) << 16;
+
+        /* End of root directory, now copy in descriptors. */
+        list_for_each_entry (desc, &descriptor_list, link) {
+                memcpy(&config_rom[i], desc->data, desc->length * 4);
+                i += desc->length;
+        }
+
+        /* Calculate CRCs for all blocks in the config rom.  This
+         * assumes that CRC length and info length are identical for
+         * the bus info block, which is always the case for this
+         * implementation. */
+        for (i = 0; i < j; i += length + 1)
+                length = fw_compute_block_crc(config_rom + i);
+
+        *config_rom_length = j;
+
+        return config_rom;
+}
+
+static void
+update_config_roms(void)
+{
+        struct fw_card *card;
+        u32 *config_rom;
+        size_t length;
+
+        list_for_each_entry (card, &card_list, link) {
+                config_rom = generate_config_rom(card, &length);
+                card->driver->set_config_rom(card, config_rom, length);
+        }
+}
+
+int
+fw_core_add_descriptor(struct fw_descriptor *desc)
+{
+        size_t i;
+
+        /*
+         * Check descriptor is valid; the length of all blocks in the
+         * descriptor has to add up to exactly the length of the
+         * block.
+         */
+        i = 0;
+        while (i < desc->length)
+                i += (desc->data[i] >> 16) + 1;
+
+        if (i != desc->length)
+                return -EINVAL;
+
+        mutex_lock(&card_mutex);
+
+        list_add_tail(&desc->link, &descriptor_list);
+        descriptor_count++;
+        if (desc->immediate > 0)
+                descriptor_count++;
+        update_config_roms();
+
+        mutex_unlock(&card_mutex);
+
+        return 0;
+}
+EXPORT_SYMBOL(fw_core_add_descriptor);
+
+void
+fw_core_remove_descriptor(struct fw_descriptor *desc)
+{
+        mutex_lock(&card_mutex);
+
+        list_del(&desc->link);
+        descriptor_count--;
+        if (desc->immediate > 0)
+                descriptor_count--;
+        update_config_roms();
+
+        mutex_unlock(&card_mutex);
+}
+EXPORT_SYMBOL(fw_core_remove_descriptor);
+
+static const char gap_count_table[] = {
+        63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
+};
+
+struct bm_data {
+        struct fw_transaction t;
+        struct {
+                __be32 arg;
+                __be32 data;
+        } lock;
+        u32 old;
+        int rcode;
+        struct completion done;
+};
+
+static void
+complete_bm_lock(struct fw_card *card, int rcode,
+                 void *payload, size_t length, void *data)
+{
+        struct bm_data *bmd = data;
+
+        if (rcode == RCODE_COMPLETE)
+                bmd->old = be32_to_cpu(*(__be32 *) payload);
+        bmd->rcode = rcode;
+        complete(&bmd->done);
+}
+
+static void
+fw_card_bm_work(struct work_struct *work)
+{
+        struct fw_card *card = container_of(work, struct fw_card, work.work);
+        struct fw_device *root;
+        struct bm_data bmd;
+        unsigned long flags;
+        int root_id, new_root_id, irm_id, gap_count, generation, grace;
+        int do_reset = 0;
+
+        spin_lock_irqsave(&card->lock, flags);
+
+        generation = card->generation;
+        root = card->root_node->data;
+        root_id = card->root_node->node_id;
+        grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10));
+
+        if (card->bm_generation + 1 == generation ||
+            (card->bm_generation != generation && grace)) {
+                /*
+                 * This first step is to figure out who is IRM and
+                 * then try to become bus manager.  If the IRM is not
+                 * well defined (e.g. does not have an active link
+                 * layer or does not responds to our lock request, we
+                 * will have to do a little vigilante bus management.
+                 * In that case, we do a goto into the gap count logic
+                 * so that when we do the reset, we still optimize the
+                 * gap count.  That could well save a reset in the
+                 * next generation.
+                 */
+
+                irm_id = card->irm_node->node_id;
+                if (!card->irm_node->link_on) {
+                        new_root_id = card->local_node->node_id;
+                        fw_notify("IRM has link off, making local node (%02x) root.\n",
+                                  new_root_id);
+                        goto pick_me;
+                }
+
+                bmd.lock.arg = cpu_to_be32(0x3f);
+                bmd.lock.data = cpu_to_be32(card->local_node->node_id);
+
+                spin_unlock_irqrestore(&card->lock, flags);
+
+                init_completion(&bmd.done);
+                fw_send_request(card, &bmd.t, TCODE_LOCK_COMPARE_SWAP,
+                                irm_id, generation,
+                                SCODE_100, CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
+                                &bmd.lock, sizeof(bmd.lock),
+                                complete_bm_lock, &bmd);
+                wait_for_completion(&bmd.done);
+
+                if (bmd.rcode == RCODE_GENERATION) {
+                        /*
+                         * Another bus reset happened. Just return,
+                         * the BM work has been rescheduled.
+                         */
+                        return;
+                }
+
+                if (bmd.rcode == RCODE_COMPLETE && bmd.old != 0x3f)
+                        /* Somebody else is BM, let them do the work. */
+                        return;
+
+                spin_lock_irqsave(&card->lock, flags);
+                if (bmd.rcode != RCODE_COMPLETE) {
+                        /*
+                         * The lock request failed, maybe the IRM
+                         * isn't really IRM capable after all. Let's
+                         * do a bus reset and pick the local node as
+                         * root, and thus, IRM.
+                         */
+                        new_root_id = card->local_node->node_id;
+                        fw_notify("BM lock failed, making local node (%02x) root.\n",
+                                  new_root_id);
+                        goto pick_me;
+                }
+        } else if (card->bm_generation != generation) {
+                /*
+                 * OK, we weren't BM in the last generation, and it's
+                 * less than 100ms since last bus reset. Reschedule
+                 * this task 100ms from now.
+                 */
+                spin_unlock_irqrestore(&card->lock, flags);
+                schedule_delayed_work(&card->work, DIV_ROUND_UP(HZ, 10));
+                return;
+        }
+
+        /*
+         * We're bus manager for this generation, so next step is to
+         * make sure we have an active cycle master and do gap count
+         * optimization.
+         */
+        card->bm_generation = generation;
+
+        if (root == NULL) {
+                /*
+                 * Either link_on is false, or we failed to read the
+                 * config rom.  In either case, pick another root.
+                 */
+                new_root_id = card->local_node->node_id;
+        } else if (atomic_read(&root->state) != FW_DEVICE_RUNNING) {
+                /*
+                 * If we haven't probed this device yet, bail out now
+                 * and let's try again once that's done.
+                 */
+                spin_unlock_irqrestore(&card->lock, flags);
+                return;
+        } else if (root->config_rom[2] & BIB_CMC) {
+                /*
+                 * FIXME: I suppose we should set the cmstr bit in the
+                 * STATE_CLEAR register of this node, as described in
+                 * 1394-1995, 8.4.2.6.  Also, send out a force root
+                 * packet for this node.
+                 */
+                new_root_id = root_id;
+        } else {
+                /*
+                 * Current root has an active link layer and we
+                 * successfully read the config rom, but it's not
+                 * cycle master capable.
+                 */
+                new_root_id = card->local_node->node_id;
+        }
+
+ pick_me:
+        /* Now figure out what gap count to set. */
+        if (card->topology_type == FW_TOPOLOGY_A &&
+            card->root_node->max_hops < ARRAY_SIZE(gap_count_table))
+                gap_count = gap_count_table[card->root_node->max_hops];
+        else
+                gap_count = 63;
+
+        /*
+         * Finally, figure out if we should do a reset or not.  If we've
+         * done less that 5 resets with the same physical topology and we
+         * have either a new root or a new gap count setting, let's do it.
+         */
+
+        if (card->bm_retries++ < 5 &&
+            (card->gap_count != gap_count || new_root_id != root_id))
+                do_reset = 1;
+
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        if (do_reset) {
+                fw_notify("phy config: card %d, new root=%x, gap_count=%d\n",
+                          card->index, new_root_id, gap_count);
+                fw_send_phy_config(card, new_root_id, generation, gap_count);
+                fw_core_initiate_bus_reset(card, 1);
+        }
+}
+
+static void
+flush_timer_callback(unsigned long data)
+{
+        struct fw_card *card = (struct fw_card *)data;
+
+        fw_flush_transactions(card);
+}
+
+void
+fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
+                   struct device *device)
+{
+        static atomic_t index = ATOMIC_INIT(-1);
+
+        kref_init(&card->kref);
+        card->index = atomic_inc_return(&index);
+        card->driver = driver;
+        card->device = device;
+        card->current_tlabel = 0;
+        card->tlabel_mask = 0;
+        card->color = 0;
+
+        INIT_LIST_HEAD(&card->transaction_list);
+        spin_lock_init(&card->lock);
+        setup_timer(&card->flush_timer,
+                    flush_timer_callback, (unsigned long)card);
+
+        card->local_node = NULL;
+
+        INIT_DELAYED_WORK(&card->work, fw_card_bm_work);
+}
+EXPORT_SYMBOL(fw_card_initialize);
+
+int
+fw_card_add(struct fw_card *card,
+            u32 max_receive, u32 link_speed, u64 guid)
+{
+        u32 *config_rom;
+        size_t length;
+
+        card->max_receive = max_receive;
+        card->link_speed = link_speed;
+        card->guid = guid;
+
+        /* Activate link_on bit and contender bit in our self ID packets.*/
+        if (card->driver->update_phy_reg(card, 4, 0,
+                                         PHY_LINK_ACTIVE | PHY_CONTENDER) < 0)
+                return -EIO;
+
+        /*
+         * The subsystem grabs a reference when the card is added and
+         * drops it when the driver calls fw_core_remove_card.
+         */
+        fw_card_get(card);
+
+        mutex_lock(&card_mutex);
+        config_rom = generate_config_rom(card, &length);
+        list_add_tail(&card->link, &card_list);
+        mutex_unlock(&card_mutex);
+
+        return card->driver->enable(card, config_rom, length);
+}
+EXPORT_SYMBOL(fw_card_add);
+
+
+/*
+ * The next few functions implements a dummy driver that use once a
+ * card driver shuts down an fw_card.  This allows the driver to
+ * cleanly unload, as all IO to the card will be handled by the dummy
+ * driver instead of calling into the (possibly) unloaded module.  The
+ * dummy driver just fails all IO.
+ */
+
+static int
+dummy_enable(struct fw_card *card, u32 *config_rom, size_t length)
+{
+        BUG();
+        return -1;
+}
+
+static int
+dummy_update_phy_reg(struct fw_card *card, int address,
+                     int clear_bits, int set_bits)
+{
+        return -ENODEV;
+}
+
+static int
+dummy_set_config_rom(struct fw_card *card,
+                     u32 *config_rom, size_t length)
+{
+        /*
+         * We take the card out of card_list before setting the dummy
+         * driver, so this should never get called.
+         */
+        BUG();
+        return -1;
+}
+
+static void
+dummy_send_request(struct fw_card *card, struct fw_packet *packet)
+{
+        packet->callback(packet, card, -ENODEV);
+}
+
+static void
+dummy_send_response(struct fw_card *card, struct fw_packet *packet)
+{
+        packet->callback(packet, card, -ENODEV);
+}
+
+static int
+dummy_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+{
+        return -ENOENT;
+}
+
+static int
+dummy_enable_phys_dma(struct fw_card *card,
+                      int node_id, int generation)
+{
+        return -ENODEV;
+}
+
+static struct fw_card_driver dummy_driver = {
+        .name            = "dummy",
+        .enable          = dummy_enable,
+        .update_phy_reg  = dummy_update_phy_reg,
+        .set_config_rom  = dummy_set_config_rom,
+        .send_request    = dummy_send_request,
+        .cancel_packet   = dummy_cancel_packet,
+        .send_response   = dummy_send_response,
+        .enable_phys_dma = dummy_enable_phys_dma,
+};
+
+void
+fw_core_remove_card(struct fw_card *card)
+{
+        card->driver->update_phy_reg(card, 4,
+                                     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
+        fw_core_initiate_bus_reset(card, 1);
+
+        mutex_lock(&card_mutex);
+        list_del(&card->link);
+        mutex_unlock(&card_mutex);
+
+        /* Set up the dummy driver. */
+        card->driver = &dummy_driver;
+
+        fw_flush_transactions(card);
+
+        fw_destroy_nodes(card);
+
+        fw_card_put(card);
+}
+EXPORT_SYMBOL(fw_core_remove_card);
+
+struct fw_card *
+fw_card_get(struct fw_card *card)
+{
+        kref_get(&card->kref);
+
+        return card;
+}
+EXPORT_SYMBOL(fw_card_get);
+
+static void
+release_card(struct kref *kref)
+{
+        struct fw_card *card = container_of(kref, struct fw_card, kref);
+
+        kfree(card);
+}
+
+/*
+ * An assumption for fw_card_put() is that the card driver allocates
+ * the fw_card struct with kalloc and that it has been shut down
+ * before the last ref is dropped.
+ */
+void
+fw_card_put(struct fw_card *card)
+{
+        kref_put(&card->kref, release_card);
+}
+EXPORT_SYMBOL(fw_card_put);
+
+int
+fw_core_initiate_bus_reset(struct fw_card *card, int short_reset)
+{
+        int reg = short_reset ? 5 : 1;
+        int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;
+
+        return card->driver->update_phy_reg(card, reg, 0, bit);
+}
+EXPORT_SYMBOL(fw_core_initiate_bus_reset);
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
new file mode 100644
index 000000000000..0fa5bd54c6a1
--- /dev/null
+++ b/drivers/firewire/fw-cdev.c
@@ -0,0 +1,961 @@
+/*
+ * Char device for device raw access
+ *
+ * Copyright (C) 2005-2007  Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/wait.h>
+#include <linux/errno.h>
+#include <linux/device.h>
+#include <linux/vmalloc.h>
+#include <linux/poll.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/idr.h>
+#include <linux/compat.h>
+#include <linux/firewire-cdev.h>
+#include <asm/uaccess.h>
+#include "fw-transaction.h"
+#include "fw-topology.h"
+#include "fw-device.h"
+
+struct client;
+struct client_resource {
+        struct list_head link;
+        void (*release)(struct client *client, struct client_resource *r);
+        u32 handle;
+};
+
+/*
+ * dequeue_event() just kfree()'s the event, so the event has to be
+ * the first field in the struct.
+ */
+
+struct event {
+        struct { void *data; size_t size; } v[2];
+        struct list_head link;
+};
+
+struct bus_reset {
+        struct event event;
+        struct fw_cdev_event_bus_reset reset;
+};
+
+struct response {
+        struct event event;
+        struct fw_transaction transaction;
+        struct client *client;
+        struct client_resource resource;
+        struct fw_cdev_event_response response;
+};
+
+struct iso_interrupt {
+        struct event event;
+        struct fw_cdev_event_iso_interrupt interrupt;
+};
+
+struct client {
+        u32 version;
+        struct fw_device *device;
+        spinlock_t lock;
+        u32 resource_handle;
+        struct list_head resource_list;
+        struct list_head event_list;
+        wait_queue_head_t wait;
+        u64 bus_reset_closure;
+
+        struct fw_iso_context *iso_context;
+        u64 iso_closure;
+        struct fw_iso_buffer buffer;
+        unsigned long vm_start;
+
+        struct list_head link;
+};
+
+static inline void __user *
+u64_to_uptr(__u64 value)
+{
+        return (void __user *)(unsigned long)value;
+}
+
+static inline __u64
+uptr_to_u64(void __user *ptr)
+{
+        return (__u64)(unsigned long)ptr;
+}
+
+static int fw_device_op_open(struct inode *inode, struct file *file)
+{
+        struct fw_device *device;
+        struct client *client;
+        unsigned long flags;
+
+        device = fw_device_from_devt(inode->i_rdev);
+        if (device == NULL)
+                return -ENODEV;
+
+        client = kzalloc(sizeof(*client), GFP_KERNEL);
+        if (client == NULL)
+                return -ENOMEM;
+
+        client->device = fw_device_get(device);
+        INIT_LIST_HEAD(&client->event_list);
+        INIT_LIST_HEAD(&client->resource_list);
+        spin_lock_init(&client->lock);
+        init_waitqueue_head(&client->wait);
+
+        file->private_data = client;
+
+        spin_lock_irqsave(&device->card->lock, flags);
+        list_add_tail(&client->link, &device->client_list);
+        spin_unlock_irqrestore(&device->card->lock, flags);
+
+        return 0;
+}
+
+static void queue_event(struct client *client, struct event *event,
+                        void *data0, size_t size0, void *data1, size_t size1)
+{
+        unsigned long flags;
+
+        event->v[0].data = data0;
+        event->v[0].size = size0;
+        event->v[1].data = data1;
+        event->v[1].size = size1;
+
+        spin_lock_irqsave(&client->lock, flags);
+
+        list_add_tail(&event->link, &client->event_list);
+        wake_up_interruptible(&client->wait);
+
+        spin_unlock_irqrestore(&client->lock, flags);
+}
+
+static int
+dequeue_event(struct client *client, char __user *buffer, size_t count)
+{
+        unsigned long flags;
+        struct event *event;
+        size_t size, total;
+        int i, retval;
+
+        retval = wait_event_interruptible(client->wait,
+                                          !list_empty(&client->event_list) ||
+                                          fw_device_is_shutdown(client->device));
+        if (retval < 0)
+                return retval;
+
+        if (list_empty(&client->event_list) &&
+                       fw_device_is_shutdown(client->device))
+                return -ENODEV;
+
+        spin_lock_irqsave(&client->lock, flags);
+        event = container_of(client->event_list.next, struct event, link);
+        list_del(&event->link);
+        spin_unlock_irqrestore(&client->lock, flags);
+
+        total = 0;
+        for (i = 0; i < ARRAY_SIZE(event->v) && total < count; i++) {
+                size = min(event->v[i].size, count - total);
+                if (copy_to_user(buffer + total, event->v[i].data, size)) {
+                        retval = -EFAULT;
+                        goto out;
+                }
+                total += size;
+        }
+        retval = total;
+
+ out:
+        kfree(event);
+
+        return retval;
+}
+
+static ssize_t
+fw_device_op_read(struct file *file,
+                  char __user *buffer, size_t count, loff_t *offset)
+{
+        struct client *client = file->private_data;
+
+        return dequeue_event(client, buffer, count);
+}
+
+static void
+fill_bus_reset_event(struct fw_cdev_event_bus_reset *event,
+                     struct client *client)
+{
+        struct fw_card *card = client->device->card;
+
+        event->closure       = client->bus_reset_closure;
+        event->type          = FW_CDEV_EVENT_BUS_RESET;
+        event->node_id       = client->device->node_id;
+        event->local_node_id = card->local_node->node_id;
+        event->bm_node_id    = 0; /* FIXME: We don't track the BM. */
+        event->irm_node_id   = card->irm_node->node_id;
+        event->root_node_id  = card->root_node->node_id;
+        event->generation    = card->generation;
+}
+
+static void
+for_each_client(struct fw_device *device,
+                void (*callback)(struct client *client))
+{
+        struct fw_card *card = device->card;
+        struct client *c;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->lock, flags);
+
+        list_for_each_entry(c, &device->client_list, link)
+                callback(c);
+
+        spin_unlock_irqrestore(&card->lock, flags);
+}
+
+static void
+queue_bus_reset_event(struct client *client)
+{
+        struct bus_reset *bus_reset;
+
+        bus_reset = kzalloc(sizeof(*bus_reset), GFP_ATOMIC);
+        if (bus_reset == NULL) {
+                fw_notify("Out of memory when allocating bus reset event\n");
+                return;
+        }
+
+        fill_bus_reset_event(&bus_reset->reset, client);
+
+        queue_event(client, &bus_reset->event,
+                    &bus_reset->reset, sizeof(bus_reset->reset), NULL, 0);
+}
+
+void fw_device_cdev_update(struct fw_device *device)
+{
+        for_each_client(device, queue_bus_reset_event);
+}
+
+static void wake_up_client(struct client *client)
+{
+        wake_up_interruptible(&client->wait);
+}
+
+void fw_device_cdev_remove(struct fw_device *device)
+{
+        for_each_client(device, wake_up_client);
+}
+
+static int ioctl_get_info(struct client *client, void *buffer)
+{
+        struct fw_cdev_get_info *get_info = buffer;
+        struct fw_cdev_event_bus_reset bus_reset;
+
+        client->version = get_info->version;
+        get_info->version = FW_CDEV_VERSION;
+
+        if (get_info->rom != 0) {
+                void __user *uptr = u64_to_uptr(get_info->rom);
+                size_t want = get_info->rom_length;
+                size_t have = client->device->config_rom_length * 4;
+
+                if (copy_to_user(uptr, client->device->config_rom,
+                                 min(want, have)))
+                        return -EFAULT;
+        }
+        get_info->rom_length = client->device->config_rom_length * 4;
+
+        client->bus_reset_closure = get_info->bus_reset_closure;
+        if (get_info->bus_reset != 0) {
+                void __user *uptr = u64_to_uptr(get_info->bus_reset);
+
+                fill_bus_reset_event(&bus_reset, client);
+                if (copy_to_user(uptr, &bus_reset, sizeof(bus_reset)))
+                        return -EFAULT;
+        }
+
+        get_info->card = client->device->card->index;
+
+        return 0;
+}
+
+static void
+add_client_resource(struct client *client, struct client_resource *resource)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&client->lock, flags);
+        list_add_tail(&resource->link, &client->resource_list);
+        resource->handle = client->resource_handle++;
+        spin_unlock_irqrestore(&client->lock, flags);
+}
+
+static int
+release_client_resource(struct client *client, u32 handle,
+                        struct client_resource **resource)
+{
+        struct client_resource *r;
+        unsigned long flags;
+
+        spin_lock_irqsave(&client->lock, flags);
+        list_for_each_entry(r, &client->resource_list, link) {
+                if (r->handle == handle) {
+                        list_del(&r->link);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&client->lock, flags);
+
+        if (&r->link == &client->resource_list)
+                return -EINVAL;
+
+        if (resource)
+                *resource = r;
+        else
+                r->release(client, r);
+
+        return 0;
+}
+
+static void
+release_transaction(struct client *client, struct client_resource *resource)
+{
+        struct response *response =
+                container_of(resource, struct response, resource);
+
+        fw_cancel_transaction(client->device->card, &response->transaction);
+}
+
+static void
+complete_transaction(struct fw_card *card, int rcode,
+                     void *payload, size_t length, void *data)
+{
+        struct response *response = data;
+        struct client *client = response->client;
+        unsigned long flags;
+
+        if (length < response->response.length)
+                response->response.length = length;
+        if (rcode == RCODE_COMPLETE)
+                memcpy(response->response.data, payload,
+                       response->response.length);
+
+        spin_lock_irqsave(&client->lock, flags);
+        list_del(&response->resource.link);
+        spin_unlock_irqrestore(&client->lock, flags);
+
+        response->response.type   = FW_CDEV_EVENT_RESPONSE;
+        response->response.rcode  = rcode;
+        queue_event(client, &response->event,
+                    &response->response, sizeof(response->response),
+                    response->response.data, response->response.length);
+}
+
+static ssize_t ioctl_send_request(struct client *client, void *buffer)
+{
+        struct fw_device *device = client->device;
+        struct fw_cdev_send_request *request = buffer;
+        struct response *response;
+
+        /* What is the biggest size we'll accept, really? */
+        if (request->length > 4096)
+                return -EINVAL;
+
+        response = kmalloc(sizeof(*response) + request->length, GFP_KERNEL);
+        if (response == NULL)
+                return -ENOMEM;
+
+        response->client = client;
+        response->response.length = request->length;
+        response->response.closure = request->closure;
+
+        if (request->data &&
+            copy_from_user(response->response.data,
+                           u64_to_uptr(request->data), request->length)) {
+                kfree(response);
+                return -EFAULT;
+        }
+
+        response->resource.release = release_transaction;
+        add_client_resource(client, &response->resource);
+
+        fw_send_request(device->card, &response->transaction,
+                        request->tcode & 0x1f,
+                        device->node->node_id,
+                        request->generation,
+                        device->node->max_speed,
+                        request->offset,
+                        response->response.data, request->length,
+                        complete_transaction, response);
+
+        if (request->data)
+                return sizeof(request) + request->length;
+        else
+                return sizeof(request);
+}
+
+struct address_handler {
+        struct fw_address_handler handler;
+        __u64 closure;
+        struct client *client;
+        struct client_resource resource;
+};
+
+struct request {
+        struct fw_request *request;
+        void *data;
+        size_t length;
+        struct client_resource resource;
+};
+
+struct request_event {
+        struct event event;
+        struct fw_cdev_event_request request;
+};
+
+static void
+release_request(struct client *client, struct client_resource *resource)
+{
+        struct request *request =
+                container_of(resource, struct request, resource);
+
+        fw_send_response(client->device->card, request->request,
+                         RCODE_CONFLICT_ERROR);
+        kfree(request);
+}
+
+static void
+handle_request(struct fw_card *card, struct fw_request *r,
+               int tcode, int destination, int source,
+               int generation, int speed,
+               unsigned long long offset,
+               void *payload, size_t length, void *callback_data)
+{
+        struct address_handler *handler = callback_data;
+        struct request *request;
+        struct request_event *e;
+        struct client *client = handler->client;
+
+        request = kmalloc(sizeof(*request), GFP_ATOMIC);
+        e = kmalloc(sizeof(*e), GFP_ATOMIC);
+        if (request == NULL || e == NULL) {
+                kfree(request);
+                kfree(e);
+                fw_send_response(card, r, RCODE_CONFLICT_ERROR);
+                return;
+        }
+
+        request->request = r;
+        request->data    = payload;
+        request->length  = length;
+
+        request->resource.release = release_request;
+        add_client_resource(client, &request->resource);
+
+        e->request.type    = FW_CDEV_EVENT_REQUEST;
+        e->request.tcode   = tcode;
+        e->request.offset  = offset;
+        e->request.length  = length;
+        e->request.handle  = request->resource.handle;
+        e->request.closure = handler->closure;
+
+        queue_event(client, &e->event,
+                    &e->request, sizeof(e->request), payload, length);
+}
+
+static void
+release_address_handler(struct client *client,
+                        struct client_resource *resource)
+{
+        struct address_handler *handler =
+                container_of(resource, struct address_handler, resource);
+
+        fw_core_remove_address_handler(&handler->handler);
+        kfree(handler);
+}
+
+static int ioctl_allocate(struct client *client, void *buffer)
+{
+        struct fw_cdev_allocate *request = buffer;
+        struct address_handler *handler;
+        struct fw_address_region region;
+
+        handler = kmalloc(sizeof(*handler), GFP_KERNEL);
+        if (handler == NULL)
+                return -ENOMEM;
+
+        region.start = request->offset;
+        region.end = request->offset + request->length;
+        handler->handler.length = request->length;
+        handler->handler.address_callback = handle_request;
+        handler->handler.callback_data = handler;
+        handler->closure = request->closure;
+        handler->client = client;
+
+        if (fw_core_add_address_handler(&handler->handler, &region) < 0) {
+                kfree(handler);
+                return -EBUSY;
+        }
+
+        handler->resource.release = release_address_handler;
+        add_client_resource(client, &handler->resource);
+        request->handle = handler->resource.handle;
+
+        return 0;
+}
+
+static int ioctl_deallocate(struct client *client, void *buffer)
+{
+        struct fw_cdev_deallocate *request = buffer;
+
+        return release_client_resource(client, request->handle, NULL);
+}
+
+static int ioctl_send_response(struct client *client, void *buffer)
+{
+        struct fw_cdev_send_response *request = buffer;
+        struct client_resource *resource;
+        struct request *r;
+
+        if (release_client_resource(client, request->handle, &resource) < 0)
+                return -EINVAL;
+        r = container_of(resource, struct request, resource);
+        if (request->length < r->length)
+                r->length = request->length;
+        if (copy_from_user(r->data, u64_to_uptr(request->data), r->length))
+                return -EFAULT;
+
+        fw_send_response(client->device->card, r->request, request->rcode);
+        kfree(r);
+
+        return 0;
+}
+
+static int ioctl_initiate_bus_reset(struct client *client, void *buffer)
+{
+        struct fw_cdev_initiate_bus_reset *request = buffer;
+        int short_reset;
+
+        short_reset = (request->type == FW_CDEV_SHORT_RESET);
+
+        return fw_core_initiate_bus_reset(client->device->card, short_reset);
+}
+
+struct descriptor {
+        struct fw_descriptor d;
+        struct client_resource resource;
+        u32 data[0];
+};
+
+static void release_descriptor(struct client *client,
+                               struct client_resource *resource)
+{
+        struct descriptor *descriptor =
+                container_of(resource, struct descriptor, resource);
+
+        fw_core_remove_descriptor(&descriptor->d);
+        kfree(descriptor);
+}
+
+static int ioctl_add_descriptor(struct client *client, void *buffer)
+{
+        struct fw_cdev_add_descriptor *request = buffer;
+        struct descriptor *descriptor;
+        int retval;
+
+        if (request->length > 256)
+                return -EINVAL;
+
+        descriptor =
+                kmalloc(sizeof(*descriptor) + request->length * 4, GFP_KERNEL);
+        if (descriptor == NULL)
+                return -ENOMEM;
+
+        if (copy_from_user(descriptor->data,
+                           u64_to_uptr(request->data), request->length * 4)) {
+                kfree(descriptor);
+                return -EFAULT;
+        }
+
+        descriptor->d.length = request->length;
+        descriptor->d.immediate = request->immediate;
+        descriptor->d.key = request->key;
+        descriptor->d.data = descriptor->data;
+
+        retval = fw_core_add_descriptor(&descriptor->d);
+        if (retval < 0) {
+                kfree(descriptor);
+                return retval;
+        }
+
+        descriptor->resource.release = release_descriptor;
+        add_client_resource(client, &descriptor->resource);
+        request->handle = descriptor->resource.handle;
+
+        return 0;
+}
+
+static int ioctl_remove_descriptor(struct client *client, void *buffer)
+{
+        struct fw_cdev_remove_descriptor *request = buffer;
+
+        return release_client_resource(client, request->handle, NULL);
+}
+
+static void
+iso_callback(struct fw_iso_context *context, u32 cycle,
+             size_t header_length, void *header, void *data)
+{
+        struct client *client = data;
+        struct iso_interrupt *interrupt;
+
+        interrupt = kzalloc(sizeof(*interrupt) + header_length, GFP_ATOMIC);
+        if (interrupt == NULL)
+                return;
+
+        interrupt->interrupt.type      = FW_CDEV_EVENT_ISO_INTERRUPT;
+        interrupt->interrupt.closure   = client->iso_closure;
+        interrupt->interrupt.cycle     = cycle;
+        interrupt->interrupt.header_length = header_length;
+        memcpy(interrupt->interrupt.header, header, header_length);
+        queue_event(client, &interrupt->event,
+                    &interrupt->interrupt,
+                    sizeof(interrupt->interrupt) + header_length, NULL, 0);
+}
+
+static int ioctl_create_iso_context(struct client *client, void *buffer)
+{
+        struct fw_cdev_create_iso_context *request = buffer;
+
+        if (request->channel > 63)
+                return -EINVAL;
+
+        switch (request->type) {
+        case FW_ISO_CONTEXT_RECEIVE:
+                if (request->header_size < 4 || (request->header_size & 3))
+                        return -EINVAL;
+
+                break;
+
+        case FW_ISO_CONTEXT_TRANSMIT:
+                if (request->speed > SCODE_3200)
+                        return -EINVAL;
+
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        client->iso_closure = request->closure;
+        client->iso_context = fw_iso_context_create(client->device->card,
+                                                    request->type,
+                                                    request->channel,
+                                                    request->speed,
+                                                    request->header_size,
+                                                    iso_callback, client);
+        if (IS_ERR(client->iso_context))
+                return PTR_ERR(client->iso_context);
+
+        /* We only support one context at this time. */
+        request->handle = 0;
+
+        return 0;
+}
+
+static int ioctl_queue_iso(struct client *client, void *buffer)
+{
+        struct fw_cdev_queue_iso *request = buffer;
+        struct fw_cdev_iso_packet __user *p, *end, *next;
+        struct fw_iso_context *ctx = client->iso_context;
+        unsigned long payload, buffer_end, header_length;
+        int count;
+        struct {
+                struct fw_iso_packet packet;
+                u8 header[256];
+        } u;
+
+        if (ctx == NULL || request->handle != 0)
+                return -EINVAL;
+
+        /*
+         * If the user passes a non-NULL data pointer, has mmap()'ed
+         * the iso buffer, and the pointer points inside the buffer,
+         * we setup the payload pointers accordingly.  Otherwise we
+         * set them both to 0, which will still let packets with
+         * payload_length == 0 through.  In other words, if no packets
+         * use the indirect payload, the iso buffer need not be mapped
+         * and the request->data pointer is ignored.
+         */
+
+        payload = (unsigned long)request->data - client->vm_start;
+        buffer_end = client->buffer.page_count << PAGE_SHIFT;
+        if (request->data == 0 || client->buffer.pages == NULL ||
+            payload >= buffer_end) {
+                payload = 0;
+                buffer_end = 0;
+        }
+
+        if (!access_ok(VERIFY_READ, request->packets, request->size))
+                return -EFAULT;
+
+        p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request->packets);
+        end = (void __user *)p + request->size;
+        count = 0;
+        while (p < end) {
+                if (__copy_from_user(&u.packet, p, sizeof(*p)))
+                        return -EFAULT;
+
+                if (ctx->type == FW_ISO_CONTEXT_TRANSMIT) {
+                        header_length = u.packet.header_length;
+                } else {
+                        /*
+                         * We require that header_length is a multiple of
+                         * the fixed header size, ctx->header_size.
+                         */
+                        if (ctx->header_size == 0) {
+                                if (u.packet.header_length > 0)
+                                        return -EINVAL;
+                        } else if (u.packet.header_length % ctx->header_size != 0) {
+                                return -EINVAL;
+                        }
+                        header_length = 0;
+                }
+
+                next = (struct fw_cdev_iso_packet __user *)
+                        &p->header[header_length / 4];
+                if (next > end)
+                        return -EINVAL;
+                if (__copy_from_user
+                    (u.packet.header, p->header, header_length))
+                        return -EFAULT;
+                if (u.packet.skip && ctx->type == FW_ISO_CONTEXT_TRANSMIT &&
+                    u.packet.header_length + u.packet.payload_length > 0)
+                        return -EINVAL;
+                if (payload + u.packet.payload_length > buffer_end)
+                        return -EINVAL;
+
+                if (fw_iso_context_queue(ctx, &u.packet,
+                                         &client->buffer, payload))
+                        break;
+
+                p = next;
+                payload += u.packet.payload_length;
+                count++;
+        }
+
+        request->size    -= uptr_to_u64(p) - request->packets;
+        request->packets  = uptr_to_u64(p);
+        request->data     = client->vm_start + payload;
+
+        return count;
+}
+
+static int ioctl_start_iso(struct client *client, void *buffer)
+{
+        struct fw_cdev_start_iso *request = buffer;
+
+        if (request->handle != 0)
+                return -EINVAL;
+        if (client->iso_context->type == FW_ISO_CONTEXT_RECEIVE) {
+                if (request->tags == 0 || request->tags > 15)
+                        return -EINVAL;
+
+                if (request->sync > 15)
+                        return -EINVAL;
+        }
+
+        return fw_iso_context_start(client->iso_context, request->cycle,
+                                    request->sync, request->tags);
+}
+
+static int ioctl_stop_iso(struct client *client, void *buffer)
+{
+        struct fw_cdev_stop_iso *request = buffer;
+
+        if (request->handle != 0)
+                return -EINVAL;
+
+        return fw_iso_context_stop(client->iso_context);
+}
+
+static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
+        ioctl_get_info,
+        ioctl_send_request,
+        ioctl_allocate,
+        ioctl_deallocate,
+        ioctl_send_response,
+        ioctl_initiate_bus_reset,
+        ioctl_add_descriptor,
+        ioctl_remove_descriptor,
+        ioctl_create_iso_context,
+        ioctl_queue_iso,
+        ioctl_start_iso,
+        ioctl_stop_iso,
+};
+
+static int
+dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
+{
+        char buffer[256];
+        int retval;
+
+        if (_IOC_TYPE(cmd) != '#' ||
+            _IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers))
+                return -EINVAL;
+
+        if (_IOC_DIR(cmd) & _IOC_WRITE) {
+                if (_IOC_SIZE(cmd) > sizeof(buffer) ||
+                    copy_from_user(buffer, arg, _IOC_SIZE(cmd)))
+                        return -EFAULT;
+        }
+
+        retval = ioctl_handlers[_IOC_NR(cmd)](client, buffer);
+        if (retval < 0)
+                return retval;
+
+        if (_IOC_DIR(cmd) & _IOC_READ) {
+                if (_IOC_SIZE(cmd) > sizeof(buffer) ||
+                    copy_to_user(arg, buffer, _IOC_SIZE(cmd)))
+                        return -EFAULT;
+        }
+
+        return 0;
+}
+
+static long
+fw_device_op_ioctl(struct file *file,
+                   unsigned int cmd, unsigned long arg)
+{
+        struct client *client = file->private_data;
+
+        return dispatch_ioctl(client, cmd, (void __user *) arg);
+}
+
+#ifdef CONFIG_COMPAT
+static long
+fw_device_op_compat_ioctl(struct file *file,
+                          unsigned int cmd, unsigned long arg)
+{
+        struct client *client = file->private_data;
+
+        return dispatch_ioctl(client, cmd, compat_ptr(arg));
+}
+#endif
+
+static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct client *client = file->private_data;
+        enum dma_data_direction direction;
+        unsigned long size;
+        int page_count, retval;
+
+        /* FIXME: We could support multiple buffers, but we don't. */
+        if (client->buffer.pages != NULL)
+                return -EBUSY;
+
+        if (!(vma->vm_flags & VM_SHARED))
+                return -EINVAL;
+
+        if (vma->vm_start & ~PAGE_MASK)
+                return -EINVAL;
+
+        client->vm_start = vma->vm_start;
+        size = vma->vm_end - vma->vm_start;
+        page_count = size >> PAGE_SHIFT;
+        if (size & ~PAGE_MASK)
+                return -EINVAL;
+
+        if (vma->vm_flags & VM_WRITE)
+                direction = DMA_TO_DEVICE;
+        else
+                direction = DMA_FROM_DEVICE;
+
+        retval = fw_iso_buffer_init(&client->buffer, client->device->card,
+                                    page_count, direction);
+        if (retval < 0)
+                return retval;
+
+        retval = fw_iso_buffer_map(&client->buffer, vma);
+        if (retval < 0)
+                fw_iso_buffer_destroy(&client->buffer, client->device->card);
+
+        return retval;
+}
+
+static int fw_device_op_release(struct inode *inode, struct file *file)
+{
+        struct client *client = file->private_data;
+        struct event *e, *next_e;
+        struct client_resource *r, *next_r;
+        unsigned long flags;
+
+        if (client->buffer.pages)
+                fw_iso_buffer_destroy(&client->buffer, client->device->card);
+
+        if (client->iso_context)
+                fw_iso_context_destroy(client->iso_context);
+
+        list_for_each_entry_safe(r, next_r, &client->resource_list, link)
+                r->release(client, r);
+
+        /*
+         * FIXME: We should wait for the async tasklets to stop
+         * running before freeing the memory.
+         */
+
+        list_for_each_entry_safe(e, next_e, &client->event_list, link)
+                kfree(e);
+
+        spin_lock_irqsave(&client->device->card->lock, flags);
+        list_del(&client->link);
+        spin_unlock_irqrestore(&client->device->card->lock, flags);
+
+        fw_device_put(client->device);
+        kfree(client);
+
+        return 0;
+}
+
+static unsigned int fw_device_op_poll(struct file *file, poll_table * pt)
+{
+        struct client *client = file->private_data;
+        unsigned int mask = 0;
+
+        poll_wait(file, &client->wait, pt);
+
+        if (fw_device_is_shutdown(client->device))
+                mask |= POLLHUP | POLLERR;
+        if (!list_empty(&client->event_list))
+                mask |= POLLIN | POLLRDNORM;
+
+        return mask;
+}
+
+const struct file_operations fw_device_ops = {
+        .owner          = THIS_MODULE,
+        .open           = fw_device_op_open,
+        .read           = fw_device_op_read,
+        .unlocked_ioctl = fw_device_op_ioctl,
+        .poll           = fw_device_op_poll,
+        .release        = fw_device_op_release,
+        .mmap           = fw_device_op_mmap,
+
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = fw_device_op_compat_ioctl,
+#endif
+};
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
new file mode 100644
index 000000000000..c1ce465d9710
--- /dev/null
+++ b/drivers/firewire/fw-device.c
@@ -0,0 +1,813 @@
+/*
+ * Device probing and sysfs code.
+ *
+ * Copyright (C) 2005-2006  Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/wait.h>
+#include <linux/errno.h>
+#include <linux/kthread.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/idr.h>
+#include <linux/rwsem.h>
+#include <asm/semaphore.h>
+#include <linux/ctype.h>
+#include "fw-transaction.h"
+#include "fw-topology.h"
+#include "fw-device.h"
+
+void fw_csr_iterator_init(struct fw_csr_iterator *ci, u32 * p)
+{
+        ci->p = p + 1;
+        ci->end = ci->p + (p[0] >> 16);
+}
+EXPORT_SYMBOL(fw_csr_iterator_init);
+
+int fw_csr_iterator_next(struct fw_csr_iterator *ci, int *key, int *value)
+{
+        *key = *ci->p >> 24;
+        *value = *ci->p & 0xffffff;
+
+        return ci->p++ < ci->end;
+}
+EXPORT_SYMBOL(fw_csr_iterator_next);
+
+static int is_fw_unit(struct device *dev);
+
+static int match_unit_directory(u32 * directory, const struct fw_device_id *id)
+{
+        struct fw_csr_iterator ci;
+        int key, value, match;
+
+        match = 0;
+        fw_csr_iterator_init(&ci, directory);
+        while (fw_csr_iterator_next(&ci, &key, &value)) {
+                if (key == CSR_VENDOR && value == id->vendor)
+                        match |= FW_MATCH_VENDOR;
+                if (key == CSR_MODEL && value == id->model)
+                        match |= FW_MATCH_MODEL;
+                if (key == CSR_SPECIFIER_ID && value == id->specifier_id)
+                        match |= FW_MATCH_SPECIFIER_ID;
+                if (key == CSR_VERSION && value == id->version)
+                        match |= FW_MATCH_VERSION;
+        }
+
+        return (match & id->match_flags) == id->match_flags;
+}
+
+static int fw_unit_match(struct device *dev, struct device_driver *drv)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        struct fw_driver *driver = fw_driver(drv);
+        int i;
+
+        /* We only allow binding to fw_units. */
+        if (!is_fw_unit(dev))
+                return 0;
+
+        for (i = 0; driver->id_table[i].match_flags != 0; i++) {
+                if (match_unit_directory(unit->directory, &driver->id_table[i]))
+                        return 1;
+        }
+
+        return 0;
+}
+
+static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)
+{
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct fw_csr_iterator ci;
+
+        int key, value;
+        int vendor = 0;
+        int model = 0;
+        int specifier_id = 0;
+        int version = 0;
+
+        fw_csr_iterator_init(&ci, &device->config_rom[5]);
+        while (fw_csr_iterator_next(&ci, &key, &value)) {
+                switch (key) {
+                case CSR_VENDOR:
+                        vendor = value;
+                        break;
+                case CSR_MODEL:
+                        model = value;
+                        break;
+                }
+        }
+
+        fw_csr_iterator_init(&ci, unit->directory);
+        while (fw_csr_iterator_next(&ci, &key, &value)) {
+                switch (key) {
+                case CSR_SPECIFIER_ID:
+                        specifier_id = value;
+                        break;
+                case CSR_VERSION:
+                        version = value;
+                        break;
+                }
+        }
+
+        return snprintf(buffer, buffer_size,
+                        "ieee1394:ven%08Xmo%08Xsp%08Xver%08X",
+                        vendor, model, specifier_id, version);
+}
+
+static int
+fw_unit_uevent(struct device *dev, char **envp, int num_envp,
+               char *buffer, int buffer_size)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        char modalias[64];
+        int length = 0;
+        int i = 0;
+
+        get_modalias(unit, modalias, sizeof(modalias));
+
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "MODALIAS=%s", modalias))
+                return -ENOMEM;
+
+        envp[i] = NULL;
+
+        return 0;
+}
+
+struct bus_type fw_bus_type = {
+        .name = "firewire",
+        .match = fw_unit_match,
+};
+EXPORT_SYMBOL(fw_bus_type);
+
+struct fw_device *fw_device_get(struct fw_device *device)
+{
+        get_device(&device->device);
+
+        return device;
+}
+
+void fw_device_put(struct fw_device *device)
+{
+        put_device(&device->device);
+}
+
+static void fw_device_release(struct device *dev)
+{
+        struct fw_device *device = fw_device(dev);
+        unsigned long flags;
+
+        /*
+         * Take the card lock so we don't set this to NULL while a
+         * FW_NODE_UPDATED callback is being handled.
+         */
+        spin_lock_irqsave(&device->card->lock, flags);
+        device->node->data = NULL;
+        spin_unlock_irqrestore(&device->card->lock, flags);
+
+        fw_node_put(device->node);
+        fw_card_put(device->card);
+        kfree(device->config_rom);
+        kfree(device);
+}
+
+int fw_device_enable_phys_dma(struct fw_device *device)
+{
+        return device->card->driver->enable_phys_dma(device->card,
+                                                     device->node_id,
+                                                     device->generation);
+}
+EXPORT_SYMBOL(fw_device_enable_phys_dma);
+
+struct config_rom_attribute {
+        struct device_attribute attr;
+        u32 key;
+};
+
+static ssize_t
+show_immediate(struct device *dev, struct device_attribute *dattr, char *buf)
+{
+        struct config_rom_attribute *attr =
+                container_of(dattr, struct config_rom_attribute, attr);
+        struct fw_csr_iterator ci;
+        u32 *dir;
+        int key, value;
+
+        if (is_fw_unit(dev))
+                dir = fw_unit(dev)->directory;
+        else
+                dir = fw_device(dev)->config_rom + 5;
+
+        fw_csr_iterator_init(&ci, dir);
+        while (fw_csr_iterator_next(&ci, &key, &value))
+                if (attr->key == key)
+                        return snprintf(buf, buf ? PAGE_SIZE : 0,
+                                        "0x%06x\n", value);
+
+        return -ENOENT;
+}
+
+#define IMMEDIATE_ATTR(name, key)                               \
+        { __ATTR(name, S_IRUGO, show_immediate, NULL), key }
+
+static ssize_t
+show_text_leaf(struct device *dev, struct device_attribute *dattr, char *buf)
+{
+        struct config_rom_attribute *attr =
+                container_of(dattr, struct config_rom_attribute, attr);
+        struct fw_csr_iterator ci;
+        u32 *dir, *block = NULL, *p, *end;
+        int length, key, value, last_key = 0;
+        char *b;
+
+        if (is_fw_unit(dev))
+                dir = fw_unit(dev)->directory;
+        else
+                dir = fw_device(dev)->config_rom + 5;
+
+        fw_csr_iterator_init(&ci, dir);
+        while (fw_csr_iterator_next(&ci, &key, &value)) {
+                if (attr->key == last_key &&
+                    key == (CSR_DESCRIPTOR | CSR_LEAF))
+                        block = ci.p - 1 + value;
+                last_key = key;
+        }
+
+        if (block == NULL)
+                return -ENOENT;
+
+        length = min(block[0] >> 16, 256U);
+        if (length < 3)
+                return -ENOENT;
+
+        if (block[1] != 0 || block[2] != 0)
+                /* Unknown encoding. */
+                return -ENOENT;
+
+        if (buf == NULL)
+                return length * 4;
+
+        b = buf;
+        end = &block[length + 1];
+        for (p = &block[3]; p < end; p++, b += 4)
+                * (u32 *) b = (__force u32) __cpu_to_be32(*p);
+
+        /* Strip trailing whitespace and add newline. */
+        while (b--, (isspace(*b) || *b == '\0') && b > buf);
+        strcpy(b + 1, "\n");
+
+        return b + 2 - buf;
+}
+
+#define TEXT_LEAF_ATTR(name, key)                               \
+        { __ATTR(name, S_IRUGO, show_text_leaf, NULL), key }
+
+static struct config_rom_attribute config_rom_attributes[] = {
+        IMMEDIATE_ATTR(vendor, CSR_VENDOR),
+        IMMEDIATE_ATTR(hardware_version, CSR_HARDWARE_VERSION),
+        IMMEDIATE_ATTR(specifier_id, CSR_SPECIFIER_ID),
+        IMMEDIATE_ATTR(version, CSR_VERSION),
+        IMMEDIATE_ATTR(model, CSR_MODEL),
+        TEXT_LEAF_ATTR(vendor_name, CSR_VENDOR),
+        TEXT_LEAF_ATTR(model_name, CSR_MODEL),
+        TEXT_LEAF_ATTR(hardware_version_name, CSR_HARDWARE_VERSION),
+};
+
+static void
+init_fw_attribute_group(struct device *dev,
+                        struct device_attribute *attrs,
+                        struct fw_attribute_group *group)
+{
+        struct device_attribute *attr;
+        int i, j;
+
+        for (j = 0; attrs[j].attr.name != NULL; j++)
+                group->attrs[j] = &attrs[j].attr;
+
+        for (i = 0; i < ARRAY_SIZE(config_rom_attributes); i++) {
+                attr = &config_rom_attributes[i].attr;
+                if (attr->show(dev, attr, NULL) < 0)
+                        continue;
+                group->attrs[j++] = &attr->attr;
+        }
+
+        BUG_ON(j >= ARRAY_SIZE(group->attrs));
+        group->attrs[j++] = NULL;
+        group->groups[0] = &group->group;
+        group->groups[1] = NULL;
+        group->group.attrs = group->attrs;
+        dev->groups = group->groups;
+}
+
+static ssize_t
+modalias_show(struct device *dev,
+              struct device_attribute *attr, char *buf)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        int length;
+
+        length = get_modalias(unit, buf, PAGE_SIZE);
+        strcpy(buf + length, "\n");
+
+        return length + 1;
+}
+
+static ssize_t
+rom_index_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+        struct fw_device *device = fw_device(dev->parent);
+        struct fw_unit *unit = fw_unit(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+                        (int)(unit->directory - device->config_rom));
+}
+
+static struct device_attribute fw_unit_attributes[] = {
+        __ATTR_RO(modalias),
+        __ATTR_RO(rom_index),
+        __ATTR_NULL,
+};
+
+static ssize_t
+config_rom_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct fw_device *device = fw_device(dev);
+
+        memcpy(buf, device->config_rom, device->config_rom_length * 4);
+
+        return device->config_rom_length * 4;
+}
+
+static ssize_t
+guid_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct fw_device *device = fw_device(dev);
+        u64 guid;
+
+        guid = ((u64)device->config_rom[3] << 32) | device->config_rom[4];
+
+        return snprintf(buf, PAGE_SIZE, "0x%016llx\n",
+                        (unsigned long long)guid);
+}
+
+static struct device_attribute fw_device_attributes[] = {
+        __ATTR_RO(config_rom),
+        __ATTR_RO(guid),
+        __ATTR_NULL,
+};
+
+struct read_quadlet_callback_data {
+        struct completion done;
+        int rcode;
+        u32 data;
+};
+
+static void
+complete_transaction(struct fw_card *card, int rcode,
+                     void *payload, size_t length, void *data)
+{
+        struct read_quadlet_callback_data *callback_data = data;
+
+        if (rcode == RCODE_COMPLETE)
+                callback_data->data = be32_to_cpu(*(__be32 *)payload);
+        callback_data->rcode = rcode;
+        complete(&callback_data->done);
+}
+
+static int read_rom(struct fw_device *device, int index, u32 * data)
+{
+        struct read_quadlet_callback_data callback_data;
+        struct fw_transaction t;
+        u64 offset;
+
+        init_completion(&callback_data.done);
+
+        offset = 0xfffff0000400ULL + index * 4;
+        fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST,
+                        device->node_id,
+                        device->generation, SCODE_100,
+                        offset, NULL, 4, complete_transaction, &callback_data);
+
+        wait_for_completion(&callback_data.done);
+
+        *data = callback_data.data;
+
+        return callback_data.rcode;
+}
+
+static int read_bus_info_block(struct fw_device *device)
+{
+        static u32 rom[256];
+        u32 stack[16], sp, key;
+        int i, end, length;
+
+        /* First read the bus info block. */
+        for (i = 0; i < 5; i++) {
+                if (read_rom(device, i, &rom[i]) != RCODE_COMPLETE)
+                        return -1;
+                /*
+                 * As per IEEE1212 7.2, during power-up, devices can
+                 * reply with a 0 for the first quadlet of the config
+                 * rom to indicate that they are booting (for example,
+                 * if the firmware is on the disk of a external
+                 * harddisk).  In that case we just fail, and the
+                 * retry mechanism will try again later.
+                 */
+                if (i == 0 && rom[i] == 0)
+                        return -1;
+        }
+
+        /*
+         * Now parse the config rom.  The config rom is a recursive
+         * directory structure so we parse it using a stack of
+         * references to the blocks that make up the structure.  We
+         * push a reference to the root directory on the stack to
+         * start things off.
+         */
+        length = i;
+        sp = 0;
+        stack[sp++] = 0xc0000005;
+        while (sp > 0) {
+                /*
+                 * Pop the next block reference of the stack.  The
+                 * lower 24 bits is the offset into the config rom,
+                 * the upper 8 bits are the type of the reference the
+                 * block.
+                 */
+                key = stack[--sp];
+                i = key & 0xffffff;
+                if (i >= ARRAY_SIZE(rom))
+                        /*
+                         * The reference points outside the standard
+                         * config rom area, something's fishy.
+                         */
+                        return -1;
+
+                /* Read header quadlet for the block to get the length. */
+                if (read_rom(device, i, &rom[i]) != RCODE_COMPLETE)
+                        return -1;
+                end = i + (rom[i] >> 16) + 1;
+                i++;
+                if (end > ARRAY_SIZE(rom))
+                        /*
+                         * This block extends outside standard config
+                         * area (and the array we're reading it
+                         * into).  That's broken, so ignore this
+                         * device.
+                         */
+                        return -1;
+
+                /*
+                 * Now read in the block.  If this is a directory
+                 * block, check the entries as we read them to see if
+                 * it references another block, and push it in that case.
+                 */
+                while (i < end) {
+                        if (read_rom(device, i, &rom[i]) != RCODE_COMPLETE)
+                                return -1;
+                        if ((key >> 30) == 3 && (rom[i] >> 30) > 1 &&
+                            sp < ARRAY_SIZE(stack))
+                                stack[sp++] = i + rom[i];
+                        i++;
+                }
+                if (length < i)
+                        length = i;
+        }
+
+        device->config_rom = kmalloc(length * 4, GFP_KERNEL);
+        if (device->config_rom == NULL)
+                return -1;
+        memcpy(device->config_rom, rom, length * 4);
+        device->config_rom_length = length;
+
+        return 0;
+}
+
+static void fw_unit_release(struct device *dev)
+{
+        struct fw_unit *unit = fw_unit(dev);
+
+        kfree(unit);
+}
+
+static struct device_type fw_unit_type = {
+        .uevent         = fw_unit_uevent,
+        .release        = fw_unit_release,
+};
+
+static int is_fw_unit(struct device *dev)
+{
+        return dev->type == &fw_unit_type;
+}
+
+static void create_units(struct fw_device *device)
+{
+        struct fw_csr_iterator ci;
+        struct fw_unit *unit;
+        int key, value, i;
+
+        i = 0;
+        fw_csr_iterator_init(&ci, &device->config_rom[5]);
+        while (fw_csr_iterator_next(&ci, &key, &value)) {
+                if (key != (CSR_UNIT | CSR_DIRECTORY))
+                        continue;
+
+                /*
+                 * Get the address of the unit directory and try to
+                 * match the drivers id_tables against it.
+                 */
+                unit = kzalloc(sizeof(*unit), GFP_KERNEL);
+                if (unit == NULL) {
+                        fw_error("failed to allocate memory for unit\n");
+                        continue;
+                }
+
+                unit->directory = ci.p + value - 1;
+                unit->device.bus = &fw_bus_type;
+                unit->device.type = &fw_unit_type;
+                unit->device.parent = &device->device;
+                snprintf(unit->device.bus_id, sizeof(unit->device.bus_id),
+                         "%s.%d", device->device.bus_id, i++);
+
+                init_fw_attribute_group(&unit->device,
+                                        fw_unit_attributes,
+                                        &unit->attribute_group);
+                if (device_register(&unit->device) < 0)
+                        goto skip_unit;
+
+                continue;
+
+        skip_unit:
+                kfree(unit);
+        }
+}
+
+static int shutdown_unit(struct device *device, void *data)
+{
+        device_unregister(device);
+
+        return 0;
+}
+
+static DECLARE_RWSEM(idr_rwsem);
+static DEFINE_IDR(fw_device_idr);
+int fw_cdev_major;
+
+struct fw_device *fw_device_from_devt(dev_t devt)
+{
+        struct fw_device *device;
+
+        down_read(&idr_rwsem);
+        device = idr_find(&fw_device_idr, MINOR(devt));
+        up_read(&idr_rwsem);
+
+        return device;
+}
+
+static void fw_device_shutdown(struct work_struct *work)
+{
+        struct fw_device *device =
+                container_of(work, struct fw_device, work.work);
+        int minor = MINOR(device->device.devt);
+
+        down_write(&idr_rwsem);
+        idr_remove(&fw_device_idr, minor);
+        up_write(&idr_rwsem);
+
+        fw_device_cdev_remove(device);
+        device_for_each_child(&device->device, NULL, shutdown_unit);
+        device_unregister(&device->device);
+}
+
+static struct device_type fw_device_type = {
+        .release        = fw_device_release,
+};
+
+/*
+ * These defines control the retry behavior for reading the config
+ * rom.  It shouldn't be necessary to tweak these; if the device
+ * doesn't respond to a config rom read within 10 seconds, it's not
+ * going to respond at all.  As for the initial delay, a lot of
+ * devices will be able to respond within half a second after bus
+ * reset.  On the other hand, it's not really worth being more
+ * aggressive than that, since it scales pretty well; if 10 devices
+ * are plugged in, they're all getting read within one second.
+ */
+
+#define MAX_RETRIES     10
+#define RETRY_DELAY     (3 * HZ)
+#define INITIAL_DELAY   (HZ / 2)
+
+static void fw_device_init(struct work_struct *work)
+{
+        struct fw_device *device =
+                container_of(work, struct fw_device, work.work);
+        int minor, err;
+
+        /*
+         * All failure paths here set node->data to NULL, so that we
+         * don't try to do device_for_each_child() on a kfree()'d
+         * device.
+         */
+
+        if (read_bus_info_block(device) < 0) {
+                if (device->config_rom_retries < MAX_RETRIES) {
+                        device->config_rom_retries++;
+                        schedule_delayed_work(&device->work, RETRY_DELAY);
+                } else {
+                        fw_notify("giving up on config rom for node id %x\n",
+                                  device->node_id);
+                        if (device->node == device->card->root_node)
+                                schedule_delayed_work(&device->card->work, 0);
+                        fw_device_release(&device->device);
+                }
+                return;
+        }
+
+        err = -ENOMEM;
+        down_write(&idr_rwsem);
+        if (idr_pre_get(&fw_device_idr, GFP_KERNEL))
+                err = idr_get_new(&fw_device_idr, device, &minor);
+        up_write(&idr_rwsem);
+        if (err < 0)
+                goto error;
+
+        device->device.bus = &fw_bus_type;
+        device->device.type = &fw_device_type;
+        device->device.parent = device->card->device;
+        device->device.devt = MKDEV(fw_cdev_major, minor);
+        snprintf(device->device.bus_id, sizeof(device->device.bus_id),
+                 "fw%d", minor);
+
+        init_fw_attribute_group(&device->device,
+                                fw_device_attributes,
+                                &device->attribute_group);
+        if (device_add(&device->device)) {
+                fw_error("Failed to add device.\n");
+                goto error_with_cdev;
+        }
+
+        create_units(device);
+
+        /*
+         * Transition the device to running state.  If it got pulled
+         * out from under us while we did the intialization work, we
+         * have to shut down the device again here.  Normally, though,
+         * fw_node_event will be responsible for shutting it down when
+         * necessary.  We have to use the atomic cmpxchg here to avoid
+         * racing with the FW_NODE_DESTROYED case in
+         * fw_node_event().
+         */
+        if (atomic_cmpxchg(&device->state,
+                    FW_DEVICE_INITIALIZING,
+                    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
+                fw_device_shutdown(&device->work.work);
+        else
+                fw_notify("created new fw device %s (%d config rom retries)\n",
+                          device->device.bus_id, device->config_rom_retries);
+
+        /*
+         * Reschedule the IRM work if we just finished reading the
+         * root node config rom.  If this races with a bus reset we
+         * just end up running the IRM work a couple of extra times -
+         * pretty harmless.
+         */
+        if (device->node == device->card->root_node)
+                schedule_delayed_work(&device->card->work, 0);
+
+        return;
+
+ error_with_cdev:
+        down_write(&idr_rwsem);
+        idr_remove(&fw_device_idr, minor);
+        up_write(&idr_rwsem);
+ error:
+        put_device(&device->device);
+}
+
+static int update_unit(struct device *dev, void *data)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        struct fw_driver *driver = (struct fw_driver *)dev->driver;
+
+        if (is_fw_unit(dev) && driver != NULL && driver->update != NULL) {
+                down(&dev->sem);
+                driver->update(unit);
+                up(&dev->sem);
+        }
+
+        return 0;
+}
+
+static void fw_device_update(struct work_struct *work)
+{
+        struct fw_device *device =
+                container_of(work, struct fw_device, work.work);
+
+        fw_device_cdev_update(device);
+        device_for_each_child(&device->device, NULL, update_unit);
+}
+
+void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
+{
+        struct fw_device *device;
+
+        switch (event) {
+        case FW_NODE_CREATED:
+        case FW_NODE_LINK_ON:
+                if (!node->link_on)
+                        break;
+
+                device = kzalloc(sizeof(*device), GFP_ATOMIC);
+                if (device == NULL)
+                        break;
+
+                /*
+                 * Do minimal intialization of the device here, the
+                 * rest will happen in fw_device_init().  We need the
+                 * card and node so we can read the config rom and we
+                 * need to do device_initialize() now so
+                 * device_for_each_child() in FW_NODE_UPDATED is
+                 * doesn't freak out.
+                 */
+                device_initialize(&device->device);
+                atomic_set(&device->state, FW_DEVICE_INITIALIZING);
+                device->card = fw_card_get(card);
+                device->node = fw_node_get(node);
+                device->node_id = node->node_id;
+                device->generation = card->generation;
+                INIT_LIST_HEAD(&device->client_list);
+
+                /*
+                 * Set the node data to point back to this device so
+                 * FW_NODE_UPDATED callbacks can update the node_id
+                 * and generation for the device.
+                 */
+                node->data = device;
+
+                /*
+                 * Many devices are slow to respond after bus resets,
+                 * especially if they are bus powered and go through
+                 * power-up after getting plugged in.  We schedule the
+                 * first config rom scan half a second after bus reset.
+                 */
+                INIT_DELAYED_WORK(&device->work, fw_device_init);
+                schedule_delayed_work(&device->work, INITIAL_DELAY);
+                break;
+
+        case FW_NODE_UPDATED:
+                if (!node->link_on || node->data == NULL)
+                        break;
+
+                device = node->data;
+                device->node_id = node->node_id;
+                device->generation = card->generation;
+                if (atomic_read(&device->state) == FW_DEVICE_RUNNING) {
+                        PREPARE_DELAYED_WORK(&device->work, fw_device_update);
+                        schedule_delayed_work(&device->work, 0);
+                }
+                break;
+
+        case FW_NODE_DESTROYED:
+        case FW_NODE_LINK_OFF:
+                if (!node->data)
+                        break;
+
+                /*
+                 * Destroy the device associated with the node.  There
+                 * are two cases here: either the device is fully
+                 * initialized (FW_DEVICE_RUNNING) or we're in the
+                 * process of reading its config rom
+                 * (FW_DEVICE_INITIALIZING).  If it is fully
+                 * initialized we can reuse device->work to schedule a
+                 * full fw_device_shutdown().  If not, there's work
+                 * scheduled to read it's config rom, and we just put
+                 * the device in shutdown state to have that code fail
+                 * to create the device.
+                 */
+                device = node->data;
+                if (atomic_xchg(&device->state,
+                                FW_DEVICE_SHUTDOWN) == FW_DEVICE_RUNNING) {
+                        PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
+                        schedule_delayed_work(&device->work, 0);
+                }
+                break;
+        }
+}
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
new file mode 100644
index 000000000000..0ba9d64ccf4c
--- /dev/null
+++ b/drivers/firewire/fw-device.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005-2006  Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * 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.
+ */
+
+#ifndef __fw_device_h
+#define __fw_device_h
+
+#include <linux/fs.h>
+#include <linux/cdev.h>
+#include <asm/atomic.h>
+
+enum fw_device_state {
+        FW_DEVICE_INITIALIZING,
+        FW_DEVICE_RUNNING,
+        FW_DEVICE_SHUTDOWN,
+};
+
+struct fw_attribute_group {
+        struct attribute_group *groups[2];
+        struct attribute_group group;
+        struct attribute *attrs[11];
+};
+
+struct fw_device {
+        atomic_t state;
+        struct fw_node *node;
+        int node_id;
+        int generation;
+        struct fw_card *card;
+        struct device device;
+        struct list_head link;
+        struct list_head client_list;
+        u32 *config_rom;
+        size_t config_rom_length;
+        int config_rom_retries;
+        struct delayed_work work;
+        struct fw_attribute_group attribute_group;
+};
+
+static inline struct fw_device *
+fw_device(struct device *dev)
+{
+        return container_of(dev, struct fw_device, device);
+}
+
+static inline int
+fw_device_is_shutdown(struct fw_device *device)
+{
+        return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN;
+}
+
+struct fw_device *fw_device_get(struct fw_device *device);
+void fw_device_put(struct fw_device *device);
+int fw_device_enable_phys_dma(struct fw_device *device);
+
+void fw_device_cdev_update(struct fw_device *device);
+void fw_device_cdev_remove(struct fw_device *device);
+
+struct fw_device *fw_device_from_devt(dev_t devt);
+extern int fw_cdev_major;
+
+struct fw_unit {
+        struct device device;
+        u32 *directory;
+        struct fw_attribute_group attribute_group;
+};
+
+static inline struct fw_unit *
+fw_unit(struct device *dev)
+{
+        return container_of(dev, struct fw_unit, device);
+}
+
+#define CSR_OFFSET      0x40
+#define CSR_LEAF        0x80
+#define CSR_DIRECTORY   0xc0
+
+#define CSR_DESCRIPTOR          0x01
+#define CSR_VENDOR              0x03
+#define CSR_HARDWARE_VERSION    0x04
+#define CSR_NODE_CAPABILITIES   0x0c
+#define CSR_UNIT                0x11
+#define CSR_SPECIFIER_ID        0x12
+#define CSR_VERSION             0x13
+#define CSR_DEPENDENT_INFO      0x14
+#define CSR_MODEL               0x17
+#define CSR_INSTANCE            0x18
+
+#define SBP2_COMMAND_SET_SPECIFIER      0x38
+#define SBP2_COMMAND_SET                0x39
+#define SBP2_COMMAND_SET_REVISION       0x3b
+#define SBP2_FIRMWARE_REVISION          0x3c
+
+struct fw_csr_iterator {
+        u32 *p;
+        u32 *end;
+};
+
+void fw_csr_iterator_init(struct fw_csr_iterator *ci, u32 *p);
+int fw_csr_iterator_next(struct fw_csr_iterator *ci,
+                         int *key, int *value);
+
+#define FW_MATCH_VENDOR         0x0001
+#define FW_MATCH_MODEL          0x0002
+#define FW_MATCH_SPECIFIER_ID   0x0004
+#define FW_MATCH_VERSION        0x0008
+
+struct fw_device_id {
+        u32 match_flags;
+        u32 vendor;
+        u32 model;
+        u32 specifier_id;
+        u32 version;
+        void *driver_data;
+};
+
+struct fw_driver {
+        struct device_driver driver;
+        /* Called when the parent device sits through a bus reset. */
+        void (*update) (struct fw_unit *unit);
+        const struct fw_device_id *id_table;
+};
+
+static inline struct fw_driver *
+fw_driver(struct device_driver *drv)
+{
+        return container_of(drv, struct fw_driver, driver);
+}
+
+extern const struct file_operations fw_device_ops;
+
+#endif /* __fw_device_h */
diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c
new file mode 100644
index 000000000000..2b640e9be6de
--- /dev/null
+++ b/drivers/firewire/fw-iso.c
@@ -0,0 +1,163 @@
+/*
+ * Isochronous IO functionality
+ *
+ * Copyright (C) 2006 Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/mm.h>
+
+#include "fw-transaction.h"
+#include "fw-topology.h"
+#include "fw-device.h"
+
+int
+fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
+                   int page_count, enum dma_data_direction direction)
+{
+        int i, j, retval = -ENOMEM;
+        dma_addr_t address;
+
+        buffer->page_count = page_count;
+        buffer->direction = direction;
+
+        buffer->pages = kmalloc(page_count * sizeof(buffer->pages[0]),
+                                GFP_KERNEL);
+        if (buffer->pages == NULL)
+                goto out;
+
+        for (i = 0; i < buffer->page_count; i++) {
+                buffer->pages[i] = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
+                if (buffer->pages[i] == NULL)
+                        goto out_pages;
+
+                address = dma_map_page(card->device, buffer->pages[i],
+                                       0, PAGE_SIZE, direction);
+                if (dma_mapping_error(address)) {
+                        __free_page(buffer->pages[i]);
+                        goto out_pages;
+                }
+                set_page_private(buffer->pages[i], address);
+        }
+
+        return 0;
+
+ out_pages:
+        for (j = 0; j < i; j++) {
+                address = page_private(buffer->pages[j]);
+                dma_unmap_page(card->device, address,
+                               PAGE_SIZE, DMA_TO_DEVICE);
+                __free_page(buffer->pages[j]);
+        }
+        kfree(buffer->pages);
+ out:
+        buffer->pages = NULL;
+        return retval;
+}
+
+int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma)
+{
+        unsigned long uaddr;
+        int i, retval;
+
+        uaddr = vma->vm_start;
+        for (i = 0; i < buffer->page_count; i++) {
+                retval = vm_insert_page(vma, uaddr, buffer->pages[i]);
+                if (retval)
+                        return retval;
+                uaddr += PAGE_SIZE;
+        }
+
+        return 0;
+}
+
+void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer,
+                           struct fw_card *card)
+{
+        int i;
+        dma_addr_t address;
+
+        for (i = 0; i < buffer->page_count; i++) {
+                address = page_private(buffer->pages[i]);
+                dma_unmap_page(card->device, address,
+                               PAGE_SIZE, DMA_TO_DEVICE);
+                __free_page(buffer->pages[i]);
+        }
+
+        kfree(buffer->pages);
+        buffer->pages = NULL;
+}
+
+struct fw_iso_context *
+fw_iso_context_create(struct fw_card *card, int type,
+                      int channel, int speed, size_t header_size,
+                      fw_iso_callback_t callback, void *callback_data)
+{
+        struct fw_iso_context *ctx;
+
+        ctx = card->driver->allocate_iso_context(card, type, header_size);
+        if (IS_ERR(ctx))
+                return ctx;
+
+        ctx->card = card;
+        ctx->type = type;
+        ctx->channel = channel;
+        ctx->speed = speed;
+        ctx->header_size = header_size;
+        ctx->callback = callback;
+        ctx->callback_data = callback_data;
+
+        return ctx;
+}
+EXPORT_SYMBOL(fw_iso_context_create);
+
+void fw_iso_context_destroy(struct fw_iso_context *ctx)
+{
+        struct fw_card *card = ctx->card;
+
+        card->driver->free_iso_context(ctx);
+}
+EXPORT_SYMBOL(fw_iso_context_destroy);
+
+int
+fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags)
+{
+        return ctx->card->driver->start_iso(ctx, cycle, sync, tags);
+}
+EXPORT_SYMBOL(fw_iso_context_start);
+
+int
+fw_iso_context_queue(struct fw_iso_context *ctx,
+                     struct fw_iso_packet *packet,
+                     struct fw_iso_buffer *buffer,
+                     unsigned long payload)
+{
+        struct fw_card *card = ctx->card;
+
+        return card->driver->queue_iso(ctx, packet, buffer, payload);
+}
+EXPORT_SYMBOL(fw_iso_context_queue);
+
+int
+fw_iso_context_stop(struct fw_iso_context *ctx)
+{
+        return ctx->card->driver->stop_iso(ctx);
+}
+EXPORT_SYMBOL(fw_iso_context_stop);
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
new file mode 100644
index 000000000000..c17342d3e6fd
--- /dev/null
+++ b/drivers/firewire/fw-ohci.c
@@ -0,0 +1,1944 @@
+/*
+ * Driver for OHCI 1394 controllers
+ *
+ * Copyright (C) 2003-2006 Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/poll.h>
+#include <linux/dma-mapping.h>
+#include <linux/mm.h>
+
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
+
+#include "fw-transaction.h"
+#include "fw-ohci.h"
+
+#define DESCRIPTOR_OUTPUT_MORE          0
+#define DESCRIPTOR_OUTPUT_LAST          (1 << 12)
+#define DESCRIPTOR_INPUT_MORE           (2 << 12)
+#define DESCRIPTOR_INPUT_LAST           (3 << 12)
+#define DESCRIPTOR_STATUS               (1 << 11)
+#define DESCRIPTOR_KEY_IMMEDIATE        (2 << 8)
+#define DESCRIPTOR_PING                 (1 << 7)
+#define DESCRIPTOR_YY                   (1 << 6)
+#define DESCRIPTOR_NO_IRQ               (0 << 4)
+#define DESCRIPTOR_IRQ_ERROR            (1 << 4)
+#define DESCRIPTOR_IRQ_ALWAYS           (3 << 4)
+#define DESCRIPTOR_BRANCH_ALWAYS        (3 << 2)
+#define DESCRIPTOR_WAIT                 (3 << 0)
+
+struct descriptor {
+        __le16 req_count;
+        __le16 control;
+        __le32 data_address;
+        __le32 branch_address;
+        __le16 res_count;
+        __le16 transfer_status;
+} __attribute__((aligned(16)));
+
+struct db_descriptor {
+        __le16 first_size;
+        __le16 control;
+        __le16 second_req_count;
+        __le16 first_req_count;
+        __le32 branch_address;
+        __le16 second_res_count;
+        __le16 first_res_count;
+        __le32 reserved0;
+        __le32 first_buffer;
+        __le32 second_buffer;
+        __le32 reserved1;
+} __attribute__((aligned(16)));
+
+#define CONTROL_SET(regs)       (regs)
+#define CONTROL_CLEAR(regs)     ((regs) + 4)
+#define COMMAND_PTR(regs)       ((regs) + 12)
+#define CONTEXT_MATCH(regs)     ((regs) + 16)
+
+struct ar_buffer {
+        struct descriptor descriptor;
+        struct ar_buffer *next;
+        __le32 data[0];
+};
+
+struct ar_context {
+        struct fw_ohci *ohci;
+        struct ar_buffer *current_buffer;
+        struct ar_buffer *last_buffer;
+        void *pointer;
+        u32 regs;
+        struct tasklet_struct tasklet;
+};
+
+struct context;
+
+typedef int (*descriptor_callback_t)(struct context *ctx,
+                                     struct descriptor *d,
+                                     struct descriptor *last);
+struct context {
+        struct fw_ohci *ohci;
+        u32 regs;
+
+        struct descriptor *buffer;
+        dma_addr_t buffer_bus;
+        size_t buffer_size;
+        struct descriptor *head_descriptor;
+        struct descriptor *tail_descriptor;
+        struct descriptor *tail_descriptor_last;
+        struct descriptor *prev_descriptor;
+
+        descriptor_callback_t callback;
+
+        struct tasklet_struct tasklet;
+};
+
+#define IT_HEADER_SY(v)          ((v) <<  0)
+#define IT_HEADER_TCODE(v)       ((v) <<  4)
+#define IT_HEADER_CHANNEL(v)     ((v) <<  8)
+#define IT_HEADER_TAG(v)         ((v) << 14)
+#define IT_HEADER_SPEED(v)       ((v) << 16)
+#define IT_HEADER_DATA_LENGTH(v) ((v) << 16)
+
+struct iso_context {
+        struct fw_iso_context base;
+        struct context context;
+        void *header;
+        size_t header_length;
+};
+
+#define CONFIG_ROM_SIZE 1024
+
+struct fw_ohci {
+        struct fw_card card;
+
+        u32 version;
+        __iomem char *registers;
+        dma_addr_t self_id_bus;
+        __le32 *self_id_cpu;
+        struct tasklet_struct bus_reset_tasklet;
+        int node_id;
+        int generation;
+        int request_generation;
+        u32 bus_seconds;
+
+        /*
+         * Spinlock for accessing fw_ohci data.  Never call out of
+         * this driver with this lock held.
+         */
+        spinlock_t lock;
+        u32 self_id_buffer[512];
+
+        /* Config rom buffers */
+        __be32 *config_rom;
+        dma_addr_t config_rom_bus;
+        __be32 *next_config_rom;
+        dma_addr_t next_config_rom_bus;
+        u32 next_header;
+
+        struct ar_context ar_request_ctx;
+        struct ar_context ar_response_ctx;
+        struct context at_request_ctx;
+        struct context at_response_ctx;
+
+        u32 it_context_mask;
+        struct iso_context *it_context_list;
+        u32 ir_context_mask;
+        struct iso_context *ir_context_list;
+};
+
+static inline struct fw_ohci *fw_ohci(struct fw_card *card)
+{
+        return container_of(card, struct fw_ohci, card);
+}
+
+#define IT_CONTEXT_CYCLE_MATCH_ENABLE   0x80000000
+#define IR_CONTEXT_BUFFER_FILL          0x80000000
+#define IR_CONTEXT_ISOCH_HEADER         0x40000000
+#define IR_CONTEXT_CYCLE_MATCH_ENABLE   0x20000000
+#define IR_CONTEXT_MULTI_CHANNEL_MODE   0x10000000
+#define IR_CONTEXT_DUAL_BUFFER_MODE     0x08000000
+
+#define CONTEXT_RUN     0x8000
+#define CONTEXT_WAKE    0x1000
+#define CONTEXT_DEAD    0x0800
+#define CONTEXT_ACTIVE  0x0400
+
+#define OHCI1394_MAX_AT_REQ_RETRIES     0x2
+#define OHCI1394_MAX_AT_RESP_RETRIES    0x2
+#define OHCI1394_MAX_PHYS_RESP_RETRIES  0x8
+
+#define FW_OHCI_MAJOR                   240
+#define OHCI1394_REGISTER_SIZE          0x800
+#define OHCI_LOOP_COUNT                 500
+#define OHCI1394_PCI_HCI_Control        0x40
+#define SELF_ID_BUF_SIZE                0x800
+#define OHCI_TCODE_PHY_PACKET           0x0e
+#define OHCI_VERSION_1_1                0x010010
+#define ISO_BUFFER_SIZE                 (64 * 1024)
+#define AT_BUFFER_SIZE                  4096
+
+static char ohci_driver_name[] = KBUILD_MODNAME;
+
+static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
+{
+        writel(data, ohci->registers + offset);
+}
+
+static inline u32 reg_read(const struct fw_ohci *ohci, int offset)
+{
+        return readl(ohci->registers + offset);
+}
+
+static inline void flush_writes(const struct fw_ohci *ohci)
+{
+        /* Do a dummy read to flush writes. */
+        reg_read(ohci, OHCI1394_Version);
+}
+
+static int
+ohci_update_phy_reg(struct fw_card *card, int addr,
+                    int clear_bits, int set_bits)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+        u32 val, old;
+
+        reg_write(ohci, OHCI1394_PhyControl, OHCI1394_PhyControl_Read(addr));
+        msleep(2);
+        val = reg_read(ohci, OHCI1394_PhyControl);
+        if ((val & OHCI1394_PhyControl_ReadDone) == 0) {
+                fw_error("failed to set phy reg bits.\n");
+                return -EBUSY;
+        }
+
+        old = OHCI1394_PhyControl_ReadData(val);
+        old = (old & ~clear_bits) | set_bits;
+        reg_write(ohci, OHCI1394_PhyControl,
+                  OHCI1394_PhyControl_Write(addr, old));
+
+        return 0;
+}
+
+static int ar_context_add_page(struct ar_context *ctx)
+{
+        struct device *dev = ctx->ohci->card.device;
+        struct ar_buffer *ab;
+        dma_addr_t ab_bus;
+        size_t offset;
+
+        ab = (struct ar_buffer *) __get_free_page(GFP_ATOMIC);
+        if (ab == NULL)
+                return -ENOMEM;
+
+        ab_bus = dma_map_single(dev, ab, PAGE_SIZE, DMA_BIDIRECTIONAL);
+        if (dma_mapping_error(ab_bus)) {
+                free_page((unsigned long) ab);
+                return -ENOMEM;
+        }
+
+        memset(&ab->descriptor, 0, sizeof(ab->descriptor));
+        ab->descriptor.control        = cpu_to_le16(DESCRIPTOR_INPUT_MORE |
+                                                    DESCRIPTOR_STATUS |
+                                                    DESCRIPTOR_BRANCH_ALWAYS);
+        offset = offsetof(struct ar_buffer, data);
+        ab->descriptor.req_count      = cpu_to_le16(PAGE_SIZE - offset);
+        ab->descriptor.data_address   = cpu_to_le32(ab_bus + offset);
+        ab->descriptor.res_count      = cpu_to_le16(PAGE_SIZE - offset);
+        ab->descriptor.branch_address = 0;
+
+        dma_sync_single_for_device(dev, ab_bus, PAGE_SIZE, DMA_BIDIRECTIONAL);
+
+        ctx->last_buffer->descriptor.branch_address = ab_bus | 1;
+        ctx->last_buffer->next = ab;
+        ctx->last_buffer = ab;
+
+        reg_write(ctx->ohci, CONTROL_SET(ctx->regs), CONTEXT_WAKE);
+        flush_writes(ctx->ohci);
+
+        return 0;
+}
+
+static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer)
+{
+        struct fw_ohci *ohci = ctx->ohci;
+        struct fw_packet p;
+        u32 status, length, tcode;
+
+        p.header[0] = le32_to_cpu(buffer[0]);
+        p.header[1] = le32_to_cpu(buffer[1]);
+        p.header[2] = le32_to_cpu(buffer[2]);
+
+        tcode = (p.header[0] >> 4) & 0x0f;
+        switch (tcode) {
+        case TCODE_WRITE_QUADLET_REQUEST:
+        case TCODE_READ_QUADLET_RESPONSE:
+                p.header[3] = (__force __u32) buffer[3];
+                p.header_length = 16;
+                p.payload_length = 0;
+                break;
+
+        case TCODE_READ_BLOCK_REQUEST :
+                p.header[3] = le32_to_cpu(buffer[3]);
+                p.header_length = 16;
+                p.payload_length = 0;
+                break;
+
+        case TCODE_WRITE_BLOCK_REQUEST:
+        case TCODE_READ_BLOCK_RESPONSE:
+        case TCODE_LOCK_REQUEST:
+        case TCODE_LOCK_RESPONSE:
+                p.header[3] = le32_to_cpu(buffer[3]);
+                p.header_length = 16;
+                p.payload_length = p.header[3] >> 16;
+                break;
+
+        case TCODE_WRITE_RESPONSE:
+        case TCODE_READ_QUADLET_REQUEST:
+        case OHCI_TCODE_PHY_PACKET:
+                p.header_length = 12;
+                p.payload_length = 0;
+                break;
+        }
+
+        p.payload = (void *) buffer + p.header_length;
+
+        /* FIXME: What to do about evt_* errors? */
+        length = (p.header_length + p.payload_length + 3) / 4;
+        status = le32_to_cpu(buffer[length]);
+
+        p.ack        = ((status >> 16) & 0x1f) - 16;
+        p.speed      = (status >> 21) & 0x7;
+        p.timestamp  = status & 0xffff;
+        p.generation = ohci->request_generation;
+
+        /*
+         * The OHCI bus reset handler synthesizes a phy packet with
+         * the new generation number when a bus reset happens (see
+         * section 8.4.2.3).  This helps us determine when a request
+         * was received and make sure we send the response in the same
+         * generation.  We only need this for requests; for responses
+         * we use the unique tlabel for finding the matching
+         * request.
+         */
+
+        if (p.ack + 16 == 0x09)
+                ohci->request_generation = (buffer[2] >> 16) & 0xff;
+        else if (ctx == &ohci->ar_request_ctx)
+                fw_core_handle_request(&ohci->card, &p);
+        else
+                fw_core_handle_response(&ohci->card, &p);
+
+        return buffer + length + 1;
+}
+
+static void ar_context_tasklet(unsigned long data)
+{
+        struct ar_context *ctx = (struct ar_context *)data;
+        struct fw_ohci *ohci = ctx->ohci;
+        struct ar_buffer *ab;
+        struct descriptor *d;
+        void *buffer, *end;
+
+        ab = ctx->current_buffer;
+        d = &ab->descriptor;
+
+        if (d->res_count == 0) {
+                size_t size, rest, offset;
+
+                /*
+                 * This descriptor is finished and we may have a
+                 * packet split across this and the next buffer. We
+                 * reuse the page for reassembling the split packet.
+                 */
+
+                offset = offsetof(struct ar_buffer, data);
+                dma_unmap_single(ohci->card.device,
+                                 ab->descriptor.data_address - offset,
+                                 PAGE_SIZE, DMA_BIDIRECTIONAL);
+
+                buffer = ab;
+                ab = ab->next;
+                d = &ab->descriptor;
+                size = buffer + PAGE_SIZE - ctx->pointer;
+                rest = le16_to_cpu(d->req_count) - le16_to_cpu(d->res_count);
+                memmove(buffer, ctx->pointer, size);
+                memcpy(buffer + size, ab->data, rest);
+                ctx->current_buffer = ab;
+                ctx->pointer = (void *) ab->data + rest;
+                end = buffer + size + rest;
+
+                while (buffer < end)
+                        buffer = handle_ar_packet(ctx, buffer);
+
+                free_page((unsigned long)buffer);
+                ar_context_add_page(ctx);
+        } else {
+                buffer = ctx->pointer;
+                ctx->pointer = end =
+                        (void *) ab + PAGE_SIZE - le16_to_cpu(d->res_count);
+
+                while (buffer < end)
+                        buffer = handle_ar_packet(ctx, buffer);
+        }
+}
+
+static int
+ar_context_init(struct ar_context *ctx, struct fw_ohci *ohci, u32 regs)
+{
+        struct ar_buffer ab;
+
+        ctx->regs        = regs;
+        ctx->ohci        = ohci;
+        ctx->last_buffer = &ab;
+        tasklet_init(&ctx->tasklet, ar_context_tasklet, (unsigned long)ctx);
+
+        ar_context_add_page(ctx);
+        ar_context_add_page(ctx);
+        ctx->current_buffer = ab.next;
+        ctx->pointer = ctx->current_buffer->data;
+
+        reg_write(ctx->ohci, COMMAND_PTR(ctx->regs), ab.descriptor.branch_address);
+        reg_write(ctx->ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN);
+        flush_writes(ctx->ohci);
+
+        return 0;
+}
+
+static void context_tasklet(unsigned long data)
+{
+        struct context *ctx = (struct context *) data;
+        struct fw_ohci *ohci = ctx->ohci;
+        struct descriptor *d, *last;
+        u32 address;
+        int z;
+
+        dma_sync_single_for_cpu(ohci->card.device, ctx->buffer_bus,
+                                ctx->buffer_size, DMA_TO_DEVICE);
+
+        d    = ctx->tail_descriptor;
+        last = ctx->tail_descriptor_last;
+
+        while (last->branch_address != 0) {
+                address = le32_to_cpu(last->branch_address);
+                z = address & 0xf;
+                d = ctx->buffer + (address - ctx->buffer_bus) / sizeof(*d);
+                last = (z == 2) ? d : d + z - 1;
+
+                if (!ctx->callback(ctx, d, last))
+                        break;
+
+                ctx->tail_descriptor      = d;
+                ctx->tail_descriptor_last = last;
+        }
+}
+
+static int
+context_init(struct context *ctx, struct fw_ohci *ohci,
+             size_t buffer_size, u32 regs,
+             descriptor_callback_t callback)
+{
+        ctx->ohci = ohci;
+        ctx->regs = regs;
+        ctx->buffer_size = buffer_size;
+        ctx->buffer = kmalloc(buffer_size, GFP_KERNEL);
+        if (ctx->buffer == NULL)
+                return -ENOMEM;
+
+        tasklet_init(&ctx->tasklet, context_tasklet, (unsigned long)ctx);
+        ctx->callback = callback;
+
+        ctx->buffer_bus =
+                dma_map_single(ohci->card.device, ctx->buffer,
+                               buffer_size, DMA_TO_DEVICE);
+        if (dma_mapping_error(ctx->buffer_bus)) {
+                kfree(ctx->buffer);
+                return -ENOMEM;
+        }
+
+        ctx->head_descriptor      = ctx->buffer;
+        ctx->prev_descriptor      = ctx->buffer;
+        ctx->tail_descriptor      = ctx->buffer;
+        ctx->tail_descriptor_last = ctx->buffer;
+
+        /*
+         * We put a dummy descriptor in the buffer that has a NULL
+         * branch address and looks like it's been sent.  That way we
+         * have a descriptor to append DMA programs to.  Also, the
+         * ring buffer invariant is that it always has at least one
+         * element so that head == tail means buffer full.
+         */
+
+        memset(ctx->head_descriptor, 0, sizeof(*ctx->head_descriptor));
+        ctx->head_descriptor->control = cpu_to_le16(DESCRIPTOR_OUTPUT_LAST);
+        ctx->head_descriptor->transfer_status = cpu_to_le16(0x8011);
+        ctx->head_descriptor++;
+
+        return 0;
+}
+
+static void
+context_release(struct context *ctx)
+{
+        struct fw_card *card = &ctx->ohci->card;
+
+        dma_unmap_single(card->device, ctx->buffer_bus,
+                         ctx->buffer_size, DMA_TO_DEVICE);
+        kfree(ctx->buffer);
+}
+
+static struct descriptor *
+context_get_descriptors(struct context *ctx, int z, dma_addr_t *d_bus)
+{
+        struct descriptor *d, *tail, *end;
+
+        d = ctx->head_descriptor;
+        tail = ctx->tail_descriptor;
+        end = ctx->buffer + ctx->buffer_size / sizeof(*d);
+
+        if (d + z <= tail) {
+                goto has_space;
+        } else if (d > tail && d + z <= end) {
+                goto has_space;
+        } else if (d > tail && ctx->buffer + z <= tail) {
+                d = ctx->buffer;
+                goto has_space;
+        }
+
+        return NULL;
+
+ has_space:
+        memset(d, 0, z * sizeof(*d));
+        *d_bus = ctx->buffer_bus + (d - ctx->buffer) * sizeof(*d);
+
+        return d;
+}
+
+static void context_run(struct context *ctx, u32 extra)
+{
+        struct fw_ohci *ohci = ctx->ohci;
+
+        reg_write(ohci, COMMAND_PTR(ctx->regs),
+                  le32_to_cpu(ctx->tail_descriptor_last->branch_address));
+        reg_write(ohci, CONTROL_CLEAR(ctx->regs), ~0);
+        reg_write(ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN | extra);
+        flush_writes(ohci);
+}
+
+static void context_append(struct context *ctx,
+                           struct descriptor *d, int z, int extra)
+{
+        dma_addr_t d_bus;
+
+        d_bus = ctx->buffer_bus + (d - ctx->buffer) * sizeof(*d);
+
+        ctx->head_descriptor = d + z + extra;
+        ctx->prev_descriptor->branch_address = cpu_to_le32(d_bus | z);
+        ctx->prev_descriptor = z == 2 ? d : d + z - 1;
+
+        dma_sync_single_for_device(ctx->ohci->card.device, ctx->buffer_bus,
+                                   ctx->buffer_size, DMA_TO_DEVICE);
+
+        reg_write(ctx->ohci, CONTROL_SET(ctx->regs), CONTEXT_WAKE);
+        flush_writes(ctx->ohci);
+}
+
+static void context_stop(struct context *ctx)
+{
+        u32 reg;
+        int i;
+
+        reg_write(ctx->ohci, CONTROL_CLEAR(ctx->regs), CONTEXT_RUN);
+        flush_writes(ctx->ohci);
+
+        for (i = 0; i < 10; i++) {
+                reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs));
+                if ((reg & CONTEXT_ACTIVE) == 0)
+                        break;
+
+                fw_notify("context_stop: still active (0x%08x)\n", reg);
+                msleep(1);
+        }
+}
+
+struct driver_data {
+        struct fw_packet *packet;
+};
+
+/*
+ * This function apppends a packet to the DMA queue for transmission.
+ * Must always be called with the ochi->lock held to ensure proper
+ * generation handling and locking around packet queue manipulation.
+ */
+static int
+at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
+{
+        struct fw_ohci *ohci = ctx->ohci;
+        dma_addr_t d_bus, payload_bus;
+        struct driver_data *driver_data;
+        struct descriptor *d, *last;
+        __le32 *header;
+        int z, tcode;
+        u32 reg;
+
+        d = context_get_descriptors(ctx, 4, &d_bus);
+        if (d == NULL) {
+                packet->ack = RCODE_SEND_ERROR;
+                return -1;
+        }
+
+        d[0].control   = cpu_to_le16(DESCRIPTOR_KEY_IMMEDIATE);
+        d[0].res_count = cpu_to_le16(packet->timestamp);
+
+        /*
+         * The DMA format for asyncronous link packets is different
+         * from the IEEE1394 layout, so shift the fields around
+         * accordingly.  If header_length is 8, it's a PHY packet, to
+         * which we need to prepend an extra quadlet.
+         */
+
+        header = (__le32 *) &d[1];
+        if (packet->header_length > 8) {
+                header[0] = cpu_to_le32((packet->header[0] & 0xffff) |
+                                        (packet->speed << 16));
+                header[1] = cpu_to_le32((packet->header[1] & 0xffff) |
+                                        (packet->header[0] & 0xffff0000));
+                header[2] = cpu_to_le32(packet->header[2]);
+
+                tcode = (packet->header[0] >> 4) & 0x0f;
+                if (TCODE_IS_BLOCK_PACKET(tcode))
+                        header[3] = cpu_to_le32(packet->header[3]);
+                else
+                        header[3] = (__force __le32) packet->header[3];
+
+                d[0].req_count = cpu_to_le16(packet->header_length);
+        } else {
+                header[0] = cpu_to_le32((OHCI1394_phy_tcode << 4) |
+                                        (packet->speed << 16));
+                header[1] = cpu_to_le32(packet->header[0]);
+                header[2] = cpu_to_le32(packet->header[1]);
+                d[0].req_count = cpu_to_le16(12);
+        }
+
+        driver_data = (struct driver_data *) &d[3];
+        driver_data->packet = packet;
+        packet->driver_data = driver_data;
+        
+        if (packet->payload_length > 0) {
+                payload_bus =
+                        dma_map_single(ohci->card.device, packet->payload,
+                                       packet->payload_length, DMA_TO_DEVICE);
+                if (dma_mapping_error(payload_bus)) {
+                        packet->ack = RCODE_SEND_ERROR;
+                        return -1;
+                }
+
+                d[2].req_count    = cpu_to_le16(packet->payload_length);
+                d[2].data_address = cpu_to_le32(payload_bus);
+                last = &d[2];
+                z = 3;
+        } else {
+                last = &d[0];
+                z = 2;
+        }
+
+        last->control |= cpu_to_le16(DESCRIPTOR_OUTPUT_LAST |
+                                     DESCRIPTOR_IRQ_ALWAYS |
+                                     DESCRIPTOR_BRANCH_ALWAYS);
+
+        /* FIXME: Document how the locking works. */
+        if (ohci->generation != packet->generation) {
+                packet->ack = RCODE_GENERATION;
+                return -1;
+        }
+
+        context_append(ctx, d, z, 4 - z);
+
+        /* If the context isn't already running, start it up. */
+        reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs));
+        if ((reg & CONTEXT_RUN) == 0)
+                context_run(ctx, 0);
+
+        return 0;
+}
+
+static int handle_at_packet(struct context *context,
+                            struct descriptor *d,
+                            struct descriptor *last)
+{
+        struct driver_data *driver_data;
+        struct fw_packet *packet;
+        struct fw_ohci *ohci = context->ohci;
+        dma_addr_t payload_bus;
+        int evt;
+
+        if (last->transfer_status == 0)
+                /* This descriptor isn't done yet, stop iteration. */
+                return 0;
+
+        driver_data = (struct driver_data *) &d[3];
+        packet = driver_data->packet;
+        if (packet == NULL)
+                /* This packet was cancelled, just continue. */
+                return 1;
+
+        payload_bus = le32_to_cpu(last->data_address);
+        if (payload_bus != 0)
+                dma_unmap_single(ohci->card.device, payload_bus,
+                                 packet->payload_length, DMA_TO_DEVICE);
+
+        evt = le16_to_cpu(last->transfer_status) & 0x1f;
+        packet->timestamp = le16_to_cpu(last->res_count);
+
+        switch (evt) {
+        case OHCI1394_evt_timeout:
+                /* Async response transmit timed out. */
+                packet->ack = RCODE_CANCELLED;
+                break;
+
+        case OHCI1394_evt_flushed:
+                /*
+                 * The packet was flushed should give same error as
+                 * when we try to use a stale generation count.
+                 */
+                packet->ack = RCODE_GENERATION;
+                break;
+
+        case OHCI1394_evt_missing_ack:
+                /*
+                 * Using a valid (current) generation count, but the
+                 * node is not on the bus or not sending acks.
+                 */
+                packet->ack = RCODE_NO_ACK;
+                break;
+
+        case ACK_COMPLETE + 0x10:
+        case ACK_PENDING + 0x10:
+        case ACK_BUSY_X + 0x10:
+        case ACK_BUSY_A + 0x10:
+        case ACK_BUSY_B + 0x10:
+        case ACK_DATA_ERROR + 0x10:
+        case ACK_TYPE_ERROR + 0x10:
+                packet->ack = evt - 0x10;
+                break;
+
+        default:
+                packet->ack = RCODE_SEND_ERROR;
+                break;
+        }
+
+        packet->callback(packet, &ohci->card, packet->ack);
+
+        return 1;
+}
+
+#define HEADER_GET_DESTINATION(q)       (((q) >> 16) & 0xffff)
+#define HEADER_GET_TCODE(q)             (((q) >> 4) & 0x0f)
+#define HEADER_GET_OFFSET_HIGH(q)       (((q) >> 0) & 0xffff)
+#define HEADER_GET_DATA_LENGTH(q)       (((q) >> 16) & 0xffff)
+#define HEADER_GET_EXTENDED_TCODE(q)    (((q) >> 0) & 0xffff)
+
+static void
+handle_local_rom(struct fw_ohci *ohci, struct fw_packet *packet, u32 csr)
+{
+        struct fw_packet response;
+        int tcode, length, i;
+
+        tcode = HEADER_GET_TCODE(packet->header[0]);
+        if (TCODE_IS_BLOCK_PACKET(tcode))
+                length = HEADER_GET_DATA_LENGTH(packet->header[3]);
+        else
+                length = 4;
+
+        i = csr - CSR_CONFIG_ROM;
+        if (i + length > CONFIG_ROM_SIZE) {
+                fw_fill_response(&response, packet->header,
+                                 RCODE_ADDRESS_ERROR, NULL, 0);
+        } else if (!TCODE_IS_READ_REQUEST(tcode)) {
+                fw_fill_response(&response, packet->header,
+                                 RCODE_TYPE_ERROR, NULL, 0);
+        } else {
+                fw_fill_response(&response, packet->header, RCODE_COMPLETE,
+                                 (void *) ohci->config_rom + i, length);
+        }
+
+        fw_core_handle_response(&ohci->card, &response);
+}
+
+static void
+handle_local_lock(struct fw_ohci *ohci, struct fw_packet *packet, u32 csr)
+{
+        struct fw_packet response;
+        int tcode, length, ext_tcode, sel;
+        __be32 *payload, lock_old;
+        u32 lock_arg, lock_data;
+
+        tcode = HEADER_GET_TCODE(packet->header[0]);
+        length = HEADER_GET_DATA_LENGTH(packet->header[3]);
+        payload = packet->payload;
+        ext_tcode = HEADER_GET_EXTENDED_TCODE(packet->header[3]);
+
+        if (tcode == TCODE_LOCK_REQUEST &&
+            ext_tcode == EXTCODE_COMPARE_SWAP && length == 8) {
+                lock_arg = be32_to_cpu(payload[0]);
+                lock_data = be32_to_cpu(payload[1]);
+        } else if (tcode == TCODE_READ_QUADLET_REQUEST) {
+                lock_arg = 0;
+                lock_data = 0;
+        } else {
+                fw_fill_response(&response, packet->header,
+                                 RCODE_TYPE_ERROR, NULL, 0);
+                goto out;
+        }
+
+        sel = (csr - CSR_BUS_MANAGER_ID) / 4;
+        reg_write(ohci, OHCI1394_CSRData, lock_data);
+        reg_write(ohci, OHCI1394_CSRCompareData, lock_arg);
+        reg_write(ohci, OHCI1394_CSRControl, sel);
+
+        if (reg_read(ohci, OHCI1394_CSRControl) & 0x80000000)
+                lock_old = cpu_to_be32(reg_read(ohci, OHCI1394_CSRData));
+        else
+                fw_notify("swap not done yet\n");
+
+        fw_fill_response(&response, packet->header,
+                         RCODE_COMPLETE, &lock_old, sizeof(lock_old));
+ out:
+        fw_core_handle_response(&ohci->card, &response);
+}
+
+static void
+handle_local_request(struct context *ctx, struct fw_packet *packet)
+{
+        u64 offset;
+        u32 csr;
+
+        if (ctx == &ctx->ohci->at_request_ctx) {
+                packet->ack = ACK_PENDING;
+                packet->callback(packet, &ctx->ohci->card, packet->ack);
+        }
+
+        offset =
+                ((unsigned long long)
+                 HEADER_GET_OFFSET_HIGH(packet->header[1]) << 32) |
+                packet->header[2];
+        csr = offset - CSR_REGISTER_BASE;
+
+        /* Handle config rom reads. */
+        if (csr >= CSR_CONFIG_ROM && csr < CSR_CONFIG_ROM_END)
+                handle_local_rom(ctx->ohci, packet, csr);
+        else switch (csr) {
+        case CSR_BUS_MANAGER_ID:
+        case CSR_BANDWIDTH_AVAILABLE:
+        case CSR_CHANNELS_AVAILABLE_HI:
+        case CSR_CHANNELS_AVAILABLE_LO:
+                handle_local_lock(ctx->ohci, packet, csr);
+                break;
+        default:
+                if (ctx == &ctx->ohci->at_request_ctx)
+                        fw_core_handle_request(&ctx->ohci->card, packet);
+                else
+                        fw_core_handle_response(&ctx->ohci->card, packet);
+                break;
+        }
+
+        if (ctx == &ctx->ohci->at_response_ctx) {
+                packet->ack = ACK_COMPLETE;
+                packet->callback(packet, &ctx->ohci->card, packet->ack);
+        }
+}
+
+static void
+at_context_transmit(struct context *ctx, struct fw_packet *packet)
+{
+        unsigned long flags;
+        int retval;
+
+        spin_lock_irqsave(&ctx->ohci->lock, flags);
+
+        if (HEADER_GET_DESTINATION(packet->header[0]) == ctx->ohci->node_id &&
+            ctx->ohci->generation == packet->generation) {
+                spin_unlock_irqrestore(&ctx->ohci->lock, flags);
+                handle_local_request(ctx, packet);
+                return;
+        }
+
+        retval = at_context_queue_packet(ctx, packet);
+        spin_unlock_irqrestore(&ctx->ohci->lock, flags);
+
+        if (retval < 0)
+                packet->callback(packet, &ctx->ohci->card, packet->ack);
+        
+}
+
+static void bus_reset_tasklet(unsigned long data)
+{
+        struct fw_ohci *ohci = (struct fw_ohci *)data;
+        int self_id_count, i, j, reg;
+        int generation, new_generation;
+        unsigned long flags;
+
+        reg = reg_read(ohci, OHCI1394_NodeID);
+        if (!(reg & OHCI1394_NodeID_idValid)) {
+                fw_error("node ID not valid, new bus reset in progress\n");
+                return;
+        }
+        ohci->node_id = reg & 0xffff;
+
+        /*
+         * The count in the SelfIDCount register is the number of
+         * bytes in the self ID receive buffer.  Since we also receive
+         * the inverted quadlets and a header quadlet, we shift one
+         * bit extra to get the actual number of self IDs.
+         */
+
+        self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff;
+        generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff;
+
+        for (i = 1, j = 0; j < self_id_count; i += 2, j++) {
+                if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1])
+                        fw_error("inconsistent self IDs\n");
+                ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]);
+        }
+
+        /*
+         * Check the consistency of the self IDs we just read.  The
+         * problem we face is that a new bus reset can start while we
+         * read out the self IDs from the DMA buffer. If this happens,
+         * the DMA buffer will be overwritten with new self IDs and we
+         * will read out inconsistent data.  The OHCI specification
+         * (section 11.2) recommends a technique similar to
+         * linux/seqlock.h, where we remember the generation of the
+         * self IDs in the buffer before reading them out and compare
+         * it to the current generation after reading them out.  If
+         * the two generations match we know we have a consistent set
+         * of self IDs.
+         */
+
+        new_generation = (reg_read(ohci, OHCI1394_SelfIDCount) >> 16) & 0xff;
+        if (new_generation != generation) {
+                fw_notify("recursive bus reset detected, "
+                          "discarding self ids\n");
+                return;
+        }
+
+        /* FIXME: Document how the locking works. */
+        spin_lock_irqsave(&ohci->lock, flags);
+
+        ohci->generation = generation;
+        context_stop(&ohci->at_request_ctx);
+        context_stop(&ohci->at_response_ctx);
+        reg_write(ohci, OHCI1394_IntEventClear, OHCI1394_busReset);
+
+        /*
+         * This next bit is unrelated to the AT context stuff but we
+         * have to do it under the spinlock also.  If a new config rom
+         * was set up before this reset, the old one is now no longer
+         * in use and we can free it. Update the config rom pointers
+         * to point to the current config rom and clear the
+         * next_config_rom pointer so a new udpate can take place.
+         */
+
+        if (ohci->next_config_rom != NULL) {
+                dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                  ohci->config_rom, ohci->config_rom_bus);
+                ohci->config_rom      = ohci->next_config_rom;
+                ohci->config_rom_bus  = ohci->next_config_rom_bus;
+                ohci->next_config_rom = NULL;
+
+                /*
+                 * Restore config_rom image and manually update
+                 * config_rom registers.  Writing the header quadlet
+                 * will indicate that the config rom is ready, so we
+                 * do that last.
+                 */
+                reg_write(ohci, OHCI1394_BusOptions,
+                          be32_to_cpu(ohci->config_rom[2]));
+                ohci->config_rom[0] = cpu_to_be32(ohci->next_header);
+                reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header);
+        }
+
+        spin_unlock_irqrestore(&ohci->lock, flags);
+
+        fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation,
+                                 self_id_count, ohci->self_id_buffer);
+}
+
+static irqreturn_t irq_handler(int irq, void *data)
+{
+        struct fw_ohci *ohci = data;
+        u32 event, iso_event, cycle_time;
+        int i;
+
+        event = reg_read(ohci, OHCI1394_IntEventClear);
+
+        if (!event)
+                return IRQ_NONE;
+
+        reg_write(ohci, OHCI1394_IntEventClear, event);
+
+        if (event & OHCI1394_selfIDComplete)
+                tasklet_schedule(&ohci->bus_reset_tasklet);
+
+        if (event & OHCI1394_RQPkt)
+                tasklet_schedule(&ohci->ar_request_ctx.tasklet);
+
+        if (event & OHCI1394_RSPkt)
+                tasklet_schedule(&ohci->ar_response_ctx.tasklet);
+
+        if (event & OHCI1394_reqTxComplete)
+                tasklet_schedule(&ohci->at_request_ctx.tasklet);
+
+        if (event & OHCI1394_respTxComplete)
+                tasklet_schedule(&ohci->at_response_ctx.tasklet);
+
+        iso_event = reg_read(ohci, OHCI1394_IsoRecvIntEventClear);
+        reg_write(ohci, OHCI1394_IsoRecvIntEventClear, iso_event);
+
+        while (iso_event) {
+                i = ffs(iso_event) - 1;
+                tasklet_schedule(&ohci->ir_context_list[i].context.tasklet);
+                iso_event &= ~(1 << i);
+        }
+
+        iso_event = reg_read(ohci, OHCI1394_IsoXmitIntEventClear);
+        reg_write(ohci, OHCI1394_IsoXmitIntEventClear, iso_event);
+
+        while (iso_event) {
+                i = ffs(iso_event) - 1;
+                tasklet_schedule(&ohci->it_context_list[i].context.tasklet);
+                iso_event &= ~(1 << i);
+        }
+
+        if (event & OHCI1394_cycle64Seconds) {
+                cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
+                if ((cycle_time & 0x80000000) == 0)
+                        ohci->bus_seconds++;
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+        struct pci_dev *dev = to_pci_dev(card->device);
+
+        /*
+         * When the link is not yet enabled, the atomic config rom
+         * update mechanism described below in ohci_set_config_rom()
+         * is not active.  We have to update ConfigRomHeader and
+         * BusOptions manually, and the write to ConfigROMmap takes
+         * effect immediately.  We tie this to the enabling of the
+         * link, so we have a valid config rom before enabling - the
+         * OHCI requires that ConfigROMhdr and BusOptions have valid
+         * values before enabling.
+         *
+         * However, when the ConfigROMmap is written, some controllers
+         * always read back quadlets 0 and 2 from the config rom to
+         * the ConfigRomHeader and BusOptions registers on bus reset.
+         * They shouldn't do that in this initial case where the link
+         * isn't enabled.  This means we have to use the same
+         * workaround here, setting the bus header to 0 and then write
+         * the right values in the bus reset tasklet.
+         */
+
+        ohci->next_config_rom =
+                dma_alloc_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                   &ohci->next_config_rom_bus, GFP_KERNEL);
+        if (ohci->next_config_rom == NULL)
+                return -ENOMEM;
+
+        memset(ohci->next_config_rom, 0, CONFIG_ROM_SIZE);
+        fw_memcpy_to_be32(ohci->next_config_rom, config_rom, length * 4);
+
+        ohci->next_header = config_rom[0];
+        ohci->next_config_rom[0] = 0;
+        reg_write(ohci, OHCI1394_ConfigROMhdr, 0);
+        reg_write(ohci, OHCI1394_BusOptions, config_rom[2]);
+        reg_write(ohci, OHCI1394_ConfigROMmap, ohci->next_config_rom_bus);
+
+        reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000);
+
+        if (request_irq(dev->irq, irq_handler,
+                        IRQF_SHARED, ohci_driver_name, ohci)) {
+                fw_error("Failed to allocate shared interrupt %d.\n",
+                         dev->irq);
+                dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                  ohci->config_rom, ohci->config_rom_bus);
+                return -EIO;
+        }
+
+        reg_write(ohci, OHCI1394_HCControlSet,
+                  OHCI1394_HCControl_linkEnable |
+                  OHCI1394_HCControl_BIBimageValid);
+        flush_writes(ohci);
+
+        /*
+         * We are ready to go, initiate bus reset to finish the
+         * initialization.
+         */
+
+        fw_core_initiate_bus_reset(&ohci->card, 1);
+
+        return 0;
+}
+
+static int
+ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length)
+{
+        struct fw_ohci *ohci;
+        unsigned long flags;
+        int retval = 0;
+        __be32 *next_config_rom;
+        dma_addr_t next_config_rom_bus;
+
+        ohci = fw_ohci(card);
+
+        /*
+         * When the OHCI controller is enabled, the config rom update
+         * mechanism is a bit tricky, but easy enough to use.  See
+         * section 5.5.6 in the OHCI specification.
+         *
+         * The OHCI controller caches the new config rom address in a
+         * shadow register (ConfigROMmapNext) and needs a bus reset
+         * for the changes to take place.  When the bus reset is
+         * detected, the controller loads the new values for the
+         * ConfigRomHeader and BusOptions registers from the specified
+         * config rom and loads ConfigROMmap from the ConfigROMmapNext
+         * shadow register. All automatically and atomically.
+         *
+         * Now, there's a twist to this story.  The automatic load of
+         * ConfigRomHeader and BusOptions doesn't honor the
+         * noByteSwapData bit, so with a be32 config rom, the
+         * controller will load be32 values in to these registers
+         * during the atomic update, even on litte endian
+         * architectures.  The workaround we use is to put a 0 in the
+         * header quadlet; 0 is endian agnostic and means that the
+         * config rom isn't ready yet.  In the bus reset tasklet we
+         * then set up the real values for the two registers.
+         *
+         * We use ohci->lock to avoid racing with the code that sets
+         * ohci->next_config_rom to NULL (see bus_reset_tasklet).
+         */
+
+        next_config_rom =
+                dma_alloc_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                   &next_config_rom_bus, GFP_KERNEL);
+        if (next_config_rom == NULL)
+                return -ENOMEM;
+
+        spin_lock_irqsave(&ohci->lock, flags);
+
+        if (ohci->next_config_rom == NULL) {
+                ohci->next_config_rom = next_config_rom;
+                ohci->next_config_rom_bus = next_config_rom_bus;
+
+                memset(ohci->next_config_rom, 0, CONFIG_ROM_SIZE);
+                fw_memcpy_to_be32(ohci->next_config_rom, config_rom,
+                                  length * 4);
+
+                ohci->next_header = config_rom[0];
+                ohci->next_config_rom[0] = 0;
+
+                reg_write(ohci, OHCI1394_ConfigROMmap,
+                          ohci->next_config_rom_bus);
+        } else {
+                dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                  next_config_rom, next_config_rom_bus);
+                retval = -EBUSY;
+        }
+
+        spin_unlock_irqrestore(&ohci->lock, flags);
+
+        /*
+         * Now initiate a bus reset to have the changes take
+         * effect. We clean up the old config rom memory and DMA
+         * mappings in the bus reset tasklet, since the OHCI
+         * controller could need to access it before the bus reset
+         * takes effect.
+         */
+        if (retval == 0)
+                fw_core_initiate_bus_reset(&ohci->card, 1);
+
+        return retval;
+}
+
+static void ohci_send_request(struct fw_card *card, struct fw_packet *packet)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+
+        at_context_transmit(&ohci->at_request_ctx, packet);
+}
+
+static void ohci_send_response(struct fw_card *card, struct fw_packet *packet)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+
+        at_context_transmit(&ohci->at_response_ctx, packet);
+}
+
+static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+        struct context *ctx = &ohci->at_request_ctx;
+        struct driver_data *driver_data = packet->driver_data;
+        int retval = -ENOENT;
+
+        tasklet_disable(&ctx->tasklet);
+
+        if (packet->ack != 0)
+                goto out;
+
+        driver_data->packet = NULL;
+        packet->ack = RCODE_CANCELLED;
+        packet->callback(packet, &ohci->card, packet->ack);
+        retval = 0;
+
+ out:
+        tasklet_enable(&ctx->tasklet);
+
+        return retval;
+}
+
+static int
+ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+        unsigned long flags;
+        int n, retval = 0;
+
+        /*
+         * FIXME:  Make sure this bitmask is cleared when we clear the busReset
+         * interrupt bit.  Clear physReqResourceAllBuses on bus reset.
+         */
+
+        spin_lock_irqsave(&ohci->lock, flags);
+
+        if (ohci->generation != generation) {
+                retval = -ESTALE;
+                goto out;
+        }
+
+        /*
+         * Note, if the node ID contains a non-local bus ID, physical DMA is
+         * enabled for _all_ nodes on remote buses.
+         */
+
+        n = (node_id & 0xffc0) == LOCAL_BUS ? node_id & 0x3f : 63;
+        if (n < 32)
+                reg_write(ohci, OHCI1394_PhyReqFilterLoSet, 1 << n);
+        else
+                reg_write(ohci, OHCI1394_PhyReqFilterHiSet, 1 << (n - 32));
+
+        flush_writes(ohci);
+ out:
+        spin_unlock_irqrestore(&ohci->lock, flags);
+        return retval;
+}
+
+static u64
+ohci_get_bus_time(struct fw_card *card)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+        u32 cycle_time;
+        u64 bus_time;
+
+        cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
+        bus_time = ((u64) ohci->bus_seconds << 32) | cycle_time;
+
+        return bus_time;
+}
+
+static int handle_ir_dualbuffer_packet(struct context *context,
+                                       struct descriptor *d,
+                                       struct descriptor *last)
+{
+        struct iso_context *ctx =
+                container_of(context, struct iso_context, context);
+        struct db_descriptor *db = (struct db_descriptor *) d;
+        __le32 *ir_header;
+        size_t header_length;
+        void *p, *end;
+        int i;
+
+        if (db->first_res_count > 0 && db->second_res_count > 0)
+                /* This descriptor isn't done yet, stop iteration. */
+                return 0;
+
+        header_length = le16_to_cpu(db->first_req_count) -
+                le16_to_cpu(db->first_res_count);
+
+        i = ctx->header_length;
+        p = db + 1;
+        end = p + header_length;
+        while (p < end && i + ctx->base.header_size <= PAGE_SIZE) {
+                /*
+                 * The iso header is byteswapped to little endian by
+                 * the controller, but the remaining header quadlets
+                 * are big endian.  We want to present all the headers
+                 * as big endian, so we have to swap the first
+                 * quadlet.
+                 */
+                *(u32 *) (ctx->header + i) = __swab32(*(u32 *) (p + 4));
+                memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4);
+                i += ctx->base.header_size;
+                p += ctx->base.header_size + 4;
+        }
+
+        ctx->header_length = i;
+
+        if (le16_to_cpu(db->control) & DESCRIPTOR_IRQ_ALWAYS) {
+                ir_header = (__le32 *) (db + 1);
+                ctx->base.callback(&ctx->base,
+                                   le32_to_cpu(ir_header[0]) & 0xffff,
+                                   ctx->header_length, ctx->header,
+                                   ctx->base.callback_data);
+                ctx->header_length = 0;
+        }
+
+        return 1;
+}
+
+static int handle_it_packet(struct context *context,
+                            struct descriptor *d,
+                            struct descriptor *last)
+{
+        struct iso_context *ctx =
+                container_of(context, struct iso_context, context);
+
+        if (last->transfer_status == 0)
+                /* This descriptor isn't done yet, stop iteration. */
+                return 0;
+
+        if (le16_to_cpu(last->control) & DESCRIPTOR_IRQ_ALWAYS)
+                ctx->base.callback(&ctx->base, le16_to_cpu(last->res_count),
+                                   0, NULL, ctx->base.callback_data);
+
+        return 1;
+}
+
+static struct fw_iso_context *
+ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+{
+        struct fw_ohci *ohci = fw_ohci(card);
+        struct iso_context *ctx, *list;
+        descriptor_callback_t callback;
+        u32 *mask, regs;
+        unsigned long flags;
+        int index, retval = -ENOMEM;
+
+        if (type == FW_ISO_CONTEXT_TRANSMIT) {
+                mask = &ohci->it_context_mask;
+                list = ohci->it_context_list;
+                callback = handle_it_packet;
+        } else {
+                mask = &ohci->ir_context_mask;
+                list = ohci->ir_context_list;
+                callback = handle_ir_dualbuffer_packet;
+        }
+
+        /* FIXME: We need a fallback for pre 1.1 OHCI. */
+        if (callback == handle_ir_dualbuffer_packet &&
+            ohci->version < OHCI_VERSION_1_1)
+                return ERR_PTR(-EINVAL);
+
+        spin_lock_irqsave(&ohci->lock, flags);
+        index = ffs(*mask) - 1;
+        if (index >= 0)
+                *mask &= ~(1 << index);
+        spin_unlock_irqrestore(&ohci->lock, flags);
+
+        if (index < 0)
+                return ERR_PTR(-EBUSY);
+
+        if (type == FW_ISO_CONTEXT_TRANSMIT)
+                regs = OHCI1394_IsoXmitContextBase(index);
+        else
+                regs = OHCI1394_IsoRcvContextBase(index);
+
+        ctx = &list[index];
+        memset(ctx, 0, sizeof(*ctx));
+        ctx->header_length = 0;
+        ctx->header = (void *) __get_free_page(GFP_KERNEL);
+        if (ctx->header == NULL)
+                goto out;
+
+        retval = context_init(&ctx->context, ohci, ISO_BUFFER_SIZE,
+                              regs, callback);
+        if (retval < 0)
+                goto out_with_header;
+
+        return &ctx->base;
+
+ out_with_header:
+        free_page((unsigned long)ctx->header);
+ out:
+        spin_lock_irqsave(&ohci->lock, flags);
+        *mask |= 1 << index;
+        spin_unlock_irqrestore(&ohci->lock, flags);
+
+        return ERR_PTR(retval);
+}
+
+static int ohci_start_iso(struct fw_iso_context *base,
+                          s32 cycle, u32 sync, u32 tags)
+{
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+        struct fw_ohci *ohci = ctx->context.ohci;
+        u32 control, match;
+        int index;
+
+        if (ctx->base.type == FW_ISO_CONTEXT_TRANSMIT) {
+                index = ctx - ohci->it_context_list;
+                match = 0;
+                if (cycle >= 0)
+                        match = IT_CONTEXT_CYCLE_MATCH_ENABLE |
+                                (cycle & 0x7fff) << 16;
+
+                reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 1 << index);
+                reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, 1 << index);
+                context_run(&ctx->context, match);
+        } else {
+                index = ctx - ohci->ir_context_list;
+                control = IR_CONTEXT_DUAL_BUFFER_MODE | IR_CONTEXT_ISOCH_HEADER;
+                match = (tags << 28) | (sync << 8) | ctx->base.channel;
+                if (cycle >= 0) {
+                        match |= (cycle & 0x07fff) << 12;
+                        control |= IR_CONTEXT_CYCLE_MATCH_ENABLE;
+                }
+
+                reg_write(ohci, OHCI1394_IsoRecvIntEventClear, 1 << index);
+                reg_write(ohci, OHCI1394_IsoRecvIntMaskSet, 1 << index);
+                reg_write(ohci, CONTEXT_MATCH(ctx->context.regs), match);
+                context_run(&ctx->context, control);
+        }
+
+        return 0;
+}
+
+static int ohci_stop_iso(struct fw_iso_context *base)
+{
+        struct fw_ohci *ohci = fw_ohci(base->card);
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+        int index;
+
+        if (ctx->base.type == FW_ISO_CONTEXT_TRANSMIT) {
+                index = ctx - ohci->it_context_list;
+                reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 1 << index);
+        } else {
+                index = ctx - ohci->ir_context_list;
+                reg_write(ohci, OHCI1394_IsoRecvIntMaskClear, 1 << index);
+        }
+        flush_writes(ohci);
+        context_stop(&ctx->context);
+
+        return 0;
+}
+
+static void ohci_free_iso_context(struct fw_iso_context *base)
+{
+        struct fw_ohci *ohci = fw_ohci(base->card);
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+        unsigned long flags;
+        int index;
+
+        ohci_stop_iso(base);
+        context_release(&ctx->context);
+        free_page((unsigned long)ctx->header);
+
+        spin_lock_irqsave(&ohci->lock, flags);
+
+        if (ctx->base.type == FW_ISO_CONTEXT_TRANSMIT) {
+                index = ctx - ohci->it_context_list;
+                ohci->it_context_mask |= 1 << index;
+        } else {
+                index = ctx - ohci->ir_context_list;
+                ohci->ir_context_mask |= 1 << index;
+        }
+
+        spin_unlock_irqrestore(&ohci->lock, flags);
+}
+
+static int
+ohci_queue_iso_transmit(struct fw_iso_context *base,
+                        struct fw_iso_packet *packet,
+                        struct fw_iso_buffer *buffer,
+                        unsigned long payload)
+{
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+        struct descriptor *d, *last, *pd;
+        struct fw_iso_packet *p;
+        __le32 *header;
+        dma_addr_t d_bus, page_bus;
+        u32 z, header_z, payload_z, irq;
+        u32 payload_index, payload_end_index, next_page_index;
+        int page, end_page, i, length, offset;
+
+        /*
+         * FIXME: Cycle lost behavior should be configurable: lose
+         * packet, retransmit or terminate..
+         */
+
+        p = packet;
+        payload_index = payload;
+
+        if (p->skip)
+                z = 1;
+        else
+                z = 2;
+        if (p->header_length > 0)
+                z++;
+
+        /* Determine the first page the payload isn't contained in. */
+        end_page = PAGE_ALIGN(payload_index + p->payload_length) >> PAGE_SHIFT;
+        if (p->payload_length > 0)
+                payload_z = end_page - (payload_index >> PAGE_SHIFT);
+        else
+                payload_z = 0;
+
+        z += payload_z;
+
+        /* Get header size in number of descriptors. */
+        header_z = DIV_ROUND_UP(p->header_length, sizeof(*d));
+
+        d = context_get_descriptors(&ctx->context, z + header_z, &d_bus);
+        if (d == NULL)
+                return -ENOMEM;
+
+        if (!p->skip) {
+                d[0].control   = cpu_to_le16(DESCRIPTOR_KEY_IMMEDIATE);
+                d[0].req_count = cpu_to_le16(8);
+
+                header = (__le32 *) &d[1];
+                header[0] = cpu_to_le32(IT_HEADER_SY(p->sy) |
+                                        IT_HEADER_TAG(p->tag) |
+                                        IT_HEADER_TCODE(TCODE_STREAM_DATA) |
+                                        IT_HEADER_CHANNEL(ctx->base.channel) |
+                                        IT_HEADER_SPEED(ctx->base.speed));
+                header[1] =
+                        cpu_to_le32(IT_HEADER_DATA_LENGTH(p->header_length +
+                                                          p->payload_length));
+        }
+
+        if (p->header_length > 0) {
+                d[2].req_count    = cpu_to_le16(p->header_length);
+                d[2].data_address = cpu_to_le32(d_bus + z * sizeof(*d));
+                memcpy(&d[z], p->header, p->header_length);
+        }
+
+        pd = d + z - payload_z;
+        payload_end_index = payload_index + p->payload_length;
+        for (i = 0; i < payload_z; i++) {
+                page               = payload_index >> PAGE_SHIFT;
+                offset             = payload_index & ~PAGE_MASK;
+                next_page_index    = (page + 1) << PAGE_SHIFT;
+                length             =
+                        min(next_page_index, payload_end_index) - payload_index;
+                pd[i].req_count    = cpu_to_le16(length);
+
+                page_bus = page_private(buffer->pages[page]);
+                pd[i].data_address = cpu_to_le32(page_bus + offset);
+
+                payload_index += length;
+        }
+
+        if (p->interrupt)
+                irq = DESCRIPTOR_IRQ_ALWAYS;
+        else
+                irq = DESCRIPTOR_NO_IRQ;
+
+        last = z == 2 ? d : d + z - 1;
+        last->control |= cpu_to_le16(DESCRIPTOR_OUTPUT_LAST |
+                                     DESCRIPTOR_STATUS |
+                                     DESCRIPTOR_BRANCH_ALWAYS |
+                                     irq);
+
+        context_append(&ctx->context, d, z, header_z);
+
+        return 0;
+}
+
+static int
+ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+                                  struct fw_iso_packet *packet,
+                                  struct fw_iso_buffer *buffer,
+                                  unsigned long payload)
+{
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+        struct db_descriptor *db = NULL;
+        struct descriptor *d;
+        struct fw_iso_packet *p;
+        dma_addr_t d_bus, page_bus;
+        u32 z, header_z, length, rest;
+        int page, offset, packet_count, header_size;
+
+        /*
+         * FIXME: Cycle lost behavior should be configurable: lose
+         * packet, retransmit or terminate..
+         */
+
+        if (packet->skip) {
+                d = context_get_descriptors(&ctx->context, 2, &d_bus);
+                if (d == NULL)
+                        return -ENOMEM;
+
+                db = (struct db_descriptor *) d;
+                db->control = cpu_to_le16(DESCRIPTOR_STATUS |
+                                          DESCRIPTOR_BRANCH_ALWAYS |
+                                          DESCRIPTOR_WAIT);
+                db->first_size = cpu_to_le16(ctx->base.header_size + 4);
+                context_append(&ctx->context, d, 2, 0);
+        }
+
+        p = packet;
+        z = 2;
+
+        /*
+         * The OHCI controller puts the status word in the header
+         * buffer too, so we need 4 extra bytes per packet.
+         */
+        packet_count = p->header_length / ctx->base.header_size;
+        header_size = packet_count * (ctx->base.header_size + 4);
+
+        /* Get header size in number of descriptors. */
+        header_z = DIV_ROUND_UP(header_size, sizeof(*d));
+        page     = payload >> PAGE_SHIFT;
+        offset   = payload & ~PAGE_MASK;
+        rest     = p->payload_length;
+
+        /* FIXME: OHCI 1.0 doesn't support dual buffer receive */
+        /* FIXME: make packet-per-buffer/dual-buffer a context option */
+        while (rest > 0) {
+                d = context_get_descriptors(&ctx->context,
+                                            z + header_z, &d_bus);
+                if (d == NULL)
+                        return -ENOMEM;
+
+                db = (struct db_descriptor *) d;
+                db->control = cpu_to_le16(DESCRIPTOR_STATUS |
+                                          DESCRIPTOR_BRANCH_ALWAYS);
+                db->first_size = cpu_to_le16(ctx->base.header_size + 4);
+                db->first_req_count = cpu_to_le16(header_size);
+                db->first_res_count = db->first_req_count;
+                db->first_buffer = cpu_to_le32(d_bus + sizeof(*db));
+
+                if (offset + rest < PAGE_SIZE)
+                        length = rest;
+                else
+                        length = PAGE_SIZE - offset;
+
+                db->second_req_count = cpu_to_le16(length);
+                db->second_res_count = db->second_req_count;
+                page_bus = page_private(buffer->pages[page]);
+                db->second_buffer = cpu_to_le32(page_bus + offset);
+
+                if (p->interrupt && length == rest)
+                        db->control |= cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS);
+
+                context_append(&ctx->context, d, z, header_z);
+                offset = (offset + length) & ~PAGE_MASK;
+                rest -= length;
+                page++;
+        }
+
+        return 0;
+}
+
+static int
+ohci_queue_iso(struct fw_iso_context *base,
+               struct fw_iso_packet *packet,
+               struct fw_iso_buffer *buffer,
+               unsigned long payload)
+{
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+
+        if (base->type == FW_ISO_CONTEXT_TRANSMIT)
+                return ohci_queue_iso_transmit(base, packet, buffer, payload);
+        else if (ctx->context.ohci->version >= OHCI_VERSION_1_1)
+                return ohci_queue_iso_receive_dualbuffer(base, packet,
+                                                         buffer, payload);
+        else
+                /* FIXME: Implement fallback for OHCI 1.0 controllers. */
+                return -EINVAL;
+}
+
+static const struct fw_card_driver ohci_driver = {
+        .name                   = ohci_driver_name,
+        .enable                 = ohci_enable,
+        .update_phy_reg         = ohci_update_phy_reg,
+        .set_config_rom         = ohci_set_config_rom,
+        .send_request           = ohci_send_request,
+        .send_response          = ohci_send_response,
+        .cancel_packet          = ohci_cancel_packet,
+        .enable_phys_dma        = ohci_enable_phys_dma,
+        .get_bus_time           = ohci_get_bus_time,
+
+        .allocate_iso_context   = ohci_allocate_iso_context,
+        .free_iso_context       = ohci_free_iso_context,
+        .queue_iso              = ohci_queue_iso,
+        .start_iso              = ohci_start_iso,
+        .stop_iso               = ohci_stop_iso,
+};
+
+static int software_reset(struct fw_ohci *ohci)
+{
+        int i;
+
+        reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_softReset);
+
+        for (i = 0; i < OHCI_LOOP_COUNT; i++) {
+                if ((reg_read(ohci, OHCI1394_HCControlSet) &
+                     OHCI1394_HCControl_softReset) == 0)
+                        return 0;
+                msleep(1);
+        }
+
+        return -EBUSY;
+}
+
+static int __devinit
+pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+{
+        struct fw_ohci *ohci;
+        u32 bus_options, max_receive, link_speed;
+        u64 guid;
+        int err;
+        size_t size;
+
+        ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
+        if (ohci == NULL) {
+                fw_error("Could not malloc fw_ohci data.\n");
+                return -ENOMEM;
+        }
+
+        fw_card_initialize(&ohci->card, &ohci_driver, &dev->dev);
+
+        err = pci_enable_device(dev);
+        if (err) {
+                fw_error("Failed to enable OHCI hardware.\n");
+                goto fail_put_card;
+        }
+
+        pci_set_master(dev);
+        pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0);
+        pci_set_drvdata(dev, ohci);
+
+        spin_lock_init(&ohci->lock);
+
+        tasklet_init(&ohci->bus_reset_tasklet,
+                     bus_reset_tasklet, (unsigned long)ohci);
+
+        err = pci_request_region(dev, 0, ohci_driver_name);
+        if (err) {
+                fw_error("MMIO resource unavailable\n");
+                goto fail_disable;
+        }
+
+        ohci->registers = pci_iomap(dev, 0, OHCI1394_REGISTER_SIZE);
+        if (ohci->registers == NULL) {
+                fw_error("Failed to remap registers\n");
+                err = -ENXIO;
+                goto fail_iomem;
+        }
+
+        if (software_reset(ohci)) {
+                fw_error("Failed to reset ohci card.\n");
+                err = -EBUSY;
+                goto fail_registers;
+        }
+
+        /*
+         * Now enable LPS, which we need in order to start accessing
+         * most of the registers.  In fact, on some cards (ALI M5251),
+         * accessing registers in the SClk domain without LPS enabled
+         * will lock up the machine.  Wait 50msec to make sure we have
+         * full link enabled.
+         */
+        reg_write(ohci, OHCI1394_HCControlSet,
+                  OHCI1394_HCControl_LPS |
+                  OHCI1394_HCControl_postedWriteEnable);
+        flush_writes(ohci);
+        msleep(50);
+
+        reg_write(ohci, OHCI1394_HCControlClear,
+                  OHCI1394_HCControl_noByteSwapData);
+
+        reg_write(ohci, OHCI1394_LinkControlSet,
+                  OHCI1394_LinkControl_rcvSelfID |
+                  OHCI1394_LinkControl_cycleTimerEnable |
+                  OHCI1394_LinkControl_cycleMaster);
+
+        ar_context_init(&ohci->ar_request_ctx, ohci,
+                        OHCI1394_AsReqRcvContextControlSet);
+
+        ar_context_init(&ohci->ar_response_ctx, ohci,
+                        OHCI1394_AsRspRcvContextControlSet);
+
+        context_init(&ohci->at_request_ctx, ohci, AT_BUFFER_SIZE,
+                     OHCI1394_AsReqTrContextControlSet, handle_at_packet);
+
+        context_init(&ohci->at_response_ctx, ohci, AT_BUFFER_SIZE,
+                     OHCI1394_AsRspTrContextControlSet, handle_at_packet);
+
+        reg_write(ohci, OHCI1394_ATRetries,
+                  OHCI1394_MAX_AT_REQ_RETRIES |
+                  (OHCI1394_MAX_AT_RESP_RETRIES << 4) |
+                  (OHCI1394_MAX_PHYS_RESP_RETRIES << 8));
+
+        reg_write(ohci, OHCI1394_IsoRecvIntMaskSet, ~0);
+        ohci->it_context_mask = reg_read(ohci, OHCI1394_IsoRecvIntMaskSet);
+        reg_write(ohci, OHCI1394_IsoRecvIntMaskClear, ~0);
+        size = sizeof(struct iso_context) * hweight32(ohci->it_context_mask);
+        ohci->it_context_list = kzalloc(size, GFP_KERNEL);
+
+        reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);
+        ohci->ir_context_mask = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);
+        reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);
+        size = sizeof(struct iso_context) * hweight32(ohci->ir_context_mask);
+        ohci->ir_context_list = kzalloc(size, GFP_KERNEL);
+
+        if (ohci->it_context_list == NULL || ohci->ir_context_list == NULL) {
+                fw_error("Out of memory for it/ir contexts.\n");
+                err = -ENOMEM;
+                goto fail_registers;
+        }
+
+        /* self-id dma buffer allocation */
+        ohci->self_id_cpu = dma_alloc_coherent(ohci->card.device,
+                                               SELF_ID_BUF_SIZE,
+                                               &ohci->self_id_bus,
+                                               GFP_KERNEL);
+        if (ohci->self_id_cpu == NULL) {
+                fw_error("Out of memory for self ID buffer.\n");
+                err = -ENOMEM;
+                goto fail_registers;
+        }
+
+        reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus);
+        reg_write(ohci, OHCI1394_PhyUpperBound, 0x00010000);
+        reg_write(ohci, OHCI1394_IntEventClear, ~0);
+        reg_write(ohci, OHCI1394_IntMaskClear, ~0);
+        reg_write(ohci, OHCI1394_IntMaskSet,
+                  OHCI1394_selfIDComplete |
+                  OHCI1394_RQPkt | OHCI1394_RSPkt |
+                  OHCI1394_reqTxComplete | OHCI1394_respTxComplete |
+                  OHCI1394_isochRx | OHCI1394_isochTx |
+                  OHCI1394_masterIntEnable |
+                  OHCI1394_cycle64Seconds);
+
+        bus_options = reg_read(ohci, OHCI1394_BusOptions);
+        max_receive = (bus_options >> 12) & 0xf;
+        link_speed = bus_options & 0x7;
+        guid = ((u64) reg_read(ohci, OHCI1394_GUIDHi) << 32) |
+                reg_read(ohci, OHCI1394_GUIDLo);
+
+        err = fw_card_add(&ohci->card, max_receive, link_speed, guid);
+        if (err < 0)
+                goto fail_self_id;
+
+        ohci->version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
+        fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
+                  dev->dev.bus_id, ohci->version >> 16, ohci->version & 0xff);
+
+        return 0;
+
+ fail_self_id:
+        dma_free_coherent(ohci->card.device, SELF_ID_BUF_SIZE,
+                          ohci->self_id_cpu, ohci->self_id_bus);
+ fail_registers:
+        kfree(ohci->it_context_list);
+        kfree(ohci->ir_context_list);
+        pci_iounmap(dev, ohci->registers);
+ fail_iomem:
+        pci_release_region(dev, 0);
+ fail_disable:
+        pci_disable_device(dev);
+ fail_put_card:
+        fw_card_put(&ohci->card);
+
+        return err;
+}
+
+static void pci_remove(struct pci_dev *dev)
+{
+        struct fw_ohci *ohci;
+
+        ohci = pci_get_drvdata(dev);
+        reg_write(ohci, OHCI1394_IntMaskClear, ~0);
+        flush_writes(ohci);
+        fw_core_remove_card(&ohci->card);
+
+        /*
+         * FIXME: Fail all pending packets here, now that the upper
+         * layers can't queue any more.
+         */
+
+        software_reset(ohci);
+        free_irq(dev->irq, ohci);
+        dma_free_coherent(ohci->card.device, SELF_ID_BUF_SIZE,
+                          ohci->self_id_cpu, ohci->self_id_bus);
+        kfree(ohci->it_context_list);
+        kfree(ohci->ir_context_list);
+        pci_iounmap(dev, ohci->registers);
+        pci_release_region(dev, 0);
+        pci_disable_device(dev);
+        fw_card_put(&ohci->card);
+
+        fw_notify("Removed fw-ohci device.\n");
+}
+
+static struct pci_device_id pci_table[] = {
+        { PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_FIREWIRE_OHCI, ~0) },
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, pci_table);
+
+static struct pci_driver fw_ohci_pci_driver = {
+        .name           = ohci_driver_name,
+        .id_table       = pci_table,
+        .probe          = pci_probe,
+        .remove         = pci_remove,
+};
+
+MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
+MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");
+MODULE_LICENSE("GPL");
+
+/* Provide a module alias so root-on-sbp2 initrds don't break. */
+#ifndef CONFIG_IEEE1394_OHCI1394_MODULE
+MODULE_ALIAS("ohci1394");
+#endif
+
+static int __init fw_ohci_init(void)
+{
+        return pci_register_driver(&fw_ohci_pci_driver);
+}
+
+static void __exit fw_ohci_cleanup(void)
+{
+        pci_unregister_driver(&fw_ohci_pci_driver);
+}
+
+module_init(fw_ohci_init);
+module_exit(fw_ohci_cleanup);
diff --git a/drivers/firewire/fw-ohci.h b/drivers/firewire/fw-ohci.h
new file mode 100644
index 000000000000..fa15706397d7
--- /dev/null
+++ b/drivers/firewire/fw-ohci.h
@@ -0,0 +1,153 @@
+#ifndef __fw_ohci_h
+#define __fw_ohci_h
+
+/* OHCI register map */
+
+#define OHCI1394_Version                      0x000
+#define OHCI1394_GUID_ROM                     0x004
+#define OHCI1394_ATRetries                    0x008
+#define OHCI1394_CSRData                      0x00C
+#define OHCI1394_CSRCompareData               0x010
+#define OHCI1394_CSRControl                   0x014
+#define OHCI1394_ConfigROMhdr                 0x018
+#define OHCI1394_BusID                        0x01C
+#define OHCI1394_BusOptions                   0x020
+#define OHCI1394_GUIDHi                       0x024
+#define OHCI1394_GUIDLo                       0x028
+#define OHCI1394_ConfigROMmap                 0x034
+#define OHCI1394_PostedWriteAddressLo         0x038
+#define OHCI1394_PostedWriteAddressHi         0x03C
+#define OHCI1394_VendorID                     0x040
+#define OHCI1394_HCControlSet                 0x050
+#define OHCI1394_HCControlClear               0x054
+#define  OHCI1394_HCControl_BIBimageValid       0x80000000
+#define  OHCI1394_HCControl_noByteSwapData      0x40000000
+#define  OHCI1394_HCControl_programPhyEnable    0x00800000
+#define  OHCI1394_HCControl_aPhyEnhanceEnable   0x00400000
+#define  OHCI1394_HCControl_LPS                 0x00080000
+#define  OHCI1394_HCControl_postedWriteEnable   0x00040000
+#define  OHCI1394_HCControl_linkEnable          0x00020000
+#define  OHCI1394_HCControl_softReset           0x00010000
+#define OHCI1394_SelfIDBuffer                 0x064
+#define OHCI1394_SelfIDCount                  0x068
+#define OHCI1394_IRMultiChanMaskHiSet         0x070
+#define OHCI1394_IRMultiChanMaskHiClear       0x074
+#define OHCI1394_IRMultiChanMaskLoSet         0x078
+#define OHCI1394_IRMultiChanMaskLoClear       0x07C
+#define OHCI1394_IntEventSet                  0x080
+#define OHCI1394_IntEventClear                0x084
+#define OHCI1394_IntMaskSet                   0x088
+#define OHCI1394_IntMaskClear                 0x08C
+#define OHCI1394_IsoXmitIntEventSet           0x090
+#define OHCI1394_IsoXmitIntEventClear         0x094
+#define OHCI1394_IsoXmitIntMaskSet            0x098
+#define OHCI1394_IsoXmitIntMaskClear          0x09C
+#define OHCI1394_IsoRecvIntEventSet           0x0A0
+#define OHCI1394_IsoRecvIntEventClear         0x0A4
+#define OHCI1394_IsoRecvIntMaskSet            0x0A8
+#define OHCI1394_IsoRecvIntMaskClear          0x0AC
+#define OHCI1394_InitialBandwidthAvailable    0x0B0
+#define OHCI1394_InitialChannelsAvailableHi   0x0B4
+#define OHCI1394_InitialChannelsAvailableLo   0x0B8
+#define OHCI1394_FairnessControl              0x0DC
+#define OHCI1394_LinkControlSet               0x0E0
+#define OHCI1394_LinkControlClear             0x0E4
+#define   OHCI1394_LinkControl_rcvSelfID        (1 << 9)
+#define   OHCI1394_LinkControl_rcvPhyPkt        (1 << 10)
+#define   OHCI1394_LinkControl_cycleTimerEnable (1 << 20)
+#define   OHCI1394_LinkControl_cycleMaster      (1 << 21)
+#define   OHCI1394_LinkControl_cycleSource      (1 << 22)
+#define OHCI1394_NodeID                       0x0E8
+#define   OHCI1394_NodeID_idValid             0x80000000
+#define OHCI1394_PhyControl                   0x0EC
+#define   OHCI1394_PhyControl_Read(addr)        (((addr) << 8) | 0x00008000)
+#define   OHCI1394_PhyControl_ReadDone          0x80000000
+#define   OHCI1394_PhyControl_ReadData(r)       (((r) & 0x00ff0000) >> 16)
+#define   OHCI1394_PhyControl_Write(addr, data) (((addr) << 8) | (data) | 0x00004000)
+#define   OHCI1394_PhyControl_WriteDone         0x00004000
+#define OHCI1394_IsochronousCycleTimer        0x0F0
+#define OHCI1394_AsReqFilterHiSet             0x100
+#define OHCI1394_AsReqFilterHiClear           0x104
+#define OHCI1394_AsReqFilterLoSet             0x108
+#define OHCI1394_AsReqFilterLoClear           0x10C
+#define OHCI1394_PhyReqFilterHiSet            0x110
+#define OHCI1394_PhyReqFilterHiClear          0x114
+#define OHCI1394_PhyReqFilterLoSet            0x118
+#define OHCI1394_PhyReqFilterLoClear          0x11C
+#define OHCI1394_PhyUpperBound                0x120
+
+#define OHCI1394_AsReqTrContextBase           0x180
+#define OHCI1394_AsReqTrContextControlSet     0x180
+#define OHCI1394_AsReqTrContextControlClear   0x184
+#define OHCI1394_AsReqTrCommandPtr            0x18C
+
+#define OHCI1394_AsRspTrContextBase           0x1A0
+#define OHCI1394_AsRspTrContextControlSet     0x1A0
+#define OHCI1394_AsRspTrContextControlClear   0x1A4
+#define OHCI1394_AsRspTrCommandPtr            0x1AC
+
+#define OHCI1394_AsReqRcvContextBase          0x1C0
+#define OHCI1394_AsReqRcvContextControlSet    0x1C0
+#define OHCI1394_AsReqRcvContextControlClear  0x1C4
+#define OHCI1394_AsReqRcvCommandPtr           0x1CC
+
+#define OHCI1394_AsRspRcvContextBase          0x1E0
+#define OHCI1394_AsRspRcvContextControlSet    0x1E0
+#define OHCI1394_AsRspRcvContextControlClear  0x1E4
+#define OHCI1394_AsRspRcvCommandPtr           0x1EC
+
+/* Isochronous transmit registers */
+#define OHCI1394_IsoXmitContextBase(n)           (0x200 + 16 * (n))
+#define OHCI1394_IsoXmitContextControlSet(n)     (0x200 + 16 * (n))
+#define OHCI1394_IsoXmitContextControlClear(n)   (0x204 + 16 * (n))
+#define OHCI1394_IsoXmitCommandPtr(n)            (0x20C + 16 * (n))
+
+/* Isochronous receive registers */
+#define OHCI1394_IsoRcvContextBase(n)         (0x400 + 32 * (n))
+#define OHCI1394_IsoRcvContextControlSet(n)   (0x400 + 32 * (n))
+#define OHCI1394_IsoRcvContextControlClear(n) (0x404 + 32 * (n))
+#define OHCI1394_IsoRcvCommandPtr(n)          (0x40C + 32 * (n))
+#define OHCI1394_IsoRcvContextMatch(n)        (0x410 + 32 * (n))
+
+/* Interrupts Mask/Events */
+#define OHCI1394_reqTxComplete          0x00000001
+#define OHCI1394_respTxComplete         0x00000002
+#define OHCI1394_ARRQ                   0x00000004
+#define OHCI1394_ARRS                   0x00000008
+#define OHCI1394_RQPkt                  0x00000010
+#define OHCI1394_RSPkt                  0x00000020
+#define OHCI1394_isochTx                0x00000040
+#define OHCI1394_isochRx                0x00000080
+#define OHCI1394_postedWriteErr         0x00000100
+#define OHCI1394_lockRespErr            0x00000200
+#define OHCI1394_selfIDComplete         0x00010000
+#define OHCI1394_busReset               0x00020000
+#define OHCI1394_phy                    0x00080000
+#define OHCI1394_cycleSynch             0x00100000
+#define OHCI1394_cycle64Seconds         0x00200000
+#define OHCI1394_cycleLost              0x00400000
+#define OHCI1394_cycleInconsistent      0x00800000
+#define OHCI1394_unrecoverableError     0x01000000
+#define OHCI1394_cycleTooLong           0x02000000
+#define OHCI1394_phyRegRcvd             0x04000000
+#define OHCI1394_masterIntEnable        0x80000000
+
+#define OHCI1394_evt_no_status          0x0
+#define OHCI1394_evt_long_packet        0x2
+#define OHCI1394_evt_missing_ack        0x3
+#define OHCI1394_evt_underrun           0x4
+#define OHCI1394_evt_overrun            0x5
+#define OHCI1394_evt_descriptor_read    0x6
+#define OHCI1394_evt_data_read          0x7
+#define OHCI1394_evt_data_write         0x8
+#define OHCI1394_evt_bus_reset          0x9
+#define OHCI1394_evt_timeout            0xa
+#define OHCI1394_evt_tcode_err          0xb
+#define OHCI1394_evt_reserved_b         0xc
+#define OHCI1394_evt_reserved_c         0xd
+#define OHCI1394_evt_unknown            0xe
+#define OHCI1394_evt_flushed            0xf
+
+#define OHCI1394_phy_tcode              0xe
+
+#endif /* __fw_ohci_h */
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
new file mode 100644
index 000000000000..68300414e5f4
--- /dev/null
+++ b/drivers/firewire/fw-sbp2.c
@@ -0,0 +1,1147 @@
+/*
+ * SBP2 driver (SCSI over IEEE1394)
+ *
+ * Copyright (C) 2005-2007  Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * 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.
+ */
+
+/*
+ * The basic structure of this driver is based on the old storage driver,
+ * drivers/ieee1394/sbp2.c, originally written by
+ *     James Goodwin <jamesg@filanet.com>
+ * with later contributions and ongoing maintenance from
+ *     Ben Collins <bcollins@debian.org>,
+ *     Stefan Richter <stefanr@s5r6.in-berlin.de>
+ * and many others.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/device.h>
+#include <linux/scatterlist.h>
+#include <linux/dma-mapping.h>
+#include <linux/timer.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+
+#include "fw-transaction.h"
+#include "fw-topology.h"
+#include "fw-device.h"
+
+/* I don't know why the SCSI stack doesn't define something like this... */
+typedef void (*scsi_done_fn_t)(struct scsi_cmnd *);
+
+static const char sbp2_driver_name[] = "sbp2";
+
+struct sbp2_device {
+        struct kref kref;
+        struct fw_unit *unit;
+        struct fw_address_handler address_handler;
+        struct list_head orb_list;
+        u64 management_agent_address;
+        u64 command_block_agent_address;
+        u32 workarounds;
+        int login_id;
+
+        /*
+         * We cache these addresses and only update them once we've
+         * logged in or reconnected to the sbp2 device.  That way, any
+         * IO to the device will automatically fail and get retried if
+         * it happens in a window where the device is not ready to
+         * handle it (e.g. after a bus reset but before we reconnect).
+         */
+        int node_id;
+        int address_high;
+        int generation;
+
+        int retries;
+        struct delayed_work work;
+};
+
+#define SBP2_MAX_SG_ELEMENT_LENGTH      0xf000
+#define SBP2_MAX_SECTORS                255     /* Max sectors supported */
+#define SBP2_ORB_TIMEOUT                2000    /* Timeout in ms */
+
+#define SBP2_ORB_NULL                   0x80000000
+
+#define SBP2_DIRECTION_TO_MEDIA         0x0
+#define SBP2_DIRECTION_FROM_MEDIA       0x1
+
+/* Unit directory keys */
+#define SBP2_COMMAND_SET_SPECIFIER      0x38
+#define SBP2_COMMAND_SET                0x39
+#define SBP2_COMMAND_SET_REVISION       0x3b
+#define SBP2_FIRMWARE_REVISION          0x3c
+
+/* Flags for detected oddities and brokeness */
+#define SBP2_WORKAROUND_128K_MAX_TRANS  0x1
+#define SBP2_WORKAROUND_INQUIRY_36      0x2
+#define SBP2_WORKAROUND_MODE_SENSE_8    0x4
+#define SBP2_WORKAROUND_FIX_CAPACITY    0x8
+#define SBP2_WORKAROUND_OVERRIDE        0x100
+
+/* Management orb opcodes */
+#define SBP2_LOGIN_REQUEST              0x0
+#define SBP2_QUERY_LOGINS_REQUEST       0x1
+#define SBP2_RECONNECT_REQUEST          0x3
+#define SBP2_SET_PASSWORD_REQUEST       0x4
+#define SBP2_LOGOUT_REQUEST             0x7
+#define SBP2_ABORT_TASK_REQUEST         0xb
+#define SBP2_ABORT_TASK_SET             0xc
+#define SBP2_LOGICAL_UNIT_RESET         0xe
+#define SBP2_TARGET_RESET_REQUEST       0xf
+
+/* Offsets for command block agent registers */
+#define SBP2_AGENT_STATE                0x00
+#define SBP2_AGENT_RESET                0x04
+#define SBP2_ORB_POINTER                0x08
+#define SBP2_DOORBELL                   0x10
+#define SBP2_UNSOLICITED_STATUS_ENABLE  0x14
+
+/* Status write response codes */
+#define SBP2_STATUS_REQUEST_COMPLETE    0x0
+#define SBP2_STATUS_TRANSPORT_FAILURE   0x1
+#define SBP2_STATUS_ILLEGAL_REQUEST     0x2
+#define SBP2_STATUS_VENDOR_DEPENDENT    0x3
+
+#define STATUS_GET_ORB_HIGH(v)          ((v).status & 0xffff)
+#define STATUS_GET_SBP_STATUS(v)        (((v).status >> 16) & 0xff)
+#define STATUS_GET_LEN(v)               (((v).status >> 24) & 0x07)
+#define STATUS_GET_DEAD(v)              (((v).status >> 27) & 0x01)
+#define STATUS_GET_RESPONSE(v)          (((v).status >> 28) & 0x03)
+#define STATUS_GET_SOURCE(v)            (((v).status >> 30) & 0x03)
+#define STATUS_GET_ORB_LOW(v)           ((v).orb_low)
+#define STATUS_GET_DATA(v)              ((v).data)
+
+struct sbp2_status {
+        u32 status;
+        u32 orb_low;
+        u8 data[24];
+};
+
+struct sbp2_pointer {
+        u32 high;
+        u32 low;
+};
+
+struct sbp2_orb {
+        struct fw_transaction t;
+        dma_addr_t request_bus;
+        int rcode;
+        struct sbp2_pointer pointer;
+        void (*callback)(struct sbp2_orb * orb, struct sbp2_status * status);
+        struct list_head link;
+};
+
+#define MANAGEMENT_ORB_LUN(v)                   ((v))
+#define MANAGEMENT_ORB_FUNCTION(v)              ((v) << 16)
+#define MANAGEMENT_ORB_RECONNECT(v)             ((v) << 20)
+#define MANAGEMENT_ORB_EXCLUSIVE                ((1) << 28)
+#define MANAGEMENT_ORB_REQUEST_FORMAT(v)        ((v) << 29)
+#define MANAGEMENT_ORB_NOTIFY                   ((1) << 31)
+
+#define MANAGEMENT_ORB_RESPONSE_LENGTH(v)       ((v))
+#define MANAGEMENT_ORB_PASSWORD_LENGTH(v)       ((v) << 16)
+
+struct sbp2_management_orb {
+        struct sbp2_orb base;
+        struct {
+                struct sbp2_pointer password;
+                struct sbp2_pointer response;
+                u32 misc;
+                u32 length;
+                struct sbp2_pointer status_fifo;
+        } request;
+        __be32 response[4];
+        dma_addr_t response_bus;
+        struct completion done;
+        struct sbp2_status status;
+};
+
+#define LOGIN_RESPONSE_GET_LOGIN_ID(v)  ((v).misc & 0xffff)
+#define LOGIN_RESPONSE_GET_LENGTH(v)    (((v).misc >> 16) & 0xffff)
+
+struct sbp2_login_response {
+        u32 misc;
+        struct sbp2_pointer command_block_agent;
+        u32 reconnect_hold;
+};
+#define COMMAND_ORB_DATA_SIZE(v)        ((v))
+#define COMMAND_ORB_PAGE_SIZE(v)        ((v) << 16)
+#define COMMAND_ORB_PAGE_TABLE_PRESENT  ((1) << 19)
+#define COMMAND_ORB_MAX_PAYLOAD(v)      ((v) << 20)
+#define COMMAND_ORB_SPEED(v)            ((v) << 24)
+#define COMMAND_ORB_DIRECTION(v)        ((v) << 27)
+#define COMMAND_ORB_REQUEST_FORMAT(v)   ((v) << 29)
+#define COMMAND_ORB_NOTIFY              ((1) << 31)
+
+struct sbp2_command_orb {
+        struct sbp2_orb base;
+        struct {
+                struct sbp2_pointer next;
+                struct sbp2_pointer data_descriptor;
+                u32 misc;
+                u8 command_block[12];
+        } request;
+        struct scsi_cmnd *cmd;
+        scsi_done_fn_t done;
+        struct fw_unit *unit;
+
+        struct sbp2_pointer page_table[SG_ALL];
+        dma_addr_t page_table_bus;
+        dma_addr_t request_buffer_bus;
+};
+
+/*
+ * List of devices with known bugs.
+ *
+ * The firmware_revision field, masked with 0xffff00, is the best
+ * indicator for the type of bridge chip of a device.  It yields a few
+ * false positives but this did not break correctly behaving devices
+ * so far.  We use ~0 as a wildcard, since the 24 bit values we get
+ * from the config rom can never match that.
+ */
+static const struct {
+        u32 firmware_revision;
+        u32 model;
+        unsigned workarounds;
+} sbp2_workarounds_table[] = {
+        /* DViCO Momobay CX-1 with TSB42AA9 bridge */ {
+                .firmware_revision      = 0x002800,
+                .model                  = 0x001010,
+                .workarounds            = SBP2_WORKAROUND_INQUIRY_36 |
+                                          SBP2_WORKAROUND_MODE_SENSE_8,
+        },
+        /* Initio bridges, actually only needed for some older ones */ {
+                .firmware_revision      = 0x000200,
+                .model                  = ~0,
+                .workarounds            = SBP2_WORKAROUND_INQUIRY_36,
+        },
+        /* Symbios bridge */ {
+                .firmware_revision      = 0xa0b800,
+                .model                  = ~0,
+                .workarounds            = SBP2_WORKAROUND_128K_MAX_TRANS,
+        },
+
+        /*
+         * There are iPods (2nd gen, 3rd gen) with model_id == 0, but
+         * these iPods do not feature the read_capacity bug according
+         * to one report.  Read_capacity behaviour as well as model_id
+         * could change due to Apple-supplied firmware updates though.
+         */
+
+        /* iPod 4th generation. */ {
+                .firmware_revision      = 0x0a2700,
+                .model                  = 0x000021,
+                .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+        },
+        /* iPod mini */ {
+                .firmware_revision      = 0x0a2700,
+                .model                  = 0x000023,
+                .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+        },
+        /* iPod Photo */ {
+                .firmware_revision      = 0x0a2700,
+                .model                  = 0x00007e,
+                .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+        }
+};
+
+static void
+sbp2_status_write(struct fw_card *card, struct fw_request *request,
+                  int tcode, int destination, int source,
+                  int generation, int speed,
+                  unsigned long long offset,
+                  void *payload, size_t length, void *callback_data)
+{
+        struct sbp2_device *sd = callback_data;
+        struct sbp2_orb *orb;
+        struct sbp2_status status;
+        size_t header_size;
+        unsigned long flags;
+
+        if (tcode != TCODE_WRITE_BLOCK_REQUEST ||
+            length == 0 || length > sizeof(status)) {
+                fw_send_response(card, request, RCODE_TYPE_ERROR);
+                return;
+        }
+
+        header_size = min(length, 2 * sizeof(u32));
+        fw_memcpy_from_be32(&status, payload, header_size);
+        if (length > header_size)
+                memcpy(status.data, payload + 8, length - header_size);
+        if (STATUS_GET_SOURCE(status) == 2 || STATUS_GET_SOURCE(status) == 3) {
+                fw_notify("non-orb related status write, not handled\n");
+                fw_send_response(card, request, RCODE_COMPLETE);
+                return;
+        }
+
+        /* Lookup the orb corresponding to this status write. */
+        spin_lock_irqsave(&card->lock, flags);
+        list_for_each_entry(orb, &sd->orb_list, link) {
+                if (STATUS_GET_ORB_HIGH(status) == 0 &&
+                    STATUS_GET_ORB_LOW(status) == orb->request_bus &&
+                    orb->rcode == RCODE_COMPLETE) {
+                        list_del(&orb->link);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        if (&orb->link != &sd->orb_list)
+                orb->callback(orb, &status);
+        else
+                fw_error("status write for unknown orb\n");
+
+        fw_send_response(card, request, RCODE_COMPLETE);
+}
+
+static void
+complete_transaction(struct fw_card *card, int rcode,
+                     void *payload, size_t length, void *data)
+{
+        struct sbp2_orb *orb = data;
+        unsigned long flags;
+
+        orb->rcode = rcode;
+        if (rcode != RCODE_COMPLETE) {
+                spin_lock_irqsave(&card->lock, flags);
+                list_del(&orb->link);
+                spin_unlock_irqrestore(&card->lock, flags);
+                orb->callback(orb, NULL);
+        }
+}
+
+static void
+sbp2_send_orb(struct sbp2_orb *orb, struct fw_unit *unit,
+              int node_id, int generation, u64 offset)
+{
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_device *sd = unit->device.driver_data;
+        unsigned long flags;
+
+        orb->pointer.high = 0;
+        orb->pointer.low = orb->request_bus;
+        fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof(orb->pointer));
+
+        spin_lock_irqsave(&device->card->lock, flags);
+        list_add_tail(&orb->link, &sd->orb_list);
+        spin_unlock_irqrestore(&device->card->lock, flags);
+
+        fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST,
+                        node_id, generation,
+                        device->node->max_speed, offset,
+                        &orb->pointer, sizeof(orb->pointer),
+                        complete_transaction, orb);
+}
+
+static int sbp2_cancel_orbs(struct fw_unit *unit)
+{
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_device *sd = unit->device.driver_data;
+        struct sbp2_orb *orb, *next;
+        struct list_head list;
+        unsigned long flags;
+        int retval = -ENOENT;
+
+        INIT_LIST_HEAD(&list);
+        spin_lock_irqsave(&device->card->lock, flags);
+        list_splice_init(&sd->orb_list, &list);
+        spin_unlock_irqrestore(&device->card->lock, flags);
+
+        list_for_each_entry_safe(orb, next, &list, link) {
+                retval = 0;
+                if (fw_cancel_transaction(device->card, &orb->t) == 0)
+                        continue;
+
+                orb->rcode = RCODE_CANCELLED;
+                orb->callback(orb, NULL);
+        }
+
+        return retval;
+}
+
+static void
+complete_management_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
+{
+        struct sbp2_management_orb *orb =
+            (struct sbp2_management_orb *)base_orb;
+
+        if (status)
+                memcpy(&orb->status, status, sizeof(*status));
+        complete(&orb->done);
+}
+
+static int
+sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
+                         int function, int lun, void *response)
+{
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_device *sd = unit->device.driver_data;
+        struct sbp2_management_orb *orb;
+        int retval = -ENOMEM;
+
+        orb = kzalloc(sizeof(*orb), GFP_ATOMIC);
+        if (orb == NULL)
+                return -ENOMEM;
+
+        /*
+         * The sbp2 device is going to send a block read request to
+         * read out the request from host memory, so map it for dma.
+         */
+        orb->base.request_bus =
+                dma_map_single(device->card->device, &orb->request,
+                               sizeof(orb->request), DMA_TO_DEVICE);
+        if (dma_mapping_error(orb->base.request_bus))
+                goto out;
+
+        orb->response_bus =
+                dma_map_single(device->card->device, &orb->response,
+                               sizeof(orb->response), DMA_FROM_DEVICE);
+        if (dma_mapping_error(orb->response_bus))
+                goto out;
+
+        orb->request.response.high    = 0;
+        orb->request.response.low     = orb->response_bus;
+
+        orb->request.misc =
+                MANAGEMENT_ORB_NOTIFY |
+                MANAGEMENT_ORB_FUNCTION(function) |
+                MANAGEMENT_ORB_LUN(lun);
+        orb->request.length =
+                MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response));
+
+        orb->request.status_fifo.high = sd->address_handler.offset >> 32;
+        orb->request.status_fifo.low  = sd->address_handler.offset;
+
+        /*
+         * FIXME: Yeah, ok this isn't elegant, we hardwire exclusive
+         * login and 1 second reconnect time.  The reconnect setting
+         * is probably fine, but the exclusive login should be an option.
+         */
+        if (function == SBP2_LOGIN_REQUEST) {
+                orb->request.misc |=
+                        MANAGEMENT_ORB_EXCLUSIVE |
+                        MANAGEMENT_ORB_RECONNECT(0);
+        }
+
+        fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request));
+
+        init_completion(&orb->done);
+        orb->base.callback = complete_management_orb;
+
+        sbp2_send_orb(&orb->base, unit,
+                      node_id, generation, sd->management_agent_address);
+
+        wait_for_completion_timeout(&orb->done,
+                                    msecs_to_jiffies(SBP2_ORB_TIMEOUT));
+
+        retval = -EIO;
+        if (sbp2_cancel_orbs(unit) == 0) {
+                fw_error("orb reply timed out, rcode=0x%02x\n",
+                         orb->base.rcode);
+                goto out;
+        }
+
+        if (orb->base.rcode != RCODE_COMPLETE) {
+                fw_error("management write failed, rcode 0x%02x\n",
+                         orb->base.rcode);
+                goto out;
+        }
+
+        if (STATUS_GET_RESPONSE(orb->status) != 0 ||
+            STATUS_GET_SBP_STATUS(orb->status) != 0) {
+                fw_error("error status: %d:%d\n",
+                         STATUS_GET_RESPONSE(orb->status),
+                         STATUS_GET_SBP_STATUS(orb->status));
+                goto out;
+        }
+
+        retval = 0;
+ out:
+        dma_unmap_single(device->card->device, orb->base.request_bus,
+                         sizeof(orb->request), DMA_TO_DEVICE);
+        dma_unmap_single(device->card->device, orb->response_bus,
+                         sizeof(orb->response), DMA_FROM_DEVICE);
+
+        if (response)
+                fw_memcpy_from_be32(response,
+                                    orb->response, sizeof(orb->response));
+        kfree(orb);
+
+        return retval;
+}
+
+static void
+complete_agent_reset_write(struct fw_card *card, int rcode,
+                           void *payload, size_t length, void *data)
+{
+        struct fw_transaction *t = data;
+
+        kfree(t);
+}
+
+static int sbp2_agent_reset(struct fw_unit *unit)
+{
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_device *sd = unit->device.driver_data;
+        struct fw_transaction *t;
+        static u32 zero;
+
+        t = kzalloc(sizeof(*t), GFP_ATOMIC);
+        if (t == NULL)
+                return -ENOMEM;
+
+        fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST,
+                        sd->node_id, sd->generation, SCODE_400,
+                        sd->command_block_agent_address + SBP2_AGENT_RESET,
+                        &zero, sizeof(zero), complete_agent_reset_write, t);
+
+        return 0;
+}
+
+static void sbp2_reconnect(struct work_struct *work);
+static struct scsi_host_template scsi_driver_template;
+
+static void
+release_sbp2_device(struct kref *kref)
+{
+        struct sbp2_device *sd = container_of(kref, struct sbp2_device, kref);
+        struct Scsi_Host *host =
+                container_of((void *)sd, struct Scsi_Host, hostdata[0]);
+
+        sbp2_send_management_orb(sd->unit, sd->node_id, sd->generation,
+                                 SBP2_LOGOUT_REQUEST, sd->login_id, NULL);
+
+        scsi_remove_host(host);
+        fw_core_remove_address_handler(&sd->address_handler);
+        fw_notify("removed sbp2 unit %s\n", sd->unit->device.bus_id);
+        put_device(&sd->unit->device);
+        scsi_host_put(host);
+}
+
+static void sbp2_login(struct work_struct *work)
+{
+        struct sbp2_device *sd =
+                container_of(work, struct sbp2_device, work.work);
+        struct Scsi_Host *host =
+                container_of((void *)sd, struct Scsi_Host, hostdata[0]);
+        struct fw_unit *unit = sd->unit;
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_login_response response;
+        int generation, node_id, local_node_id, lun, retval;
+
+        /* FIXME: Make this work for multi-lun devices. */
+        lun = 0;
+
+        generation    = device->card->generation;
+        node_id       = device->node->node_id;
+        local_node_id = device->card->local_node->node_id;
+
+        if (sbp2_send_management_orb(unit, node_id, generation,
+                                     SBP2_LOGIN_REQUEST, lun, &response) < 0) {
+                if (sd->retries++ < 5) {
+                        schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5));
+                } else {
+                        fw_error("failed to login to %s\n",
+                                 unit->device.bus_id);
+                        kref_put(&sd->kref, release_sbp2_device);
+                }
+                return;
+        }
+
+        sd->generation   = generation;
+        sd->node_id      = node_id;
+        sd->address_high = local_node_id << 16;
+
+        /* Get command block agent offset and login id. */
+        sd->command_block_agent_address =
+                ((u64) (response.command_block_agent.high & 0xffff) << 32) |
+                response.command_block_agent.low;
+        sd->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response);
+
+        fw_notify("logged in to sbp2 unit %s (%d retries)\n",
+                  unit->device.bus_id, sd->retries);
+        fw_notify(" - management_agent_address:    0x%012llx\n",
+                  (unsigned long long) sd->management_agent_address);
+        fw_notify(" - command_block_agent_address: 0x%012llx\n",
+                  (unsigned long long) sd->command_block_agent_address);
+        fw_notify(" - status write address:        0x%012llx\n",
+                  (unsigned long long) sd->address_handler.offset);
+
+#if 0
+        /* FIXME: The linux1394 sbp2 does this last step. */
+        sbp2_set_busy_timeout(scsi_id);
+#endif
+
+        PREPARE_DELAYED_WORK(&sd->work, sbp2_reconnect);
+        sbp2_agent_reset(unit);
+
+        /* FIXME: Loop over luns here. */
+        lun = 0;
+        retval = scsi_add_device(host, 0, 0, lun);
+        if (retval < 0) {
+                sbp2_send_management_orb(unit, sd->node_id, sd->generation,
+                                         SBP2_LOGOUT_REQUEST, sd->login_id,
+                                         NULL);
+                /*
+                 * Set this back to sbp2_login so we fall back and
+                 * retry login on bus reset.
+                 */
+                PREPARE_DELAYED_WORK(&sd->work, sbp2_login);
+        }
+        kref_put(&sd->kref, release_sbp2_device);
+}
+
+static int sbp2_probe(struct device *dev)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_device *sd;
+        struct fw_csr_iterator ci;
+        struct Scsi_Host *host;
+        int i, key, value, err;
+        u32 model, firmware_revision;
+
+        err = -ENOMEM;
+        host = scsi_host_alloc(&scsi_driver_template, sizeof(*sd));
+        if (host == NULL)
+                goto fail;
+
+        sd = (struct sbp2_device *) host->hostdata;
+        unit->device.driver_data = sd;
+        sd->unit = unit;
+        INIT_LIST_HEAD(&sd->orb_list);
+        kref_init(&sd->kref);
+
+        sd->address_handler.length = 0x100;
+        sd->address_handler.address_callback = sbp2_status_write;
+        sd->address_handler.callback_data = sd;
+
+        err = fw_core_add_address_handler(&sd->address_handler,
+                                          &fw_high_memory_region);
+        if (err < 0)
+                goto fail_host;
+
+        err = fw_device_enable_phys_dma(device);
+        if (err < 0)
+                goto fail_address_handler;
+
+        err = scsi_add_host(host, &unit->device);
+        if (err < 0)
+                goto fail_address_handler;
+
+        /*
+         * Scan unit directory to get management agent address,
+         * firmware revison and model.  Initialize firmware_revision
+         * and model to values that wont match anything in our table.
+         */
+        firmware_revision = 0xff000000;
+        model = 0xff000000;
+        fw_csr_iterator_init(&ci, unit->directory);
+        while (fw_csr_iterator_next(&ci, &key, &value)) {
+                switch (key) {
+                case CSR_DEPENDENT_INFO | CSR_OFFSET:
+                        sd->management_agent_address =
+                                0xfffff0000000ULL + 4 * value;
+                        break;
+                case SBP2_FIRMWARE_REVISION:
+                        firmware_revision = value;
+                        break;
+                case CSR_MODEL:
+                        model = value;
+                        break;
+                }
+        }
+
+        for (i = 0; i < ARRAY_SIZE(sbp2_workarounds_table); i++) {
+                if (sbp2_workarounds_table[i].firmware_revision !=
+                    (firmware_revision & 0xffffff00))
+                        continue;
+                if (sbp2_workarounds_table[i].model != model &&
+                    sbp2_workarounds_table[i].model != ~0)
+                        continue;
+                sd->workarounds |= sbp2_workarounds_table[i].workarounds;
+                break;
+        }
+
+        if (sd->workarounds)
+                fw_notify("Workarounds for node %s: 0x%x "
+                          "(firmware_revision 0x%06x, model_id 0x%06x)\n",
+                          unit->device.bus_id,
+                          sd->workarounds, firmware_revision, model);
+
+        get_device(&unit->device);
+
+        /*
+         * We schedule work to do the login so we can easily
+         * reschedule retries. Always get the ref before scheduling
+         * work.
+         */
+        INIT_DELAYED_WORK(&sd->work, sbp2_login);
+        if (schedule_delayed_work(&sd->work, 0))
+                kref_get(&sd->kref);
+
+        return 0;
+
+ fail_address_handler:
+        fw_core_remove_address_handler(&sd->address_handler);
+ fail_host:
+        scsi_host_put(host);
+ fail:
+        return err;
+}
+
+static int sbp2_remove(struct device *dev)
+{
+        struct fw_unit *unit = fw_unit(dev);
+        struct sbp2_device *sd = unit->device.driver_data;
+
+        kref_put(&sd->kref, release_sbp2_device);
+
+        return 0;
+}
+
+static void sbp2_reconnect(struct work_struct *work)
+{
+        struct sbp2_device *sd =
+                container_of(work, struct sbp2_device, work.work);
+        struct fw_unit *unit = sd->unit;
+        struct fw_device *device = fw_device(unit->device.parent);
+        int generation, node_id, local_node_id;
+
+        generation    = device->card->generation;
+        node_id       = device->node->node_id;
+        local_node_id = device->card->local_node->node_id;
+
+        if (sbp2_send_management_orb(unit, node_id, generation,
+                                     SBP2_RECONNECT_REQUEST,
+                                     sd->login_id, NULL) < 0) {
+                if (sd->retries++ >= 5) {
+                        fw_error("failed to reconnect to %s\n",
+                                 unit->device.bus_id);
+                        /* Fall back and try to log in again. */
+                        sd->retries = 0;
+                        PREPARE_DELAYED_WORK(&sd->work, sbp2_login);
+                }
+                schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5));
+                return;
+        }
+
+        sd->generation   = generation;
+        sd->node_id      = node_id;
+        sd->address_high = local_node_id << 16;
+
+        fw_notify("reconnected to unit %s (%d retries)\n",
+                  unit->device.bus_id, sd->retries);
+        sbp2_agent_reset(unit);
+        sbp2_cancel_orbs(unit);
+        kref_put(&sd->kref, release_sbp2_device);
+}
+
+static void sbp2_update(struct fw_unit *unit)
+{
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_device *sd = unit->device.driver_data;
+
+        sd->retries = 0;
+        fw_device_enable_phys_dma(device);
+        if (schedule_delayed_work(&sd->work, 0))
+                kref_get(&sd->kref);
+}
+
+#define SBP2_UNIT_SPEC_ID_ENTRY 0x0000609e
+#define SBP2_SW_VERSION_ENTRY   0x00010483
+
+static const struct fw_device_id sbp2_id_table[] = {
+        {
+                .match_flags  = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION,
+                .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY,
+                .version      = SBP2_SW_VERSION_ENTRY,
+        },
+        { }
+};
+
+static struct fw_driver sbp2_driver = {
+        .driver   = {
+                .owner  = THIS_MODULE,
+                .name   = sbp2_driver_name,
+                .bus    = &fw_bus_type,
+                .probe  = sbp2_probe,
+                .remove = sbp2_remove,
+        },
+        .update   = sbp2_update,
+        .id_table = sbp2_id_table,
+};
+
+static unsigned int
+sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
+{
+        int sam_status;
+
+        sense_data[0] = 0x70;
+        sense_data[1] = 0x0;
+        sense_data[2] = sbp2_status[1];
+        sense_data[3] = sbp2_status[4];
+        sense_data[4] = sbp2_status[5];
+        sense_data[5] = sbp2_status[6];
+        sense_data[6] = sbp2_status[7];
+        sense_data[7] = 10;
+        sense_data[8] = sbp2_status[8];
+        sense_data[9] = sbp2_status[9];
+        sense_data[10] = sbp2_status[10];
+        sense_data[11] = sbp2_status[11];
+        sense_data[12] = sbp2_status[2];
+        sense_data[13] = sbp2_status[3];
+        sense_data[14] = sbp2_status[12];
+        sense_data[15] = sbp2_status[13];
+
+        sam_status = sbp2_status[0] & 0x3f;
+
+        switch (sam_status) {
+        case SAM_STAT_GOOD:
+        case SAM_STAT_CHECK_CONDITION:
+        case SAM_STAT_CONDITION_MET:
+        case SAM_STAT_BUSY:
+        case SAM_STAT_RESERVATION_CONFLICT:
+        case SAM_STAT_COMMAND_TERMINATED:
+                return DID_OK << 16 | sam_status;
+
+        default:
+                return DID_ERROR << 16;
+        }
+}
+
+static void
+complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
+{
+        struct sbp2_command_orb *orb = (struct sbp2_command_orb *)base_orb;
+        struct fw_unit *unit = orb->unit;
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct scatterlist *sg;
+        int result;
+
+        if (status != NULL) {
+                if (STATUS_GET_DEAD(*status))
+                        sbp2_agent_reset(unit);
+
+                switch (STATUS_GET_RESPONSE(*status)) {
+                case SBP2_STATUS_REQUEST_COMPLETE:
+                        result = DID_OK << 16;
+                        break;
+                case SBP2_STATUS_TRANSPORT_FAILURE:
+                        result = DID_BUS_BUSY << 16;
+                        break;
+                case SBP2_STATUS_ILLEGAL_REQUEST:
+                case SBP2_STATUS_VENDOR_DEPENDENT:
+                default:
+                        result = DID_ERROR << 16;
+                        break;
+                }
+
+                if (result == DID_OK << 16 && STATUS_GET_LEN(*status) > 1)
+                        result = sbp2_status_to_sense_data(STATUS_GET_DATA(*status),
+                                                           orb->cmd->sense_buffer);
+        } else {
+                /*
+                 * If the orb completes with status == NULL, something
+                 * went wrong, typically a bus reset happened mid-orb
+                 * or when sending the write (less likely).
+                 */
+                result = DID_BUS_BUSY << 16;
+        }
+
+        dma_unmap_single(device->card->device, orb->base.request_bus,
+                         sizeof(orb->request), DMA_TO_DEVICE);
+
+        if (orb->cmd->use_sg > 0) {
+                sg = (struct scatterlist *)orb->cmd->request_buffer;
+                dma_unmap_sg(device->card->device, sg, orb->cmd->use_sg,
+                             orb->cmd->sc_data_direction);
+        }
+
+        if (orb->page_table_bus != 0)
+                dma_unmap_single(device->card->device, orb->page_table_bus,
+                                 sizeof(orb->page_table_bus), DMA_TO_DEVICE);
+
+        if (orb->request_buffer_bus != 0)
+                dma_unmap_single(device->card->device, orb->request_buffer_bus,
+                                 sizeof(orb->request_buffer_bus),
+                                 DMA_FROM_DEVICE);
+
+        orb->cmd->result = result;
+        orb->done(orb->cmd);
+        kfree(orb);
+}
+
+static int sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
+{
+        struct sbp2_device *sd =
+                (struct sbp2_device *)orb->cmd->device->host->hostdata;
+        struct fw_unit *unit = sd->unit;
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct scatterlist *sg;
+        int sg_len, l, i, j, count;
+        size_t size;
+        dma_addr_t sg_addr;
+
+        sg = (struct scatterlist *)orb->cmd->request_buffer;
+        count = dma_map_sg(device->card->device, sg, orb->cmd->use_sg,
+                           orb->cmd->sc_data_direction);
+        if (count == 0)
+                goto fail;
+
+        /*
+         * Handle the special case where there is only one element in
+         * the scatter list by converting it to an immediate block
+         * request. This is also a workaround for broken devices such
+         * as the second generation iPod which doesn't support page
+         * tables.
+         */
+        if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) {
+                orb->request.data_descriptor.high = sd->address_high;
+                orb->request.data_descriptor.low  = sg_dma_address(sg);
+                orb->request.misc |=
+                        COMMAND_ORB_DATA_SIZE(sg_dma_len(sg));
+                return 0;
+        }
+
+        /*
+         * Convert the scatterlist to an sbp2 page table.  If any
+         * scatterlist entries are too big for sbp2, we split them as we
+         * go.  Even if we ask the block I/O layer to not give us sg
+         * elements larger than 65535 bytes, some IOMMUs may merge sg elements
+         * during DMA mapping, and Linux currently doesn't prevent this.
+         */
+        for (i = 0, j = 0; i < count; i++) {
+                sg_len = sg_dma_len(sg + i);
+                sg_addr = sg_dma_address(sg + i);
+                while (sg_len) {
+                        l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH);
+                        orb->page_table[j].low = sg_addr;
+                        orb->page_table[j].high = (l << 16);
+                        sg_addr += l;
+                        sg_len -= l;
+                        j++;
+                }
+        }
+
+        size = sizeof(orb->page_table[0]) * j;
+
+        /*
+         * The data_descriptor pointer is the one case where we need
+         * to fill in the node ID part of the address.  All other
+         * pointers assume that the data referenced reside on the
+         * initiator (i.e. us), but data_descriptor can refer to data
+         * on other nodes so we need to put our ID in descriptor.high.
+         */
+
+        orb->page_table_bus =
+                dma_map_single(device->card->device, orb->page_table,
+                               size, DMA_TO_DEVICE);
+        if (dma_mapping_error(orb->page_table_bus))
+                goto fail_page_table;
+        orb->request.data_descriptor.high = sd->address_high;
+        orb->request.data_descriptor.low  = orb->page_table_bus;
+        orb->request.misc |=
+                COMMAND_ORB_PAGE_TABLE_PRESENT |
+                COMMAND_ORB_DATA_SIZE(j);
+
+        fw_memcpy_to_be32(orb->page_table, orb->page_table, size);
+
+        return 0;
+
+ fail_page_table:
+        dma_unmap_sg(device->card->device, sg, orb->cmd->use_sg,
+                     orb->cmd->sc_data_direction);
+ fail:
+        return -ENOMEM;
+}
+
+/* SCSI stack integration */
+
+static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
+{
+        struct sbp2_device *sd =
+                (struct sbp2_device *)cmd->device->host->hostdata;
+        struct fw_unit *unit = sd->unit;
+        struct fw_device *device = fw_device(unit->device.parent);
+        struct sbp2_command_orb *orb;
+
+        /*
+         * Bidirectional commands are not yet implemented, and unknown
+         * transfer direction not handled.
+         */
+        if (cmd->sc_data_direction == DMA_BIDIRECTIONAL) {
+                fw_error("Cannot handle DMA_BIDIRECTIONAL - rejecting command");
+                cmd->result = DID_ERROR << 16;
+                done(cmd);
+                return 0;
+        }
+
+        orb = kzalloc(sizeof(*orb), GFP_ATOMIC);
+        if (orb == NULL) {
+                fw_notify("failed to alloc orb\n");
+                goto fail_alloc;
+        }
+
+        /* Initialize rcode to something not RCODE_COMPLETE. */
+        orb->base.rcode = -1;
+        orb->base.request_bus =
+                dma_map_single(device->card->device, &orb->request,
+                               sizeof(orb->request), DMA_TO_DEVICE);
+        if (dma_mapping_error(orb->base.request_bus))
+                goto fail_mapping;
+
+        orb->unit = unit;
+        orb->done = done;
+        orb->cmd  = cmd;
+
+        orb->request.next.high   = SBP2_ORB_NULL;
+        orb->request.next.low    = 0x0;
+        /*
+         * At speed 100 we can do 512 bytes per packet, at speed 200,
+         * 1024 bytes per packet etc.  The SBP-2 max_payload field
+         * specifies the max payload size as 2 ^ (max_payload + 2), so
+         * if we set this to max_speed + 7, we get the right value.
+         */
+        orb->request.misc =
+                COMMAND_ORB_MAX_PAYLOAD(device->node->max_speed + 7) |
+                COMMAND_ORB_SPEED(device->node->max_speed) |
+                COMMAND_ORB_NOTIFY;
+
+        if (cmd->sc_data_direction == DMA_FROM_DEVICE)
+                orb->request.misc |=
+                        COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA);
+        else if (cmd->sc_data_direction == DMA_TO_DEVICE)
+                orb->request.misc |=
+                        COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA);
+
+        if (cmd->use_sg && sbp2_command_orb_map_scatterlist(orb) < 0)
+                goto fail_map_payload;
+
+        fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request));
+
+        memset(orb->request.command_block,
+               0, sizeof(orb->request.command_block));
+        memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd));
+
+        orb->base.callback = complete_command_orb;
+
+        sbp2_send_orb(&orb->base, unit, sd->node_id, sd->generation,
+                      sd->command_block_agent_address + SBP2_ORB_POINTER);
+
+        return 0;
+
+ fail_map_payload:
+        dma_unmap_single(device->card->device, orb->base.request_bus,
+                         sizeof(orb->request), DMA_TO_DEVICE);
+ fail_mapping:
+        kfree(orb);
+ fail_alloc:
+        return SCSI_MLQUEUE_HOST_BUSY;
+}
+
+static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)
+{
+        struct sbp2_device *sd = (struct sbp2_device *)sdev->host->hostdata;
+
+        sdev->allow_restart = 1;
+
+        if (sd->workarounds & SBP2_WORKAROUND_INQUIRY_36)
+                sdev->inquiry_len = 36;
+        return 0;
+}
+
+static int sbp2_scsi_slave_configure(struct scsi_device *sdev)
+{
+        struct sbp2_device *sd = (struct sbp2_device *)sdev->host->hostdata;
+        struct fw_unit *unit = sd->unit;
+
+        sdev->use_10_for_rw = 1;
+
+        if (sdev->type == TYPE_ROM)
+                sdev->use_10_for_ms = 1;
+        if (sdev->type == TYPE_DISK &&
+            sd->workarounds & SBP2_WORKAROUND_MODE_SENSE_8)
+                sdev->skip_ms_page_8 = 1;
+        if (sd->workarounds & SBP2_WORKAROUND_FIX_CAPACITY) {
+                fw_notify("setting fix_capacity for %s\n", unit->device.bus_id);
+                sdev->fix_capacity = 1;
+        }
+
+        return 0;
+}
+
+/*
+ * Called by scsi stack when something has really gone wrong.  Usually
+ * called when a command has timed-out for some reason.
+ */
+static int sbp2_scsi_abort(struct scsi_cmnd *cmd)
+{
+        struct sbp2_device *sd =
+                (struct sbp2_device *)cmd->device->host->hostdata;
+        struct fw_unit *unit = sd->unit;
+
+        fw_notify("sbp2_scsi_abort\n");
+        sbp2_agent_reset(unit);
+        sbp2_cancel_orbs(unit);
+
+        return SUCCESS;
+}
+
+static struct scsi_host_template scsi_driver_template = {
+        .module                 = THIS_MODULE,
+        .name                   = "SBP-2 IEEE-1394",
+        .proc_name              = (char *)sbp2_driver_name,
+        .queuecommand           = sbp2_scsi_queuecommand,
+        .slave_alloc            = sbp2_scsi_slave_alloc,
+        .slave_configure        = sbp2_scsi_slave_configure,
+        .eh_abort_handler       = sbp2_scsi_abort,
+        .this_id                = -1,
+        .sg_tablesize           = SG_ALL,
+        .use_clustering         = ENABLE_CLUSTERING,
+        .cmd_per_lun            = 1,
+        .can_queue              = 1,
+};
+
+MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
+MODULE_DESCRIPTION("SCSI over IEEE1394");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
+
+/* Provide a module alias so root-on-sbp2 initrds don't break. */
+#ifndef CONFIG_IEEE1394_SBP2_MODULE
+MODULE_ALIAS("sbp2");
+#endif
+
+static int __init sbp2_init(void)
+{
+        return driver_register(&sbp2_driver.driver);
+}
+
+static void __exit sbp2_cleanup(void)
+{
+        driver_unregister(&sbp2_driver.driver);
+}
+
+module_init(sbp2_init);
+module_exit(sbp2_cleanup);
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
new file mode 100644
index 000000000000..7aebb8ae0efa
--- /dev/null
+++ b/drivers/firewire/fw-topology.c
@@ -0,0 +1,537 @@
+/*
+ * Incremental bus scan, based on bus topology
+ *
+ * Copyright (C) 2004-2006 Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/wait.h>
+#include <linux/errno.h>
+#include "fw-transaction.h"
+#include "fw-topology.h"
+
+#define SELF_ID_PHY_ID(q)               (((q) >> 24) & 0x3f)
+#define SELF_ID_EXTENDED(q)             (((q) >> 23) & 0x01)
+#define SELF_ID_LINK_ON(q)              (((q) >> 22) & 0x01)
+#define SELF_ID_GAP_COUNT(q)            (((q) >> 16) & 0x3f)
+#define SELF_ID_PHY_SPEED(q)            (((q) >> 14) & 0x03)
+#define SELF_ID_CONTENDER(q)            (((q) >> 11) & 0x01)
+#define SELF_ID_PHY_INITIATOR(q)        (((q) >>  1) & 0x01)
+#define SELF_ID_MORE_PACKETS(q)         (((q) >>  0) & 0x01)
+
+#define SELF_ID_EXT_SEQUENCE(q)         (((q) >> 20) & 0x07)
+
+static u32 *count_ports(u32 *sid, int *total_port_count, int *child_port_count)
+{
+        u32 q;
+        int port_type, shift, seq;
+
+        *total_port_count = 0;
+        *child_port_count = 0;
+
+        shift = 6;
+        q = *sid;
+        seq = 0;
+
+        while (1) {
+                port_type = (q >> shift) & 0x03;
+                switch (port_type) {
+                case SELFID_PORT_CHILD:
+                        (*child_port_count)++;
+                case SELFID_PORT_PARENT:
+                case SELFID_PORT_NCONN:
+                        (*total_port_count)++;
+                case SELFID_PORT_NONE:
+                        break;
+                }
+
+                shift -= 2;
+                if (shift == 0) {
+                        if (!SELF_ID_MORE_PACKETS(q))
+                                return sid + 1;
+
+                        shift = 16;
+                        sid++;
+                        q = *sid;
+
+                        /*
+                         * Check that the extra packets actually are
+                         * extended self ID packets and that the
+                         * sequence numbers in the extended self ID
+                         * packets increase as expected.
+                         */
+
+                        if (!SELF_ID_EXTENDED(q) ||
+                            seq != SELF_ID_EXT_SEQUENCE(q))
+                                return NULL;
+
+                        seq++;
+                }
+        }
+}
+
+static int get_port_type(u32 *sid, int port_index)
+{
+        int index, shift;
+
+        index = (port_index + 5) / 8;
+        shift = 16 - ((port_index + 5) & 7) * 2;
+        return (sid[index] >> shift) & 0x03;
+}
+
+static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
+{
+        struct fw_node *node;
+
+        node = kzalloc(sizeof(*node) + port_count * sizeof(node->ports[0]),
+                       GFP_ATOMIC);
+        if (node == NULL)
+                return NULL;
+
+        node->color = color;
+        node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid);
+        node->link_on = SELF_ID_LINK_ON(sid);
+        node->phy_speed = SELF_ID_PHY_SPEED(sid);
+        node->port_count = port_count;
+
+        atomic_set(&node->ref_count, 1);
+        INIT_LIST_HEAD(&node->link);
+
+        return node;
+}
+
+/*
+ * Compute the maximum hop count for this node and it's children.  The
+ * maximum hop count is the maximum number of connections between any
+ * two nodes in the subtree rooted at this node.  We need this for
+ * setting the gap count.  As we build the tree bottom up in
+ * build_tree() below, this is fairly easy to do: for each node we
+ * maintain the max hop count and the max depth, ie the number of hops
+ * to the furthest leaf.  Computing the max hop count breaks down into
+ * two cases: either the path goes through this node, in which case
+ * the hop count is the sum of the two biggest child depths plus 2.
+ * Or it could be the case that the max hop path is entirely
+ * containted in a child tree, in which case the max hop count is just
+ * the max hop count of this child.
+ */
+static void update_hop_count(struct fw_node *node)
+{
+        int depths[2] = { -1, -1 };
+        int max_child_hops = 0;
+        int i;
+
+        for (i = 0; i < node->port_count; i++) {
+                if (node->ports[i].node == NULL)
+                        continue;
+
+                if (node->ports[i].node->max_hops > max_child_hops)
+                        max_child_hops = node->ports[i].node->max_hops;
+
+                if (node->ports[i].node->max_depth > depths[0]) {
+                        depths[1] = depths[0];
+                        depths[0] = node->ports[i].node->max_depth;
+                } else if (node->ports[i].node->max_depth > depths[1])
+                        depths[1] = node->ports[i].node->max_depth;
+        }
+
+        node->max_depth = depths[0] + 1;
+        node->max_hops = max(max_child_hops, depths[0] + depths[1] + 2);
+}
+
+
+/**
+ * build_tree - Build the tree representation of the topology
+ * @self_ids: array of self IDs to create the tree from
+ * @self_id_count: the length of the self_ids array
+ * @local_id: the node ID of the local node
+ *
+ * This function builds the tree representation of the topology given
+ * by the self IDs from the latest bus reset.  During the construction
+ * of the tree, the function checks that the self IDs are valid and
+ * internally consistent.  On succcess this funtions returns the
+ * fw_node corresponding to the local card otherwise NULL.
+ */
+static struct fw_node *build_tree(struct fw_card *card,
+                                  u32 *sid, int self_id_count)
+{
+        struct fw_node *node, *child, *local_node, *irm_node;
+        struct list_head stack, *h;
+        u32 *next_sid, *end, q;
+        int i, port_count, child_port_count, phy_id, parent_count, stack_depth;
+        int gap_count, topology_type;
+
+        local_node = NULL;
+        node = NULL;
+        INIT_LIST_HEAD(&stack);
+        stack_depth = 0;
+        end = sid + self_id_count;
+        phy_id = 0;
+        irm_node = NULL;
+        gap_count = SELF_ID_GAP_COUNT(*sid);
+        topology_type = 0;
+
+        while (sid < end) {
+                next_sid = count_ports(sid, &port_count, &child_port_count);
+
+                if (next_sid == NULL) {
+                        fw_error("Inconsistent extended self IDs.\n");
+                        return NULL;
+                }
+
+                q = *sid;
+                if (phy_id != SELF_ID_PHY_ID(q)) {
+                        fw_error("PHY ID mismatch in self ID: %d != %d.\n",
+                                 phy_id, SELF_ID_PHY_ID(q));
+                        return NULL;
+                }
+
+                if (child_port_count > stack_depth) {
+                        fw_error("Topology stack underflow\n");
+                        return NULL;
+                }
+
+                /*
+                 * Seek back from the top of our stack to find the
+                 * start of the child nodes for this node.
+                 */
+                for (i = 0, h = &stack; i < child_port_count; i++)
+                        h = h->prev;
+                child = fw_node(h);
+
+                node = fw_node_create(q, port_count, card->color);
+                if (node == NULL) {
+                        fw_error("Out of memory while building topology.");
+                        return NULL;
+                }
+
+                if (phy_id == (card->node_id & 0x3f))
+                        local_node = node;
+
+                if (SELF_ID_CONTENDER(q))
+                        irm_node = node;
+
+                if (node->phy_speed == SCODE_BETA)
+                        topology_type |= FW_TOPOLOGY_B;
+                else
+                        topology_type |= FW_TOPOLOGY_A;
+
+                parent_count = 0;
+
+                for (i = 0; i < port_count; i++) {
+                        switch (get_port_type(sid, i)) {
+                        case SELFID_PORT_PARENT:
+                                /*
+                                 * Who's your daddy?  We dont know the
+                                 * parent node at this time, so we
+                                 * temporarily abuse node->color for
+                                 * remembering the entry in the
+                                 * node->ports array where the parent
+                                 * node should be.  Later, when we
+                                 * handle the parent node, we fix up
+                                 * the reference.
+                                 */
+                                parent_count++;
+                                node->color = i;
+                                break;
+
+                        case SELFID_PORT_CHILD:
+                                node->ports[i].node = child;
+                                /*
+                                 * Fix up parent reference for this
+                                 * child node.
+                                 */
+                                child->ports[child->color].node = node;
+                                child->color = card->color;
+                                child = fw_node(child->link.next);
+                                break;
+                        }
+                }
+
+                /*
+                 * Check that the node reports exactly one parent
+                 * port, except for the root, which of course should
+                 * have no parents.
+                 */
+                if ((next_sid == end && parent_count != 0) ||
+                    (next_sid < end && parent_count != 1)) {
+                        fw_error("Parent port inconsistency for node %d: "
+                                 "parent_count=%d\n", phy_id, parent_count);
+                        return NULL;
+                }
+
+                /* Pop the child nodes off the stack and push the new node. */
+                __list_del(h->prev, &stack);
+                list_add_tail(&node->link, &stack);
+                stack_depth += 1 - child_port_count;
+
+                /*
+                 * If all PHYs does not report the same gap count
+                 * setting, we fall back to 63 which will force a gap
+                 * count reconfiguration and a reset.
+                 */
+                if (SELF_ID_GAP_COUNT(q) != gap_count)
+                        gap_count = 63;
+
+                update_hop_count(node);
+
+                sid = next_sid;
+                phy_id++;
+        }
+
+        card->root_node = node;
+        card->irm_node = irm_node;
+        card->gap_count = gap_count;
+        card->topology_type = topology_type;
+
+        return local_node;
+}
+
+typedef void (*fw_node_callback_t)(struct fw_card * card,
+                                   struct fw_node * node,
+                                   struct fw_node * parent);
+
+static void
+for_each_fw_node(struct fw_card *card, struct fw_node *root,
+                 fw_node_callback_t callback)
+{
+        struct list_head list;
+        struct fw_node *node, *next, *child, *parent;
+        int i;
+
+        INIT_LIST_HEAD(&list);
+
+        fw_node_get(root);
+        list_add_tail(&root->link, &list);
+        parent = NULL;
+        list_for_each_entry(node, &list, link) {
+                node->color = card->color;
+
+                for (i = 0; i < node->port_count; i++) {
+                        child = node->ports[i].node;
+                        if (!child)
+                                continue;
+                        if (child->color == card->color)
+                                parent = child;
+                        else {
+                                fw_node_get(child);
+                                list_add_tail(&child->link, &list);
+                        }
+                }
+
+                callback(card, node, parent);
+        }
+
+        list_for_each_entry_safe(node, next, &list, link)
+                fw_node_put(node);
+}
+
+static void
+report_lost_node(struct fw_card *card,
+                 struct fw_node *node, struct fw_node *parent)
+{
+        fw_node_event(card, node, FW_NODE_DESTROYED);
+        fw_node_put(node);
+}
+
+static void
+report_found_node(struct fw_card *card,
+                  struct fw_node *node, struct fw_node *parent)
+{
+        int b_path = (node->phy_speed == SCODE_BETA);
+
+        if (parent != NULL) {
+                /* min() macro doesn't work here with gcc 3.4 */
+                node->max_speed = parent->max_speed < node->phy_speed ?
+                                        parent->max_speed : node->phy_speed;
+                node->b_path = parent->b_path && b_path;
+        } else {
+                node->max_speed = node->phy_speed;
+                node->b_path = b_path;
+        }
+
+        fw_node_event(card, node, FW_NODE_CREATED);
+}
+
+void fw_destroy_nodes(struct fw_card *card)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->lock, flags);
+        card->color++;
+        if (card->local_node != NULL)
+                for_each_fw_node(card, card->local_node, report_lost_node);
+        spin_unlock_irqrestore(&card->lock, flags);
+}
+
+static void move_tree(struct fw_node *node0, struct fw_node *node1, int port)
+{
+        struct fw_node *tree;
+        int i;
+
+        tree = node1->ports[port].node;
+        node0->ports[port].node = tree;
+        for (i = 0; i < tree->port_count; i++) {
+                if (tree->ports[i].node == node1) {
+                        tree->ports[i].node = node0;
+                        break;
+                }
+        }
+}
+
+/**
+ * update_tree - compare the old topology tree for card with the new
+ * one specified by root.  Queue the nodes and mark them as either
+ * found, lost or updated.  Update the nodes in the card topology tree
+ * as we go.
+ */
+static void
+update_tree(struct fw_card *card, struct fw_node *root)
+{
+        struct list_head list0, list1;
+        struct fw_node *node0, *node1;
+        int i, event;
+
+        INIT_LIST_HEAD(&list0);
+        list_add_tail(&card->local_node->link, &list0);
+        INIT_LIST_HEAD(&list1);
+        list_add_tail(&root->link, &list1);
+
+        node0 = fw_node(list0.next);
+        node1 = fw_node(list1.next);
+
+        while (&node0->link != &list0) {
+
+                /* assert(node0->port_count == node1->port_count); */
+                if (node0->link_on && !node1->link_on)
+                        event = FW_NODE_LINK_OFF;
+                else if (!node0->link_on && node1->link_on)
+                        event = FW_NODE_LINK_ON;
+                else
+                        event = FW_NODE_UPDATED;
+
+                node0->node_id = node1->node_id;
+                node0->color = card->color;
+                node0->link_on = node1->link_on;
+                node0->initiated_reset = node1->initiated_reset;
+                node0->max_hops = node1->max_hops;
+                node1->color = card->color;
+                fw_node_event(card, node0, event);
+
+                if (card->root_node == node1)
+                        card->root_node = node0;
+                if (card->irm_node == node1)
+                        card->irm_node = node0;
+
+                for (i = 0; i < node0->port_count; i++) {
+                        if (node0->ports[i].node && node1->ports[i].node) {
+                                /*
+                                 * This port didn't change, queue the
+                                 * connected node for further
+                                 * investigation.
+                                 */
+                                if (node0->ports[i].node->color == card->color)
+                                        continue;
+                                list_add_tail(&node0->ports[i].node->link,
+                                              &list0);
+                                list_add_tail(&node1->ports[i].node->link,
+                                              &list1);
+                        } else if (node0->ports[i].node) {
+                                /*
+                                 * The nodes connected here were
+                                 * unplugged; unref the lost nodes and
+                                 * queue FW_NODE_LOST callbacks for
+                                 * them.
+                                 */
+
+                                for_each_fw_node(card, node0->ports[i].node,
+                                                 report_lost_node);
+                                node0->ports[i].node = NULL;
+                        } else if (node1->ports[i].node) {
+                                /*
+                                 * One or more node were connected to
+                                 * this port. Move the new nodes into
+                                 * the tree and queue FW_NODE_CREATED
+                                 * callbacks for them.
+                                 */
+                                move_tree(node0, node1, i);
+                                for_each_fw_node(card, node0->ports[i].node,
+                                                 report_found_node);
+                        }
+                }
+
+                node0 = fw_node(node0->link.next);
+                node1 = fw_node(node1->link.next);
+        }
+}
+
+static void
+update_topology_map(struct fw_card *card, u32 *self_ids, int self_id_count)
+{
+        int node_count;
+
+        card->topology_map[1]++;
+        node_count = (card->root_node->node_id & 0x3f) + 1;
+        card->topology_map[2] = (node_count << 16) | self_id_count;
+        card->topology_map[0] = (self_id_count + 2) << 16;
+        memcpy(&card->topology_map[3], self_ids, self_id_count * 4);
+        fw_compute_block_crc(card->topology_map);
+}
+
+void
+fw_core_handle_bus_reset(struct fw_card *card,
+                         int node_id, int generation,
+                         int self_id_count, u32 * self_ids)
+{
+        struct fw_node *local_node;
+        unsigned long flags;
+
+        fw_flush_transactions(card);
+
+        spin_lock_irqsave(&card->lock, flags);
+
+        /*
+         * If the new topology has a different self_id_count the topology
+         * changed, either nodes were added or removed. In that case we
+         * reset the IRM reset counter.
+         */
+        if (card->self_id_count != self_id_count)
+                card->bm_retries = 0;
+
+        card->node_id = node_id;
+        card->generation = generation;
+        card->reset_jiffies = jiffies;
+        schedule_delayed_work(&card->work, 0);
+
+        local_node = build_tree(card, self_ids, self_id_count);
+
+        update_topology_map(card, self_ids, self_id_count);
+
+        card->color++;
+
+        if (local_node == NULL) {
+                fw_error("topology build failed\n");
+                /* FIXME: We need to issue a bus reset in this case. */
+        } else if (card->local_node == NULL) {
+                card->local_node = local_node;
+                for_each_fw_node(card, local_node, report_found_node);
+        } else {
+                update_tree(card, local_node);
+        }
+
+        spin_unlock_irqrestore(&card->lock, flags);
+}
+EXPORT_SYMBOL(fw_core_handle_bus_reset);
diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
new file mode 100644
index 000000000000..363b6cbcd0b3
--- /dev/null
+++ b/drivers/firewire/fw-topology.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2003-2006 Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * 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.
+ */
+
+#ifndef __fw_topology_h
+#define __fw_topology_h
+
+enum {
+        FW_TOPOLOGY_A =         0x01,
+        FW_TOPOLOGY_B =         0x02,
+        FW_TOPOLOGY_MIXED =     0x03,
+};
+
+enum {
+        FW_NODE_CREATED =   0x00,
+        FW_NODE_UPDATED =   0x01,
+        FW_NODE_DESTROYED = 0x02,
+        FW_NODE_LINK_ON =   0x03,
+        FW_NODE_LINK_OFF =  0x04,
+};
+
+struct fw_port {
+        struct fw_node *node;
+        unsigned speed : 3; /* S100, S200, ... S3200 */
+};
+
+struct fw_node {
+        u16 node_id;
+        u8 color;
+        u8 port_count;
+        unsigned link_on : 1;
+        unsigned initiated_reset : 1;
+        unsigned b_path : 1;
+        u8 phy_speed : 3; /* As in the self ID packet. */
+        u8 max_speed : 5; /* Minimum of all phy-speeds and port speeds on
+                           * the path from the local node to this node. */
+        u8 max_depth : 4; /* Maximum depth to any leaf node */
+        u8 max_hops : 4;  /* Max hops in this sub tree */
+        atomic_t ref_count;
+
+        /* For serializing node topology into a list. */
+        struct list_head link;
+
+        /* Upper layer specific data. */
+        void *data;
+
+        struct fw_port ports[0];
+};
+
+static inline struct fw_node *
+fw_node(struct list_head *l)
+{
+        return list_entry(l, struct fw_node, link);
+}
+
+static inline struct fw_node *
+fw_node_get(struct fw_node *node)
+{
+        atomic_inc(&node->ref_count);
+
+        return node;
+}
+
+static inline void
+fw_node_put(struct fw_node *node)
+{
+        if (atomic_dec_and_test(&node->ref_count))
+                kfree(node);
+}
+
+void
+fw_destroy_nodes(struct fw_card *card);
+
+int
+fw_compute_block_crc(u32 *block);
+
+
+#endif /* __fw_topology_h */
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
new file mode 100644
index 000000000000..80d0121463d0
--- /dev/null
+++ b/drivers/firewire/fw-transaction.c
@@ -0,0 +1,910 @@
+/*
+ * Core IEEE1394 transaction logic
+ *
+ * Copyright (C) 2004-2006 Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/poll.h>
+#include <linux/list.h>
+#include <linux/kthread.h>
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
+
+#include "fw-transaction.h"
+#include "fw-topology.h"
+#include "fw-device.h"
+
+#define HEADER_PRI(pri)                 ((pri) << 0)
+#define HEADER_TCODE(tcode)             ((tcode) << 4)
+#define HEADER_RETRY(retry)             ((retry) << 8)
+#define HEADER_TLABEL(tlabel)           ((tlabel) << 10)
+#define HEADER_DESTINATION(destination) ((destination) << 16)
+#define HEADER_SOURCE(source)           ((source) << 16)
+#define HEADER_RCODE(rcode)             ((rcode) << 12)
+#define HEADER_OFFSET_HIGH(offset_high) ((offset_high) << 0)
+#define HEADER_DATA_LENGTH(length)      ((length) << 16)
+#define HEADER_EXTENDED_TCODE(tcode)    ((tcode) << 0)
+
+#define HEADER_GET_TCODE(q)             (((q) >> 4) & 0x0f)
+#define HEADER_GET_TLABEL(q)            (((q) >> 10) & 0x3f)
+#define HEADER_GET_RCODE(q)             (((q) >> 12) & 0x0f)
+#define HEADER_GET_DESTINATION(q)       (((q) >> 16) & 0xffff)
+#define HEADER_GET_SOURCE(q)            (((q) >> 16) & 0xffff)
+#define HEADER_GET_OFFSET_HIGH(q)       (((q) >> 0) & 0xffff)
+#define HEADER_GET_DATA_LENGTH(q)       (((q) >> 16) & 0xffff)
+#define HEADER_GET_EXTENDED_TCODE(q)    (((q) >> 0) & 0xffff)
+
+#define PHY_CONFIG_GAP_COUNT(gap_count) (((gap_count) << 16) | (1 << 22))
+#define PHY_CONFIG_ROOT_ID(node_id)     ((((node_id) & 0x3f) << 24) | (1 << 23))
+#define PHY_IDENTIFIER(id)              ((id) << 30)
+
+static int
+close_transaction(struct fw_transaction *transaction,
+                  struct fw_card *card, int rcode,
+                  u32 *payload, size_t length)
+{
+        struct fw_transaction *t;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->lock, flags);
+        list_for_each_entry(t, &card->transaction_list, link) {
+                if (t == transaction) {
+                        list_del(&t->link);
+                        card->tlabel_mask &= ~(1 << t->tlabel);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        if (&t->link != &card->transaction_list) {
+                t->callback(card, rcode, payload, length, t->callback_data);
+                return 0;
+        }
+
+        return -ENOENT;
+}
+
+/*
+ * Only valid for transactions that are potentially pending (ie have
+ * been sent).
+ */
+int
+fw_cancel_transaction(struct fw_card *card,
+                      struct fw_transaction *transaction)
+{
+        /*
+         * Cancel the packet transmission if it's still queued.  That
+         * will call the packet transmission callback which cancels
+         * the transaction.
+         */
+
+        if (card->driver->cancel_packet(card, &transaction->packet) == 0)
+                return 0;
+
+        /*
+         * If the request packet has already been sent, we need to see
+         * if the transaction is still pending and remove it in that case.
+         */
+
+        return close_transaction(transaction, card, RCODE_CANCELLED, NULL, 0);
+}
+EXPORT_SYMBOL(fw_cancel_transaction);
+
+static void
+transmit_complete_callback(struct fw_packet *packet,
+                           struct fw_card *card, int status)
+{
+        struct fw_transaction *t =
+            container_of(packet, struct fw_transaction, packet);
+
+        switch (status) {
+        case ACK_COMPLETE:
+                close_transaction(t, card, RCODE_COMPLETE, NULL, 0);
+                break;
+        case ACK_PENDING:
+                t->timestamp = packet->timestamp;
+                break;
+        case ACK_BUSY_X:
+        case ACK_BUSY_A:
+        case ACK_BUSY_B:
+                close_transaction(t, card, RCODE_BUSY, NULL, 0);
+                break;
+        case ACK_DATA_ERROR:
+                close_transaction(t, card, RCODE_DATA_ERROR, NULL, 0);
+                break;
+        case ACK_TYPE_ERROR:
+                close_transaction(t, card, RCODE_TYPE_ERROR, NULL, 0);
+                break;
+        default:
+                /*
+                 * In this case the ack is really a juju specific
+                 * rcode, so just forward that to the callback.
+                 */
+                close_transaction(t, card, status, NULL, 0);
+                break;
+        }
+}
+
+static void
+fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
+                int node_id, int source_id, int generation, int speed,
+                unsigned long long offset, void *payload, size_t length)
+{
+        int ext_tcode;
+
+        if (tcode > 0x10) {
+                ext_tcode = tcode - 0x10;
+                tcode = TCODE_LOCK_REQUEST;
+        } else
+                ext_tcode = 0;
+
+        packet->header[0] =
+                HEADER_RETRY(RETRY_X) |
+                HEADER_TLABEL(tlabel) |
+                HEADER_TCODE(tcode) |
+                HEADER_DESTINATION(node_id);
+        packet->header[1] =
+                HEADER_OFFSET_HIGH(offset >> 32) | HEADER_SOURCE(source_id);
+        packet->header[2] =
+                offset;
+
+        switch (tcode) {
+        case TCODE_WRITE_QUADLET_REQUEST:
+                packet->header[3] = *(u32 *)payload;
+                packet->header_length = 16;
+                packet->payload_length = 0;
+                break;
+
+        case TCODE_LOCK_REQUEST:
+        case TCODE_WRITE_BLOCK_REQUEST:
+                packet->header[3] =
+                        HEADER_DATA_LENGTH(length) |
+                        HEADER_EXTENDED_TCODE(ext_tcode);
+                packet->header_length = 16;
+                packet->payload = payload;
+                packet->payload_length = length;
+                break;
+
+        case TCODE_READ_QUADLET_REQUEST:
+                packet->header_length = 12;
+                packet->payload_length = 0;
+                break;
+
+        case TCODE_READ_BLOCK_REQUEST:
+                packet->header[3] =
+                        HEADER_DATA_LENGTH(length) |
+                        HEADER_EXTENDED_TCODE(ext_tcode);
+                packet->header_length = 16;
+                packet->payload_length = 0;
+                break;
+        }
+
+        packet->speed = speed;
+        packet->generation = generation;
+        packet->ack = 0;
+}
+
+/**
+ * This function provides low-level access to the IEEE1394 transaction
+ * logic.  Most C programs would use either fw_read(), fw_write() or
+ * fw_lock() instead - those function are convenience wrappers for
+ * this function.  The fw_send_request() function is primarily
+ * provided as a flexible, one-stop entry point for languages bindings
+ * and protocol bindings.
+ *
+ * FIXME: Document this function further, in particular the possible
+ * values for rcode in the callback.  In short, we map ACK_COMPLETE to
+ * RCODE_COMPLETE, internal errors set errno and set rcode to
+ * RCODE_SEND_ERROR (which is out of range for standard ieee1394
+ * rcodes).  All other rcodes are forwarded unchanged.  For all
+ * errors, payload is NULL, length is 0.
+ *
+ * Can not expect the callback to be called before the function
+ * returns, though this does happen in some cases (ACK_COMPLETE and
+ * errors).
+ *
+ * The payload is only used for write requests and must not be freed
+ * until the callback has been called.
+ *
+ * @param card the card from which to send the request
+ * @param tcode the tcode for this transaction.  Do not use
+ *   TCODE_LOCK_REQUEST directly, insted use TCODE_LOCK_MASK_SWAP
+ *   etc. to specify tcode and ext_tcode.
+ * @param node_id the destination node ID (bus ID and PHY ID concatenated)
+ * @param generation the generation for which node_id is valid
+ * @param speed the speed to use for sending the request
+ * @param offset the 48 bit offset on the destination node
+ * @param payload the data payload for the request subaction
+ * @param length the length in bytes of the data to read
+ * @param callback function to be called when the transaction is completed
+ * @param callback_data pointer to arbitrary data, which will be
+ *   passed to the callback
+ */
+void
+fw_send_request(struct fw_card *card, struct fw_transaction *t,
+                int tcode, int node_id, int generation, int speed,
+                unsigned long long offset,
+                void *payload, size_t length,
+                fw_transaction_callback_t callback, void *callback_data)
+{
+        unsigned long flags;
+        int tlabel, source;
+
+        /*
+         * Bump the flush timer up 100ms first of all so we
+         * don't race with a flush timer callback.
+         */
+
+        mod_timer(&card->flush_timer, jiffies + DIV_ROUND_UP(HZ, 10));
+
+        /*
+         * Allocate tlabel from the bitmap and put the transaction on
+         * the list while holding the card spinlock.
+         */
+
+        spin_lock_irqsave(&card->lock, flags);
+
+        source = card->node_id;
+        tlabel = card->current_tlabel;
+        if (card->tlabel_mask & (1 << tlabel)) {
+                spin_unlock_irqrestore(&card->lock, flags);
+                callback(card, RCODE_SEND_ERROR, NULL, 0, callback_data);
+                return;
+        }
+
+        card->current_tlabel = (card->current_tlabel + 1) & 0x1f;
+        card->tlabel_mask |= (1 << tlabel);
+
+        list_add_tail(&t->link, &card->transaction_list);
+
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        /* Initialize rest of transaction, fill out packet and send it. */
+        t->node_id = node_id;
+        t->tlabel = tlabel;
+        t->callback = callback;
+        t->callback_data = callback_data;
+
+        fw_fill_request(&t->packet, tcode, t->tlabel,
+                        node_id, source, generation,
+                        speed, offset, payload, length);
+        t->packet.callback = transmit_complete_callback;
+
+        card->driver->send_request(card, &t->packet);
+}
+EXPORT_SYMBOL(fw_send_request);
+
+static void
+transmit_phy_packet_callback(struct fw_packet *packet,
+                             struct fw_card *card, int status)
+{
+        kfree(packet);
+}
+
+static void send_phy_packet(struct fw_card *card, u32 data, int generation)
+{
+        struct fw_packet *packet;
+
+        packet = kzalloc(sizeof(*packet), GFP_ATOMIC);
+        if (packet == NULL)
+                return;
+
+        packet->header[0] = data;
+        packet->header[1] = ~data;
+        packet->header_length = 8;
+        packet->payload_length = 0;
+        packet->speed = SCODE_100;
+        packet->generation = generation;
+        packet->callback = transmit_phy_packet_callback;
+
+        card->driver->send_request(card, packet);
+}
+
+void fw_send_phy_config(struct fw_card *card,
+                        int node_id, int generation, int gap_count)
+{
+        u32 q;
+
+        q = PHY_IDENTIFIER(PHY_PACKET_CONFIG) |
+                PHY_CONFIG_ROOT_ID(node_id) |
+                PHY_CONFIG_GAP_COUNT(gap_count);
+
+        send_phy_packet(card, q, generation);
+}
+
+void fw_flush_transactions(struct fw_card *card)
+{
+        struct fw_transaction *t, *next;
+        struct list_head list;
+        unsigned long flags;
+
+        INIT_LIST_HEAD(&list);
+        spin_lock_irqsave(&card->lock, flags);
+        list_splice_init(&card->transaction_list, &list);
+        card->tlabel_mask = 0;
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        list_for_each_entry_safe(t, next, &list, link) {
+                card->driver->cancel_packet(card, &t->packet);
+
+                /*
+                 * At this point cancel_packet will never call the
+                 * transaction callback, since we just took all the
+                 * transactions out of the list.  So do it here.
+                 */
+                t->callback(card, RCODE_CANCELLED, NULL, 0, t->callback_data);
+        }
+}
+
+static struct fw_address_handler *
+lookup_overlapping_address_handler(struct list_head *list,
+                                   unsigned long long offset, size_t length)
+{
+        struct fw_address_handler *handler;
+
+        list_for_each_entry(handler, list, link) {
+                if (handler->offset < offset + length &&
+                    offset < handler->offset + handler->length)
+                        return handler;
+        }
+
+        return NULL;
+}
+
+static struct fw_address_handler *
+lookup_enclosing_address_handler(struct list_head *list,
+                                 unsigned long long offset, size_t length)
+{
+        struct fw_address_handler *handler;
+
+        list_for_each_entry(handler, list, link) {
+                if (handler->offset <= offset &&
+                    offset + length <= handler->offset + handler->length)
+                        return handler;
+        }
+
+        return NULL;
+}
+
+static DEFINE_SPINLOCK(address_handler_lock);
+static LIST_HEAD(address_handler_list);
+
+const struct fw_address_region fw_low_memory_region =
+        { .start = 0x000000000000ULL, .end = 0x000100000000ULL,  };
+const struct fw_address_region fw_high_memory_region =
+        { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL,  };
+const struct fw_address_region fw_private_region =
+        { .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL,  };
+const struct fw_address_region fw_csr_region =
+        { .start = 0xfffff0000000ULL, .end = 0xfffff0000800ULL,  };
+const struct fw_address_region fw_unit_space_region =
+        { .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, };
+EXPORT_SYMBOL(fw_low_memory_region);
+EXPORT_SYMBOL(fw_high_memory_region);
+EXPORT_SYMBOL(fw_private_region);
+EXPORT_SYMBOL(fw_csr_region);
+EXPORT_SYMBOL(fw_unit_space_region);
+
+/**
+ * Allocate a range of addresses in the node space of the OHCI
+ * controller.  When a request is received that falls within the
+ * specified address range, the specified callback is invoked.  The
+ * parameters passed to the callback give the details of the
+ * particular request
+ */
+int
+fw_core_add_address_handler(struct fw_address_handler *handler,
+                            const struct fw_address_region *region)
+{
+        struct fw_address_handler *other;
+        unsigned long flags;
+        int ret = -EBUSY;
+
+        spin_lock_irqsave(&address_handler_lock, flags);
+
+        handler->offset = region->start;
+        while (handler->offset + handler->length <= region->end) {
+                other =
+                    lookup_overlapping_address_handler(&address_handler_list,
+                                                       handler->offset,
+                                                       handler->length);
+                if (other != NULL) {
+                        handler->offset += other->length;
+                } else {
+                        list_add_tail(&handler->link, &address_handler_list);
+                        ret = 0;
+                        break;
+                }
+        }
+
+        spin_unlock_irqrestore(&address_handler_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(fw_core_add_address_handler);
+
+/**
+ * Deallocate a range of addresses allocated with fw_allocate.  This
+ * will call the associated callback one last time with a the special
+ * tcode TCODE_DEALLOCATE, to let the client destroy the registered
+ * callback data.  For convenience, the callback parameters offset and
+ * length are set to the start and the length respectively for the
+ * deallocated region, payload is set to NULL.
+ */
+void fw_core_remove_address_handler(struct fw_address_handler *handler)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&address_handler_lock, flags);
+        list_del(&handler->link);
+        spin_unlock_irqrestore(&address_handler_lock, flags);
+}
+EXPORT_SYMBOL(fw_core_remove_address_handler);
+
+struct fw_request {
+        struct fw_packet response;
+        u32 request_header[4];
+        int ack;
+        u32 length;
+        u32 data[0];
+};
+
+static void
+free_response_callback(struct fw_packet *packet,
+                       struct fw_card *card, int status)
+{
+        struct fw_request *request;
+
+        request = container_of(packet, struct fw_request, response);
+        kfree(request);
+}
+
+void
+fw_fill_response(struct fw_packet *response, u32 *request_header,
+                 int rcode, void *payload, size_t length)
+{
+        int tcode, tlabel, extended_tcode, source, destination;
+
+        tcode          = HEADER_GET_TCODE(request_header[0]);
+        tlabel         = HEADER_GET_TLABEL(request_header[0]);
+        source         = HEADER_GET_DESTINATION(request_header[0]);
+        destination    = HEADER_GET_SOURCE(request_header[1]);
+        extended_tcode = HEADER_GET_EXTENDED_TCODE(request_header[3]);
+
+        response->header[0] =
+                HEADER_RETRY(RETRY_1) |
+                HEADER_TLABEL(tlabel) |
+                HEADER_DESTINATION(destination);
+        response->header[1] =
+                HEADER_SOURCE(source) |
+                HEADER_RCODE(rcode);
+        response->header[2] = 0;
+
+        switch (tcode) {
+        case TCODE_WRITE_QUADLET_REQUEST:
+        case TCODE_WRITE_BLOCK_REQUEST:
+                response->header[0] |= HEADER_TCODE(TCODE_WRITE_RESPONSE);
+                response->header_length = 12;
+                response->payload_length = 0;
+                break;
+
+        case TCODE_READ_QUADLET_REQUEST:
+                response->header[0] |=
+                        HEADER_TCODE(TCODE_READ_QUADLET_RESPONSE);
+                if (payload != NULL)
+                        response->header[3] = *(u32 *)payload;
+                else
+                        response->header[3] = 0;
+                response->header_length = 16;
+                response->payload_length = 0;
+                break;
+
+        case TCODE_READ_BLOCK_REQUEST:
+        case TCODE_LOCK_REQUEST:
+                response->header[0] |= HEADER_TCODE(tcode + 2);
+                response->header[3] =
+                        HEADER_DATA_LENGTH(length) |
+                        HEADER_EXTENDED_TCODE(extended_tcode);
+                response->header_length = 16;
+                response->payload = payload;
+                response->payload_length = length;
+                break;
+
+        default:
+                BUG();
+                return;
+        }
+}
+EXPORT_SYMBOL(fw_fill_response);
+
+static struct fw_request *
+allocate_request(struct fw_packet *p)
+{
+        struct fw_request *request;
+        u32 *data, length;
+        int request_tcode, t;
+
+        request_tcode = HEADER_GET_TCODE(p->header[0]);
+        switch (request_tcode) {
+        case TCODE_WRITE_QUADLET_REQUEST:
+                data = &p->header[3];
+                length = 4;
+                break;
+
+        case TCODE_WRITE_BLOCK_REQUEST:
+        case TCODE_LOCK_REQUEST:
+                data = p->payload;
+                length = HEADER_GET_DATA_LENGTH(p->header[3]);
+                break;
+
+        case TCODE_READ_QUADLET_REQUEST:
+                data = NULL;
+                length = 4;
+                break;
+
+        case TCODE_READ_BLOCK_REQUEST:
+                data = NULL;
+                length = HEADER_GET_DATA_LENGTH(p->header[3]);
+                break;
+
+        default:
+                BUG();
+                return NULL;
+        }
+
+        request = kmalloc(sizeof(*request) + length, GFP_ATOMIC);
+        if (request == NULL)
+                return NULL;
+
+        t = (p->timestamp & 0x1fff) + 4000;
+        if (t >= 8000)
+                t = (p->timestamp & ~0x1fff) + 0x2000 + t - 8000;
+        else
+                t = (p->timestamp & ~0x1fff) + t;
+
+        request->response.speed = p->speed;
+        request->response.timestamp = t;
+        request->response.generation = p->generation;
+        request->response.ack = 0;
+        request->response.callback = free_response_callback;
+        request->ack = p->ack;
+        request->length = length;
+        if (data)
+                memcpy(request->data, data, length);
+
+        memcpy(request->request_header, p->header, sizeof(p->header));
+
+        return request;
+}
+
+void
+fw_send_response(struct fw_card *card, struct fw_request *request, int rcode)
+{
+        /*
+         * Broadcast packets are reported as ACK_COMPLETE, so this
+         * check is sufficient to ensure we don't send response to
+         * broadcast packets or posted writes.
+         */
+        if (request->ack != ACK_PENDING)
+                return;
+
+        if (rcode == RCODE_COMPLETE)
+                fw_fill_response(&request->response, request->request_header,
+                                 rcode, request->data, request->length);
+        else
+                fw_fill_response(&request->response, request->request_header,
+                                 rcode, NULL, 0);
+
+        card->driver->send_response(card, &request->response);
+}
+EXPORT_SYMBOL(fw_send_response);
+
+void
+fw_core_handle_request(struct fw_card *card, struct fw_packet *p)
+{
+        struct fw_address_handler *handler;
+        struct fw_request *request;
+        unsigned long long offset;
+        unsigned long flags;
+        int tcode, destination, source;
+
+        if (p->payload_length > 2048) {
+                /* FIXME: send error response. */
+                return;
+        }
+
+        if (p->ack != ACK_PENDING && p->ack != ACK_COMPLETE)
+                return;
+
+        request = allocate_request(p);
+        if (request == NULL) {
+                /* FIXME: send statically allocated busy packet. */
+                return;
+        }
+
+        offset      =
+                ((unsigned long long)
+                 HEADER_GET_OFFSET_HIGH(p->header[1]) << 32) | p->header[2];
+        tcode       = HEADER_GET_TCODE(p->header[0]);
+        destination = HEADER_GET_DESTINATION(p->header[0]);
+        source      = HEADER_GET_SOURCE(p->header[0]);
+
+        spin_lock_irqsave(&address_handler_lock, flags);
+        handler = lookup_enclosing_address_handler(&address_handler_list,
+                                                   offset, request->length);
+        spin_unlock_irqrestore(&address_handler_lock, flags);
+
+        /*
+         * FIXME: lookup the fw_node corresponding to the sender of
+         * this request and pass that to the address handler instead
+         * of the node ID.  We may also want to move the address
+         * allocations to fw_node so we only do this callback if the
+         * upper layers registered it for this node.
+         */
+
+        if (handler == NULL)
+                fw_send_response(card, request, RCODE_ADDRESS_ERROR);
+        else
+                handler->address_callback(card, request,
+                                          tcode, destination, source,
+                                          p->generation, p->speed, offset,
+                                          request->data, request->length,
+                                          handler->callback_data);
+}
+EXPORT_SYMBOL(fw_core_handle_request);
+
+void
+fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
+{
+        struct fw_transaction *t;
+        unsigned long flags;
+        u32 *data;
+        size_t data_length;
+        int tcode, tlabel, destination, source, rcode;
+
+        tcode       = HEADER_GET_TCODE(p->header[0]);
+        tlabel      = HEADER_GET_TLABEL(p->header[0]);
+        destination = HEADER_GET_DESTINATION(p->header[0]);
+        source      = HEADER_GET_SOURCE(p->header[1]);
+        rcode       = HEADER_GET_RCODE(p->header[1]);
+
+        spin_lock_irqsave(&card->lock, flags);
+        list_for_each_entry(t, &card->transaction_list, link) {
+                if (t->node_id == source && t->tlabel == tlabel) {
+                        list_del(&t->link);
+                        card->tlabel_mask &= ~(1 << t->tlabel);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        if (&t->link == &card->transaction_list) {
+                fw_notify("Unsolicited response (source %x, tlabel %x)\n",
+                          source, tlabel);
+                return;
+        }
+
+        /*
+         * FIXME: sanity check packet, is length correct, does tcodes
+         * and addresses match.
+         */
+
+        switch (tcode) {
+        case TCODE_READ_QUADLET_RESPONSE:
+                data = (u32 *) &p->header[3];
+                data_length = 4;
+                break;
+
+        case TCODE_WRITE_RESPONSE:
+                data = NULL;
+                data_length = 0;
+                break;
+
+        case TCODE_READ_BLOCK_RESPONSE:
+        case TCODE_LOCK_RESPONSE:
+                data = p->payload;
+                data_length = HEADER_GET_DATA_LENGTH(p->header[3]);
+                break;
+
+        default:
+                /* Should never happen, this is just to shut up gcc. */
+                data = NULL;
+                data_length = 0;
+                break;
+        }
+
+        t->callback(card, rcode, data, data_length, t->callback_data);
+}
+EXPORT_SYMBOL(fw_core_handle_response);
+
+const struct fw_address_region topology_map_region =
+        { .start = 0xfffff0001000ull, .end = 0xfffff0001400ull, };
+
+static void
+handle_topology_map(struct fw_card *card, struct fw_request *request,
+                    int tcode, int destination, int source,
+                    int generation, int speed,
+                    unsigned long long offset,
+                    void *payload, size_t length, void *callback_data)
+{
+        int i, start, end;
+        u32 *map;
+
+        if (!TCODE_IS_READ_REQUEST(tcode)) {
+                fw_send_response(card, request, RCODE_TYPE_ERROR);
+                return;
+        }
+
+        if ((offset & 3) > 0 || (length & 3) > 0) {
+                fw_send_response(card, request, RCODE_ADDRESS_ERROR);
+                return;
+        }
+
+        start = (offset - topology_map_region.start) / 4;
+        end = start + length / 4;
+        map = payload;
+
+        for (i = 0; i < length / 4; i++)
+                map[i] = cpu_to_be32(card->topology_map[start + i]);
+
+        fw_send_response(card, request, RCODE_COMPLETE);
+}
+
+static struct fw_address_handler topology_map = {
+        .length                 = 0x200,
+        .address_callback       = handle_topology_map,
+};
+
+const struct fw_address_region registers_region =
+        { .start = 0xfffff0000000ull, .end = 0xfffff0000400ull, };
+
+static void
+handle_registers(struct fw_card *card, struct fw_request *request,
+                 int tcode, int destination, int source,
+                 int generation, int speed,
+                 unsigned long long offset,
+                 void *payload, size_t length, void *callback_data)
+{
+        int reg = offset - CSR_REGISTER_BASE;
+        unsigned long long bus_time;
+        __be32 *data = payload;
+
+        switch (reg) {
+        case CSR_CYCLE_TIME:
+        case CSR_BUS_TIME:
+                if (!TCODE_IS_READ_REQUEST(tcode) || length != 4) {
+                        fw_send_response(card, request, RCODE_TYPE_ERROR);
+                        break;
+                }
+
+                bus_time = card->driver->get_bus_time(card);
+                if (reg == CSR_CYCLE_TIME)
+                        *data = cpu_to_be32(bus_time);
+                else
+                        *data = cpu_to_be32(bus_time >> 25);
+                fw_send_response(card, request, RCODE_COMPLETE);
+                break;
+
+        case CSR_BUS_MANAGER_ID:
+        case CSR_BANDWIDTH_AVAILABLE:
+        case CSR_CHANNELS_AVAILABLE_HI:
+        case CSR_CHANNELS_AVAILABLE_LO:
+                /*
+                 * FIXME: these are handled by the OHCI hardware and
+                 * the stack never sees these request. If we add
+                 * support for a new type of controller that doesn't
+                 * handle this in hardware we need to deal with these
+                 * transactions.
+                 */
+                BUG();
+                break;
+
+        case CSR_BUSY_TIMEOUT:
+                /* FIXME: Implement this. */
+        default:
+                fw_send_response(card, request, RCODE_ADDRESS_ERROR);
+                break;
+        }
+}
+
+static struct fw_address_handler registers = {
+        .length                 = 0x400,
+        .address_callback       = handle_registers,
+};
+
+MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
+MODULE_DESCRIPTION("Core IEEE1394 transaction logic");
+MODULE_LICENSE("GPL");
+
+static const u32 vendor_textual_descriptor[] = {
+        /* textual descriptor leaf () */
+        0x00060000,
+        0x00000000,
+        0x00000000,
+        0x4c696e75,             /* L i n u */
+        0x78204669,             /* x   F i */
+        0x72657769,             /* r e w i */
+        0x72650000,             /* r e     */
+};
+
+static const u32 model_textual_descriptor[] = {
+        /* model descriptor leaf () */
+        0x00030000,
+        0x00000000,
+        0x00000000,
+        0x4a756a75,             /* J u j u */
+};
+
+static struct fw_descriptor vendor_id_descriptor = {
+        .length = ARRAY_SIZE(vendor_textual_descriptor),
+        .immediate = 0x03d00d1e,
+        .key = 0x81000000,
+        .data = vendor_textual_descriptor,
+};
+
+static struct fw_descriptor model_id_descriptor = {
+        .length = ARRAY_SIZE(model_textual_descriptor),
+        .immediate = 0x17000001,
+        .key = 0x81000000,
+        .data = model_textual_descriptor,
+};
+
+static int __init fw_core_init(void)
+{
+        int retval;
+
+        retval = bus_register(&fw_bus_type);
+        if (retval < 0)
+                return retval;
+
+        fw_cdev_major = register_chrdev(0, "firewire", &fw_device_ops);
+        if (fw_cdev_major < 0) {
+                bus_unregister(&fw_bus_type);
+                return fw_cdev_major;
+        }
+
+        retval = fw_core_add_address_handler(&topology_map,
+                                             &topology_map_region);
+        BUG_ON(retval < 0);
+
+        retval = fw_core_add_address_handler(&registers,
+                                             &registers_region);
+        BUG_ON(retval < 0);
+
+        /* Add the vendor textual descriptor. */
+        retval = fw_core_add_descriptor(&vendor_id_descriptor);
+        BUG_ON(retval < 0);
+        retval = fw_core_add_descriptor(&model_id_descriptor);
+        BUG_ON(retval < 0);
+
+        return 0;
+}
+
+static void __exit fw_core_cleanup(void)
+{
+        unregister_chrdev(fw_cdev_major, "firewire");
+        bus_unregister(&fw_bus_type);
+}
+
+module_init(fw_core_init);
+module_exit(fw_core_cleanup);
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
new file mode 100644
index 000000000000..acdc3be38c61
--- /dev/null
+++ b/drivers/firewire/fw-transaction.h
@@ -0,0 +1,458 @@
+/*
+ * Copyright (C) 2003-2006 Kristian Hoegsberg <krh@bitplanet.net>
+ *
+ * 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.
+ */
+
+#ifndef __fw_transaction_h
+#define __fw_transaction_h
+
+#include <linux/device.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/fs.h>
+#include <linux/dma-mapping.h>
+#include <linux/firewire-constants.h>
+
+#define TCODE_IS_READ_REQUEST(tcode)    (((tcode) & ~1) == 4)
+#define TCODE_IS_BLOCK_PACKET(tcode)    (((tcode) &  1) != 0)
+#define TCODE_IS_REQUEST(tcode)         (((tcode) &  2) == 0)
+#define TCODE_IS_RESPONSE(tcode)        (((tcode) &  2) != 0)
+#define TCODE_HAS_REQUEST_DATA(tcode)   (((tcode) & 12) != 4)
+#define TCODE_HAS_RESPONSE_DATA(tcode)  (((tcode) & 12) != 0)
+
+#define LOCAL_BUS 0xffc0
+
+#define SELFID_PORT_CHILD       0x3
+#define SELFID_PORT_PARENT      0x2
+#define SELFID_PORT_NCONN       0x1
+#define SELFID_PORT_NONE        0x0
+
+#define PHY_PACKET_CONFIG       0x0
+#define PHY_PACKET_LINK_ON      0x1
+#define PHY_PACKET_SELF_ID      0x2
+
+/* Bit fields _within_ the PHY registers. */
+#define PHY_LINK_ACTIVE         0x80
+#define PHY_CONTENDER           0x40
+#define PHY_BUS_RESET           0x40
+#define PHY_BUS_SHORT_RESET     0x40
+
+#define CSR_REGISTER_BASE               0xfffff0000000ULL
+
+/* register offsets relative to CSR_REGISTER_BASE */
+#define CSR_STATE_CLEAR                 0x0
+#define CSR_STATE_SET                   0x4
+#define CSR_NODE_IDS                    0x8
+#define CSR_RESET_START                 0xc
+#define CSR_SPLIT_TIMEOUT_HI            0x18
+#define CSR_SPLIT_TIMEOUT_LO            0x1c
+#define CSR_CYCLE_TIME                  0x200
+#define CSR_BUS_TIME                    0x204
+#define CSR_BUSY_TIMEOUT                0x210
+#define CSR_BUS_MANAGER_ID              0x21c
+#define CSR_BANDWIDTH_AVAILABLE         0x220
+#define CSR_CHANNELS_AVAILABLE          0x224
+#define CSR_CHANNELS_AVAILABLE_HI       0x224
+#define CSR_CHANNELS_AVAILABLE_LO       0x228
+#define CSR_BROADCAST_CHANNEL           0x234
+#define CSR_CONFIG_ROM                  0x400
+#define CSR_CONFIG_ROM_END              0x800
+#define CSR_FCP_COMMAND                 0xB00
+#define CSR_FCP_RESPONSE                0xD00
+#define CSR_FCP_END                     0xF00
+#define CSR_TOPOLOGY_MAP                0x1000
+#define CSR_TOPOLOGY_MAP_END            0x1400
+#define CSR_SPEED_MAP                   0x2000
+#define CSR_SPEED_MAP_END               0x3000
+
+#define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
+#define fw_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
+#define fw_debug(s, args...) printk(KERN_DEBUG KBUILD_MODNAME ": " s, ## args)
+
+static inline void
+fw_memcpy_from_be32(void *_dst, void *_src, size_t size)
+{
+        u32 *dst = _dst;
+        u32 *src = _src;
+        int i;
+
+        for (i = 0; i < size / 4; i++)
+                dst[i] = cpu_to_be32(src[i]);
+}
+
+static inline void
+fw_memcpy_to_be32(void *_dst, void *_src, size_t size)
+{
+        fw_memcpy_from_be32(_dst, _src, size);
+}
+
+struct fw_card;
+struct fw_packet;
+struct fw_node;
+struct fw_request;
+
+struct fw_descriptor {
+        struct list_head link;
+        size_t length;
+        u32 immediate;
+        u32 key;
+        const u32 *data;
+};
+
+int fw_core_add_descriptor(struct fw_descriptor *desc);
+void fw_core_remove_descriptor(struct fw_descriptor *desc);
+
+typedef void (*fw_packet_callback_t)(struct fw_packet *packet,
+                                     struct fw_card *card, int status);
+
+typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode,
+                                          void *data,
+                                          size_t length,
+                                          void *callback_data);
+
+typedef void (*fw_address_callback_t)(struct fw_card *card,
+                                      struct fw_request *request,
+                                      int tcode, int destination, int source,
+                                      int generation, int speed,
+                                      unsigned long long offset,
+                                      void *data, size_t length,
+                                      void *callback_data);
+
+typedef void (*fw_bus_reset_callback_t)(struct fw_card *handle,
+                                        int node_id, int generation,
+                                        u32 *self_ids,
+                                        int self_id_count,
+                                        void *callback_data);
+
+struct fw_packet {
+        int speed;
+        int generation;
+        u32 header[4];
+        size_t header_length;
+        void *payload;
+        size_t payload_length;
+        u32 timestamp;
+
+        /*
+         * This callback is called when the packet transmission has
+         * completed; for successful transmission, the status code is
+         * the ack received from the destination, otherwise it's a
+         * negative errno: ENOMEM, ESTALE, ETIMEDOUT, ENODEV, EIO.
+         * The callback can be called from tasklet context and thus
+         * must never block.
+         */
+        fw_packet_callback_t callback;
+        int ack;
+        struct list_head link;
+        void *driver_data;
+};
+
+struct fw_transaction {
+        int node_id; /* The generation is implied; it is always the current. */
+        int tlabel;
+        int timestamp;
+        struct list_head link;
+
+        struct fw_packet packet;
+
+        /*
+         * The data passed to the callback is valid only during the
+         * callback.
+         */
+        fw_transaction_callback_t callback;
+        void *callback_data;
+};
+
+static inline struct fw_packet *
+fw_packet(struct list_head *l)
+{
+        return list_entry(l, struct fw_packet, link);
+}
+
+struct fw_address_handler {
+        u64 offset;
+        size_t length;
+        fw_address_callback_t address_callback;
+        void *callback_data;
+        struct list_head link;
+};
+
+
+struct fw_address_region {
+        u64 start;
+        u64 end;
+};
+
+extern const struct fw_address_region fw_low_memory_region;
+extern const struct fw_address_region fw_high_memory_region;
+extern const struct fw_address_region fw_private_region;
+extern const struct fw_address_region fw_csr_region;
+extern const struct fw_address_region fw_unit_space_region;
+
+int fw_core_add_address_handler(struct fw_address_handler *handler,
+                                const struct fw_address_region *region);
+void fw_core_remove_address_handler(struct fw_address_handler *handler);
+void fw_fill_response(struct fw_packet *response, u32 *request_header,
+                      int rcode, void *payload, size_t length);
+void fw_send_response(struct fw_card *card,
+                      struct fw_request *request, int rcode);
+
+extern struct bus_type fw_bus_type;
+
+struct fw_card {
+        const struct fw_card_driver *driver;
+        struct device *device;
+        struct kref kref;
+
+        int node_id;
+        int generation;
+        /* This is the generation used for timestamping incoming requests. */
+        int request_generation;
+        int current_tlabel, tlabel_mask;
+        struct list_head transaction_list;
+        struct timer_list flush_timer;
+        unsigned long reset_jiffies;
+
+        unsigned long long guid;
+        int max_receive;
+        int link_speed;
+        int config_rom_generation;
+
+        /*
+         * We need to store up to 4 self ID for a maximum of 63
+         * devices plus 3 words for the topology map header.
+         */
+        int self_id_count;
+        u32 topology_map[252 + 3];
+
+        spinlock_t lock; /* Take this lock when handling the lists in
+                          * this struct. */
+        struct fw_node *local_node;
+        struct fw_node *root_node;
+        struct fw_node *irm_node;
+        int color;
+        int gap_count;
+        int topology_type;
+
+        int index;
+
+        struct list_head link;
+
+        /* Work struct for BM duties. */
+        struct delayed_work work;
+        int bm_retries;
+        int bm_generation;
+};
+
+struct fw_card *fw_card_get(struct fw_card *card);
+void fw_card_put(struct fw_card *card);
+
+/*
+ * The iso packet format allows for an immediate header/payload part
+ * stored in 'header' immediately after the packet info plus an
+ * indirect payload part that is pointer to by the 'payload' field.
+ * Applications can use one or the other or both to implement simple
+ * low-bandwidth streaming (e.g. audio) or more advanced
+ * scatter-gather streaming (e.g. assembling video frame automatically).
+ */
+
+struct fw_iso_packet {
+        u16 payload_length;     /* Length of indirect payload. */
+        u32 interrupt : 1;      /* Generate interrupt on this packet */
+        u32 skip : 1;           /* Set to not send packet at all. */
+        u32 tag : 2;
+        u32 sy : 4;
+        u32 header_length : 8;  /* Length of immediate header. */
+        u32 header[0];
+};
+
+#define FW_ISO_CONTEXT_TRANSMIT 0
+#define FW_ISO_CONTEXT_RECEIVE  1
+
+#define FW_ISO_CONTEXT_MATCH_TAG0        1
+#define FW_ISO_CONTEXT_MATCH_TAG1        2
+#define FW_ISO_CONTEXT_MATCH_TAG2        4
+#define FW_ISO_CONTEXT_MATCH_TAG3        8
+#define FW_ISO_CONTEXT_MATCH_ALL_TAGS   15
+
+struct fw_iso_context;
+
+typedef void (*fw_iso_callback_t)(struct fw_iso_context *context,
+                                  u32 cycle,
+                                  size_t header_length,
+                                  void *header,
+                                  void *data);
+
+/*
+ * An iso buffer is just a set of pages mapped for DMA in the
+ * specified direction.  Since the pages are to be used for DMA, they
+ * are not mapped into the kernel virtual address space.  We store the
+ * DMA address in the page private. The helper function
+ * fw_iso_buffer_map() will map the pages into a given vma.
+ */
+
+struct fw_iso_buffer {
+        enum dma_data_direction direction;
+        struct page **pages;
+        int page_count;
+};
+
+struct fw_iso_context {
+        struct fw_card *card;
+        int type;
+        int channel;
+        int speed;
+        size_t header_size;
+        fw_iso_callback_t callback;
+        void *callback_data;
+};
+
+int
+fw_iso_buffer_init(struct fw_iso_buffer *buffer,
+                   struct fw_card *card,
+                   int page_count,
+                   enum dma_data_direction direction);
+int
+fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma);
+void
+fw_iso_buffer_destroy(struct fw_iso_buffer *buffer, struct fw_card *card);
+
+struct fw_iso_context *
+fw_iso_context_create(struct fw_card *card, int type,
+                      int channel, int speed, size_t header_size,
+                      fw_iso_callback_t callback, void *callback_data);
+
+void
+fw_iso_context_destroy(struct fw_iso_context *ctx);
+
+int
+fw_iso_context_queue(struct fw_iso_context *ctx,
+                     struct fw_iso_packet *packet,
+                     struct fw_iso_buffer *buffer,
+                     unsigned long payload);
+
+int
+fw_iso_context_start(struct fw_iso_context *ctx,
+                     int cycle, int sync, int tags);
+
+int
+fw_iso_context_stop(struct fw_iso_context *ctx);
+
+struct fw_card_driver {
+        const char *name;
+
+        /*
+         * Enable the given card with the given initial config rom.
+         * This function is expected to activate the card, and either
+         * enable the PHY or set the link_on bit and initiate a bus
+         * reset.
+         */
+        int (*enable)(struct fw_card *card, u32 *config_rom, size_t length);
+
+        int (*update_phy_reg)(struct fw_card *card, int address,
+                              int clear_bits, int set_bits);
+
+        /*
+         * Update the config rom for an enabled card.  This function
+         * should change the config rom that is presented on the bus
+         * an initiate a bus reset.
+         */
+        int (*set_config_rom)(struct fw_card *card,
+                              u32 *config_rom, size_t length);
+
+        void (*send_request)(struct fw_card *card, struct fw_packet *packet);
+        void (*send_response)(struct fw_card *card, struct fw_packet *packet);
+        /* Calling cancel is valid once a packet has been submitted. */
+        int (*cancel_packet)(struct fw_card *card, struct fw_packet *packet);
+
+        /*
+         * Allow the specified node ID to do direct DMA out and in of
+         * host memory.  The card will disable this for all node when
+         * a bus reset happens, so driver need to reenable this after
+         * bus reset.  Returns 0 on success, -ENODEV if the card
+         * doesn't support this, -ESTALE if the generation doesn't
+         * match.
+         */
+        int (*enable_phys_dma)(struct fw_card *card,
+                               int node_id, int generation);
+
+        u64 (*get_bus_time)(struct fw_card *card);
+
+        struct fw_iso_context *
+        (*allocate_iso_context)(struct fw_card *card,
+                                int type, size_t header_size);
+        void (*free_iso_context)(struct fw_iso_context *ctx);
+
+        int (*start_iso)(struct fw_iso_context *ctx,
+                         s32 cycle, u32 sync, u32 tags);
+
+        int (*queue_iso)(struct fw_iso_context *ctx,
+                         struct fw_iso_packet *packet,
+                         struct fw_iso_buffer *buffer,
+                         unsigned long payload);
+
+        int (*stop_iso)(struct fw_iso_context *ctx);
+};
+
+int
+fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);
+
+void
+fw_send_request(struct fw_card *card, struct fw_transaction *t,
+                int tcode, int node_id, int generation, int speed,
+                unsigned long long offset,
+                void *data, size_t length,
+                fw_transaction_callback_t callback, void *callback_data);
+
+int fw_cancel_transaction(struct fw_card *card,
+                          struct fw_transaction *transaction);
+
+void fw_flush_transactions(struct fw_card *card);
+
+void fw_send_phy_config(struct fw_card *card,
+                        int node_id, int generation, int gap_count);
+
+/*
+ * Called by the topology code to inform the device code of node
+ * activity; found, lost, or updated nodes.
+ */
+void
+fw_node_event(struct fw_card *card, struct fw_node *node, int event);
+
+/* API used by card level drivers */
+
+void
+fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
+                   struct device *device);
+int
+fw_card_add(struct fw_card *card,
+            u32 max_receive, u32 link_speed, u64 guid);
+
+void
+fw_core_remove_card(struct fw_card *card);
+
+void
+fw_core_handle_bus_reset(struct fw_card *card,
+                         int node_id, int generation,
+                         int self_id_count, u32 *self_ids);
+void
+fw_core_handle_request(struct fw_card *card, struct fw_packet *request);
+
+void
+fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);
+
+#endif /* __fw_transaction_h */
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 62e21cc73938..6ec04e79f685 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <asm/unaligned.h>
 #include <asm/byteorder.h>
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index a19b65ed3119..7f817897b178 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -240,11 +240,94 @@ static inline void hidinput_pb_setup(struct input_dev *input)
 }
 #endif
 
+static inline int match_scancode(int code, int scancode)
+{
+        if (scancode == 0)
+                return 1;
+        return ((code & (HID_USAGE_PAGE | HID_USAGE)) == scancode);
+}
+
+static inline int match_keycode(int code, int keycode)
+{
+        if (keycode == 0)
+                return 1;
+        return (code == keycode);
+}
+
+static struct hid_usage *hidinput_find_key(struct hid_device *hid,
+                int scancode, int keycode)
+{
+        int i, j, k;
+        struct hid_report *report;
+        struct hid_usage *usage;
+
+        for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++) {
+                list_for_each_entry(report, &hid->report_enum[k].report_list, list) {
+                        for (i = 0; i < report->maxfield; i++) {
+                                for ( j = 0; j < report->field[i]->maxusage; j++) {
+                                        usage = report->field[i]->usage + j;
+                                        if (usage->type == EV_KEY &&
+                                                match_scancode(usage->hid, scancode) &&
+                                                match_keycode(usage->code, keycode))
+                                                return usage;
+                                }
+                        }
+                }
+        }
+        return NULL;
+}
+
+static int hidinput_getkeycode(struct input_dev *dev, int scancode,
+                                int *keycode)
+{
+        struct hid_device *hid = dev->private;
+        struct hid_usage *usage;
+        
+        usage = hidinput_find_key(hid, scancode, 0);
+        if (usage) {
+                *keycode = usage->code;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+static int hidinput_setkeycode(struct input_dev *dev, int scancode,
+                                int keycode)
+{
+        struct hid_device *hid = dev->private;
+        struct hid_usage *usage;
+        int old_keycode;
+        
+        if (keycode < 0 || keycode > KEY_MAX)
+                return -EINVAL;
+        
+        usage = hidinput_find_key(hid, scancode, 0);
+        if (usage) {
+                old_keycode = usage->code;
+                usage->code = keycode;
+                
+                clear_bit(old_keycode, dev->keybit);
+                set_bit(usage->code, dev->keybit);
+#ifdef CONFIG_HID_DEBUG
+                printk (KERN_DEBUG "Assigned keycode %d to HID usage code %x\n", keycode, scancode);
+#endif
+                /* Set the keybit for the old keycode if the old keycode is used
+                 * by another key */
+                if (hidinput_find_key (hid, 0, old_keycode))
+                        set_bit(old_keycode, dev->keybit);
+                
+                return 0;
+        }
+        
+        return -EINVAL;
+}
+
+
 static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_field *field,
                                      struct hid_usage *usage)
 {
         struct input_dev *input = hidinput->input;
-        struct hid_device *device = input->private;
+        struct hid_device *device = input_get_drvdata(input);
         int max = 0, code;
         unsigned long *bit = NULL;
 
@@ -553,6 +636,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x1015: map_key_clear(KEY_RECORD);         break;
                                 case 0x1016: map_key_clear(KEY_PLAYER);         break;
                                 case 0x1017: map_key_clear(KEY_EJECTCD);        break;
+                                case 0x1018: map_key_clear(KEY_MEDIA);          break;
                                 case 0x1019: map_key_clear(KEY_PROG1);          break;
                                 case 0x101a: map_key_clear(KEY_PROG2);          break;
                                 case 0x101b: map_key_clear(KEY_PROG3);          break;
@@ -560,9 +644,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
                                 case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
                                 case 0x1023: map_key_clear(KEY_CLOSE);          break;
+                                case 0x1027: map_key_clear(KEY_MENU);           break;
                                 /* this one is marked as 'Rotate' */
                                 case 0x1028: map_key_clear(KEY_ANGLE);          break;
                                 case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
+                                case 0x102a: map_key_clear(KEY_BACK);           break;
+                                case 0x102b: map_key_clear(KEY_CYCLEWINDOWS);   break;
                                 case 0x1041: map_key_clear(KEY_BATTERY);        break;
                                 case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
                                 case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
@@ -855,13 +942,15 @@ EXPORT_SYMBOL_GPL(hidinput_find_field);
 
 static int hidinput_open(struct input_dev *dev)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
+
         return hid->hid_open(hid);
 }
 
 static void hidinput_close(struct input_dev *dev)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
+
         hid->hid_close(hid);
 }
 
@@ -909,10 +998,12 @@ int hidinput_connect(struct hid_device *hid)
                                         return -1;
                                 }
 
-                                input_dev->private = hid;
+                                input_set_drvdata(input_dev, hid);
                                 input_dev->event = hid->hidinput_input_event;
                                 input_dev->open = hidinput_open;
                                 input_dev->close = hidinput_close;
+                                input_dev->setkeycode = hidinput_setkeycode;
+                                input_dev->getkeycode = hidinput_getkeycode;
 
                                 input_dev->name = hid->name;
                                 input_dev->phys = hid->phys;
@@ -921,7 +1012,7 @@ int hidinput_connect(struct hid_device *hid)
                                 input_dev->id.vendor  = hid->vendor;
                                 input_dev->id.product = hid->product;
                                 input_dev->id.version = hid->version;
-                                input_dev->cdev.dev = hid->dev;
+                                input_dev->dev.parent = hid->dev;
                                 hidinput->input = input_dev;
                                 list_add_tail(&hidinput->list, &hid->inputs);
                         }
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 7c87bdc538bc..1b4b572f899b 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -25,12 +25,12 @@ comment "Input core support is needed for USB HID input layer or HIDBP support"
         depends on USB_HID && INPUT=n
 
 config USB_HIDINPUT_POWERBOOK
-        bool "Enable support for iBook/PowerBook special keys"
+        bool "Enable support for iBook/PowerBook/MacBook/MacBookPro special keys"
         default n
         depends on USB_HID
         help
           Say Y here if you want support for the special keys (Fn, Numlock) on
-          Apple iBooks and PowerBooks.
+          Apple iBooks, PowerBooks, MacBooks and MacBook Pros.
 
           If unsure, say N.
 
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 91d610358d57..d91b9dac6dff 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -446,7 +446,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
 static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
         struct hid_field *field;
         int offset;
 
@@ -626,14 +626,10 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid)
 {
         struct usbhid_device *usbhid = hid->driver_data;
 
-        if (usbhid->inbuf)
-                usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);
-        if (usbhid->outbuf)
-                usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);
-        if (usbhid->cr)
-                usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma);
-        if (usbhid->ctrlbuf)
-                usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
+        usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);
+        usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);
+        usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma);
+        usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
 }
 
 /*
@@ -692,6 +688,30 @@ static void hid_fixup_logitech_descriptor(unsigned char *rdesc, int rsize)
         }
 }
 
+/*
+ * Some USB barcode readers from cypress have usage min and usage max in
+ * the wrong order
+ */
+static void hid_fixup_cypress_descriptor(unsigned char *rdesc, int rsize)
+{
+        short fixed = 0;
+        int i;
+
+        for (i = 0; i < rsize - 4; i++) {
+                if (rdesc[i] == 0x29 && rdesc [i+2] == 0x19) {
+                        unsigned char tmp;
+
+                        rdesc[i] = 0x19; rdesc[i+2] = 0x29;
+                        tmp = rdesc[i+3];
+                        rdesc[i+3] = rdesc[i+1];
+                        rdesc[i+1] = tmp;
+                }
+        }
+
+        if (fixed)
+                info("Fixing up Cypress report descriptor");
+}
+
 static struct hid_device *usb_hid_configure(struct usb_interface *intf)
 {
         struct usb_host_interface *interface = intf->cur_altsetting;
@@ -758,6 +778,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         if (quirks & HID_QUIRK_LOGITECH_DESCRIPTOR)
                 hid_fixup_logitech_descriptor(rdesc, rsize);
 
+        if (quirks & HID_QUIRK_SWAPPED_MIN_MAX)
+                hid_fixup_cypress_descriptor(rdesc, rsize);
+
 #ifdef CONFIG_HID_DEBUG
         printk(KERN_DEBUG __FILE__ ": report descriptor (size %u, read %d) = ", rsize, n);
         for (n = 0; n < rsize; n++)
diff --git a/drivers/hid/usbhid/hid-lgff.c b/drivers/hid/usbhid/hid-lgff.c
index 92d2553f17b6..c5cd4107d6af 100644
--- a/drivers/hid/usbhid/hid-lgff.c
+++ b/drivers/hid/usbhid/hid-lgff.c
@@ -60,7 +60,7 @@ static const struct dev_type devices[] = {
 
 static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
         struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
         struct hid_report *report = list_entry(report_list->next, struct hid_report, list);
         int x, y;
diff --git a/drivers/hid/usbhid/hid-plff.c b/drivers/hid/usbhid/hid-plff.c
index 76d2e6e14db4..d6a8f2b49bd2 100644
--- a/drivers/hid/usbhid/hid-plff.c
+++ b/drivers/hid/usbhid/hid-plff.c
@@ -37,7 +37,7 @@ struct plff_device {
 static int hid_plff_play(struct input_dev *dev, void *data,
                          struct ff_effect *effect)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
         struct plff_device *plff = data;
         int left, right;
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 17a87555e32f..f6c4145dc202 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -92,6 +92,8 @@
 #define USB_DEVICE_ID_CYPRESS_MOUSE     0x0001
 #define USB_DEVICE_ID_CYPRESS_HIDCOM    0x5500
 #define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE        0x7417
+#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
+#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
 
 #define USB_VENDOR_ID_DELL              0x413c
 #define USB_DEVICE_ID_DELL_W7658        0x2005
@@ -193,6 +195,7 @@
 
 #define USB_VENDOR_ID_LOGITECH          0x046d
 #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
+#define USB_DEVICE_ID_LOGITECH_WHEEL    0xc294
 #define USB_DEVICE_ID_S510_RECEIVER     0xc50c
 #define USB_DEVICE_ID_S510_RECEIVER_2   0xc517
 #define USB_DEVICE_ID_MX3000_RECEIVER   0xc513
@@ -422,6 +425,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
@@ -445,6 +449,9 @@ static const struct hid_blacklist {
 
         { USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },
 
+        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_SWAPPED_MIN_MAX },
+        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_SWAPPED_MIN_MAX },
+
         { 0, 0 }
 };
 
diff --git a/drivers/hid/usbhid/hid-tmff.c b/drivers/hid/usbhid/hid-tmff.c
index ab67331620d0..ab5ba6ef891c 100644
--- a/drivers/hid/usbhid/hid-tmff.c
+++ b/drivers/hid/usbhid/hid-tmff.c
@@ -59,7 +59,7 @@ static inline int hid_tmff_scale(unsigned int in, int minimum, int maximum)
 
 static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
         struct tmff_device *tmff = data;
         int left, right;        /* Rumbling */
 
diff --git a/drivers/hid/usbhid/hid-zpff.c b/drivers/hid/usbhid/hid-zpff.c
index 7bd8238ca212..a7fbffcdaf36 100644
--- a/drivers/hid/usbhid/hid-zpff.c
+++ b/drivers/hid/usbhid/hid-zpff.c
@@ -37,7 +37,7 @@ struct zpff_device {
 static int hid_zpff_play(struct input_dev *dev, void *data,
                          struct ff_effect *effect)
 {
-        struct hid_device *hid = dev->private;
+        struct hid_device *hid = input_get_drvdata(dev);
         struct zpff_device *zpff = data;
         int left, right;
 
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index a8b3d66cd498..488d61bdbf2c 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -51,6 +51,7 @@ struct hiddev {
         wait_queue_head_t wait;
         struct hid_device *hid;
         struct list_head list;
+        spinlock_t list_lock;
 };
 
 struct hiddev_list {
@@ -161,7 +162,9 @@ static void hiddev_send_event(struct hid_device *hid,
 {
         struct hiddev *hiddev = hid->hiddev;
         struct hiddev_list *list;
+        unsigned long flags;
 
+        spin_lock_irqsave(&hiddev->list_lock, flags);
         list_for_each_entry(list, &hiddev->list, node) {
                 if (uref->field_index != HID_FIELD_INDEX_NONE ||
                     (list->flags & HIDDEV_FLAG_REPORT) != 0) {
@@ -171,6 +174,7 @@ static void hiddev_send_event(struct hid_device *hid,
                         kill_fasync(&list->fasync, SIGIO, POLL_IN);
                 }
         }
+        spin_unlock_irqrestore(&hiddev->list_lock, flags);
 
         wake_up_interruptible(&hiddev->wait);
 }
@@ -235,9 +239,13 @@ static int hiddev_fasync(int fd, struct file *file, int on)
 static int hiddev_release(struct inode * inode, struct file * file)
 {
         struct hiddev_list *list = file->private_data;
+        unsigned long flags;
 
         hiddev_fasync(-1, file, 0);
+
+        spin_lock_irqsave(&list->hiddev->list_lock, flags);
         list_del(&list->node);
+        spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
 
         if (!--list->hiddev->open) {
                 if (list->hiddev->exist)
@@ -257,6 +265,7 @@ static int hiddev_release(struct inode * inode, struct file * file)
 static int hiddev_open(struct inode *inode, struct file *file)
 {
         struct hiddev_list *list;
+        unsigned long flags;
 
         int i = iminor(inode) - HIDDEV_MINOR_BASE;
 
@@ -267,7 +276,11 @@ static int hiddev_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
 
         list->hiddev = hiddev_table[i];
+
+        spin_lock_irqsave(&list->hiddev->list_lock, flags);
         list_add_tail(&list->node, &hiddev_table[i]->list);
+        spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
+
         file->private_data = list;
 
         if (!list->hiddev->open++)
@@ -773,6 +786,7 @@ int hiddev_connect(struct hid_device *hid)
 
         init_waitqueue_head(&hiddev->wait);
         INIT_LIST_HEAD(&hiddev->list);
+        spin_lock_init(&hiddev->list_lock);
         hiddev->hid = hid;
         hiddev->exist = 1;
 
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 65aa12e8d7b3..130978780713 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -133,12 +133,11 @@ resubmit:
 static int usb_kbd_event(struct input_dev *dev, unsigned int type,
                          unsigned int code, int value)
 {
-        struct usb_kbd *kbd = dev->private;
+        struct usb_kbd *kbd = input_get_drvdata(dev);
 
         if (type != EV_LED)
                 return -1;
 
-
         kbd->newleds = (!!test_bit(LED_KANA,    dev->led) << 3) | (!!test_bit(LED_COMPOSE, dev->led) << 3) |
                        (!!test_bit(LED_SCROLLL, dev->led) << 2) | (!!test_bit(LED_CAPSL,   dev->led) << 1) |
                        (!!test_bit(LED_NUML,    dev->led));
@@ -175,7 +174,7 @@ static void usb_kbd_led(struct urb *urb)
 
 static int usb_kbd_open(struct input_dev *dev)
 {
-        struct usb_kbd *kbd = dev->private;
+        struct usb_kbd *kbd = input_get_drvdata(dev);
 
         kbd->irq->dev = kbd->usbdev;
         if (usb_submit_urb(kbd->irq, GFP_KERNEL))
@@ -186,7 +185,7 @@ static int usb_kbd_open(struct input_dev *dev)
 
 static void usb_kbd_close(struct input_dev *dev)
 {
-        struct usb_kbd *kbd = dev->private;
+        struct usb_kbd *kbd = input_get_drvdata(dev);
 
         usb_kill_urb(kbd->irq);
 }
@@ -211,12 +210,9 @@ static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd)
 {
         usb_free_urb(kbd->irq);
         usb_free_urb(kbd->led);
-        if (kbd->new)
-                usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
-        if (kbd->cr)
-                usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma);
-        if (kbd->leds)
-                usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);
+        usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
+        usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma);
+        usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);
 }
 
 static int usb_kbd_probe(struct usb_interface *iface,
@@ -274,8 +270,9 @@ static int usb_kbd_probe(struct usb_interface *iface,
         input_dev->name = kbd->name;
         input_dev->phys = kbd->phys;
         usb_to_input_id(dev, &input_dev->id);
-        input_dev->cdev.dev = &iface->dev;
-        input_dev->private = kbd;
+        input_dev->dev.parent = &iface->dev;
+
+        input_set_drvdata(input_dev, kbd);
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
         input_dev->ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL) | BIT(LED_COMPOSE) | BIT(LED_KANA);
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 573776d865e1..5345c73bcf62 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -96,7 +96,7 @@ resubmit:
 
 static int usb_mouse_open(struct input_dev *dev)
 {
-        struct usb_mouse *mouse = dev->private;
+        struct usb_mouse *mouse = input_get_drvdata(dev);
 
         mouse->irq->dev = mouse->usbdev;
         if (usb_submit_urb(mouse->irq, GFP_KERNEL))
@@ -107,7 +107,7 @@ static int usb_mouse_open(struct input_dev *dev)
 
 static void usb_mouse_close(struct input_dev *dev)
 {
-        struct usb_mouse *mouse = dev->private;
+        struct usb_mouse *mouse = input_get_drvdata(dev);
 
         usb_kill_urb(mouse->irq);
 }
@@ -171,7 +171,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
         input_dev->name = mouse->name;
         input_dev->phys = mouse->phys;
         usb_to_input_id(dev, &input_dev->id);
-        input_dev->cdev.dev = &intf->dev;
+        input_dev->dev.parent = &intf->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
         input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
@@ -179,7 +179,8 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
         input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_SIDE) | BIT(BTN_EXTRA);
         input_dev->relbit[0] |= BIT(REL_WHEEL);
 
-        input_dev->private = mouse;
+        input_set_drvdata(input_dev, mouse);
+
         input_dev->open = usb_mouse_open;
         input_dev->close = usb_mouse_close;
 
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 6d105a1d41b1..4d1cb5b855d1 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -2,10 +2,9 @@
 # Hardware monitoring chip drivers configuration
 #
 
-menu "Hardware Monitoring support"
-
-config HWMON
+menuconfig HWMON
         tristate "Hardware Monitoring support"
+        depends on HAS_IOMEM
         default y
         help
           Hardware monitoring devices let you monitor the hardware health
@@ -23,13 +22,15 @@ config HWMON
           This support can also be built as a module.  If so, the module
           will be called hwmon.
 
+if HWMON
+
 config HWMON_VID
         tristate
         default n
 
 config SENSORS_ABITUGURU
         tristate "Abit uGuru"
-        depends on HWMON && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for the Abit uGuru chips
           sensor part. The voltage and frequency control parts of the Abit
@@ -39,9 +40,19 @@ config SENSORS_ABITUGURU
           This driver can also be built as a module.  If so, the module
           will be called abituguru.
 
+config SENSORS_AD7418
+        tristate "Analog Devices AD7416, AD7417 and AD7418"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Analog Devices
+          AD7416, AD7417 and AD7418 temperature monitoring chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called ad7418.
+
 config SENSORS_ADM1021
         tristate "Analog Devices ADM1021 and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for Analog Devices ADM1021
           and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
@@ -53,7 +64,7 @@ config SENSORS_ADM1021
 
 config SENSORS_ADM1025
         tristate "Analog Devices ADM1025 and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM1025
@@ -64,7 +75,7 @@ config SENSORS_ADM1025
 
 config SENSORS_ADM1026
         tristate "Analog Devices ADM1026 and compatibles"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM1026
@@ -75,7 +86,7 @@ config SENSORS_ADM1026
 
 config SENSORS_ADM1029
         tristate "Analog Devices ADM1029"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         help
           If you say yes here you get support for Analog Devices ADM1029
           sensor chip.
@@ -86,7 +97,7 @@ config SENSORS_ADM1029
 
 config SENSORS_ADM1031
         tristate "Analog Devices ADM1031 and compatibles"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         help
           If you say yes here you get support for Analog Devices ADM1031
           and ADM1030 sensor chips.
@@ -96,7 +107,7 @@ config SENSORS_ADM1031
 
 config SENSORS_ADM9240
         tristate "Analog Devices ADM9240 and compatibles"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM9240,
@@ -107,7 +118,7 @@ config SENSORS_ADM9240
 
 config SENSORS_K8TEMP
         tristate "AMD Athlon64/FX or Opteron temperature sensor"
-        depends on HWMON && X86 && PCI && EXPERIMENTAL
+        depends on X86 && PCI && EXPERIMENTAL
         help
           If you say yes here you get support for the temperature
           sensor(s) inside your CPU. Supported is whole AMD K8
@@ -119,7 +130,7 @@ config SENSORS_K8TEMP
 
 config SENSORS_AMS
         tristate "Apple Motion Sensor driver"
-        depends on HWMON && PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
+        depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
         help
           Support for the motion sensor included in PowerBooks. Includes
           implementations for PMU and I2C.
@@ -144,7 +155,7 @@ config SENSORS_AMS_I2C
 
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for the ASB100 Bach sensor
@@ -155,7 +166,7 @@ config SENSORS_ASB100
 
 config SENSORS_ATXP1
         tristate "Attansic ATXP1 VID controller"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for the Attansic ATXP1 VID
@@ -169,7 +180,7 @@ config SENSORS_ATXP1
 
 config SENSORS_DS1621
         tristate "Dallas Semiconductor DS1621 and DS1625"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1621 and DS1625 sensor chips.
@@ -179,7 +190,7 @@ config SENSORS_DS1621
 
 config SENSORS_F71805F
         tristate "Fintek F71805F/FG and F71872F/FG"
-        depends on HWMON && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for hardware monitoring
           features of the Fintek F71805F/FG and F71872F/FG Super-I/O
@@ -190,7 +201,7 @@ config SENSORS_F71805F
 
 config SENSORS_FSCHER
         tristate "FSC Hermes"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for Fujitsu Siemens
           Computers Hermes sensor chips.
@@ -200,7 +211,7 @@ config SENSORS_FSCHER
 
 config SENSORS_FSCPOS
         tristate "FSC Poseidon"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for Fujitsu Siemens
           Computers Poseidon sensor chips.
@@ -210,7 +221,7 @@ config SENSORS_FSCPOS
 
 config SENSORS_GL518SM
         tristate "Genesys Logic GL518SM"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for Genesys Logic GL518SM
           sensor chips.
@@ -220,7 +231,7 @@ config SENSORS_GL518SM
 
 config SENSORS_GL520SM
         tristate "Genesys Logic GL520SM"
-        depends on HWMON && I2C
+        depends on I2C
         select HWMON_VID
         help
           If you say yes here you get support for Genesys Logic GL520SM
@@ -229,9 +240,17 @@ config SENSORS_GL520SM
           This driver can also be built as a module.  If so, the module
           will be called gl520sm.
 
+config SENSORS_CORETEMP
+        tristate "Intel Core (2) Duo/Solo temperature sensor"
+        depends on X86 && EXPERIMENTAL
+        help
+          If you say yes here you get support for the temperature
+          sensor inside your CPU. Supported all are all known variants
+          of Intel Core family.
+
 config SENSORS_IT87
         tristate "ITE IT87xx and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         select I2C_ISA
         select HWMON_VID
         help
@@ -243,7 +262,7 @@ config SENSORS_IT87
 
 config SENSORS_LM63
         tristate "National Semiconductor LM63"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for the National Semiconductor
           LM63 remote diode digital temperature sensor with integrated fan
@@ -255,7 +274,7 @@ config SENSORS_LM63
 
 config SENSORS_LM70
         tristate "National Semiconductor LM70"
-        depends on HWMON && SPI_MASTER && EXPERIMENTAL
+        depends on SPI_MASTER && EXPERIMENTAL
         help
           If you say yes here you get support for the National Semiconductor
           LM70 digital temperature sensor chip.
@@ -265,7 +284,7 @@ config SENSORS_LM70
 
 config SENSORS_LM75
         tristate "National Semiconductor LM75 and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for National Semiconductor LM75
           sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
@@ -280,7 +299,7 @@ config SENSORS_LM75
 
 config SENSORS_LM77
         tristate "National Semiconductor LM77"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for National Semiconductor LM77
           sensor chips.
@@ -290,8 +309,7 @@ config SENSORS_LM77
 
 config SENSORS_LM78
         tristate "National Semiconductor LM78 and compatibles"
-        depends on HWMON && I2C
-        select I2C_ISA
+        depends on I2C
         select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM78,
@@ -302,7 +320,7 @@ config SENSORS_LM78
 
 config SENSORS_LM80
         tristate "National Semiconductor LM80"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         help
           If you say yes here you get support for National Semiconductor
           LM80 sensor chips.
@@ -312,7 +330,7 @@ config SENSORS_LM80
 
 config SENSORS_LM83
         tristate "National Semiconductor LM83 and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for National Semiconductor
           LM82 and LM83 sensor chips.
@@ -322,7 +340,7 @@ config SENSORS_LM83
 
 config SENSORS_LM85
         tristate "National Semiconductor LM85 and compatibles"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM85
@@ -333,7 +351,7 @@ config SENSORS_LM85
 
 config SENSORS_LM87
         tristate "National Semiconductor LM87"
-        depends on HWMON && I2C
+        depends on I2C
         select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM87
@@ -344,7 +362,7 @@ config SENSORS_LM87
 
 config SENSORS_LM90
         tristate "National Semiconductor LM90 and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for National Semiconductor LM90,
           LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
@@ -358,7 +376,7 @@ config SENSORS_LM90
 
 config SENSORS_LM92
         tristate "National Semiconductor LM92 and compatibles"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for National Semiconductor LM92
           and Maxim MAX6635 sensor chips.
@@ -368,16 +386,26 @@ config SENSORS_LM92
 
 config SENSORS_MAX1619
         tristate "Maxim MAX1619 sensor chip"
-        depends on HWMON && I2C
+        depends on I2C
         help
           If you say yes here you get support for MAX1619 sensor chip.
 
           This driver can also be built as a module.  If so, the module
           will be called max1619.
 
+config SENSORS_MAX6650
+        tristate "Maxim MAX6650 sensor chip"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the MAX6650 / MAX6651
+          sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called max6650.
+
 config SENSORS_PC87360
         tristate "National Semiconductor PC87360 family"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select I2C_ISA
         select HWMON_VID
         help
@@ -392,7 +420,7 @@ config SENSORS_PC87360
 
 config SENSORS_PC87427
         tristate "National Semiconductor PC87427"
-        depends on HWMON && EXPERIMENTAL
+        depends on EXPERIMENTAL
         help
           If you say yes here you get access to the hardware monitoring
           functions of the National Semiconductor PC87427 Super-I/O chip.
@@ -405,7 +433,7 @@ config SENSORS_PC87427
 
 config SENSORS_SIS5595
         tristate "Silicon Integrated Systems Corp. SiS5595"
-        depends on HWMON && I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI && EXPERIMENTAL
         select I2C_ISA
         help
           If you say yes here you get support for the integrated sensors in
@@ -416,28 +444,28 @@ config SENSORS_SIS5595
 
 config SENSORS_SMSC47M1
         tristate "SMSC LPC47M10x and compatibles"
-        depends on HWMON && I2C
-        select I2C_ISA
         help
           If you say yes here you get support for the integrated fan
           monitoring and control capabilities of the SMSC LPC47B27x,
           LPC47M10x, LPC47M112, LPC47M13x, LPC47M14x, LPC47M15x,
-          LPC47M192 and LPC47M997 chips.
+          LPC47M192, LPC47M292 and LPC47M997 chips.
 
-          The temperature and voltage sensor features of the LPC47M192
-          and LPC47M997 are supported by another driver, select also
-          "SMSC LPC47M192 and compatibles" below for those.
+          The temperature and voltage sensor features of the LPC47M15x,
+          LPC47M192, LPC47M292 and LPC47M997 are supported by another
+          driver, select also "SMSC LPC47M192 and compatibles" below for
+          those.
 
           This driver can also be built as a module.  If so, the module
           will be called smsc47m1.
 
 config SENSORS_SMSC47M192
         tristate "SMSC LPC47M192 and compatibles"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for the temperature and
-          voltage sensors of the SMSC LPC47M192 and LPC47M997 chips.
+          voltage sensors of the SMSC LPC47M192, LPC47M15x, LPC47M292
+          and LPC47M997 chips.
 
           The fan monitoring and control capabilities of these chips
           are supported by another driver, select
@@ -449,8 +477,7 @@ config SENSORS_SMSC47M192
 
 config SENSORS_SMSC47B397
         tristate "SMSC LPC47B397-NC"
-        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_ISA
+        depends on EXPERIMENTAL
         help
           If you say yes here you get support for the SMSC LPC47B397-NC
           sensor chip.
@@ -460,7 +487,7 @@ config SENSORS_SMSC47B397
 
 config SENSORS_VIA686A
         tristate "VIA686A"
-        depends on HWMON && I2C && PCI
+        depends on I2C && PCI
         select I2C_ISA
         help
           If you say yes here you get support for the integrated sensors in
@@ -471,7 +498,7 @@ config SENSORS_VIA686A
 
 config SENSORS_VT1211
         tristate "VIA VT1211"
-        depends on HWMON && EXPERIMENTAL
+        depends on EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here then you get support for hardware monitoring
@@ -482,7 +509,7 @@ config SENSORS_VT1211
 
 config SENSORS_VT8231
         tristate "VIA VT8231"
-        depends on HWMON && I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI && EXPERIMENTAL
         select HWMON_VID
         select I2C_ISA
         help
@@ -494,8 +521,7 @@ config SENSORS_VT8231
 
 config SENSORS_W83781D
         tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
-        depends on HWMON && I2C
-        select I2C_ISA
+        depends on I2C
         select HWMON_VID
         help
           If you say yes here you get support for the Winbond W8378x series
@@ -507,7 +533,7 @@ config SENSORS_W83781D
 
 config SENSORS_W83791D
         tristate "Winbond W83791D"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for the Winbond W83791D chip.
@@ -517,7 +543,7 @@ config SENSORS_W83791D
 
 config SENSORS_W83792D
         tristate "Winbond W83792D"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         help
           If you say yes here you get support for the Winbond W83792D chip.
 
@@ -526,7 +552,7 @@ config SENSORS_W83792D
 
 config SENSORS_W83793
         tristate "Winbond W83793"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select HWMON_VID
         help
           If you say yes here you get support for the Winbond W83793
@@ -537,7 +563,7 @@ config SENSORS_W83793
 
 config SENSORS_W83L785TS
         tristate "Winbond W83L785TS-S"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         help
           If you say yes here you get support for the Winbond W83L785TS-S
           sensor chip, which is used on the Asus A7N8X, among other
@@ -548,8 +574,6 @@ config SENSORS_W83L785TS
 
 config SENSORS_W83627HF
         tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"
-        depends on HWMON && I2C
-        select I2C_ISA
         select HWMON_VID
         help
           If you say yes here you get support for the Winbond W836X7 series
@@ -561,7 +585,7 @@ config SENSORS_W83627HF
 
 config SENSORS_W83627EHF
         tristate "Winbond W83627EHF"
-        depends on HWMON && I2C && EXPERIMENTAL
+        depends on I2C && EXPERIMENTAL
         select I2C_ISA
         help
           If you say yes here you get preliminary support for the hardware
@@ -577,7 +601,7 @@ config SENSORS_W83627EHF
 
 config SENSORS_HDAPS
         tristate "IBM Hard Drive Active Protection System (hdaps)"
-        depends on HWMON && INPUT && X86
+        depends on INPUT && X86
         default n
         help
           This driver provides support for the IBM Hard Drive Active Protection
@@ -594,9 +618,32 @@ config SENSORS_HDAPS
           Say Y here if you have an applicable laptop and want to experience
           the awesome power of hdaps.
 
+config SENSORS_APPLESMC
+        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
+        depends on HWMON && INPUT && X86
+        select NEW_LEDS
+        select LEDS_CLASS
+        default n
+        help
+          This driver provides support for the Apple System Management
+          Controller, which provides an accelerometer (Apple Sudden Motion
+          Sensor), light sensors, temperature sensors, keyboard backlight
+          control and fan control.
+
+          Only Intel-based Apple's computers are supported (MacBook Pro,
+          MacBook, MacMini).
+
+          Data from the different sensors, keyboard backlight control and fan
+          control are accessible via sysfs.
+
+          This driver also provides an absolute input class device, allowing
+          the laptop to act as a pinball machine-esque joystick.
+
+          Say Y here if you have an applicable laptop and want to experience
+          the awesome power of applesmc.
+
 config HWMON_DEBUG_CHIP
         bool "Hardware Monitoring Chip debugging messages"
-        depends on HWMON
         default n
         help
           Say Y here if you want the I2C chip drivers to produce a bunch of
@@ -604,4 +651,4 @@ config HWMON_DEBUG_CHIP
           a problem with I2C support and want to see more of what is going
           on.
 
-endmenu
+endif # HWMON
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 4165c27a2f25..cfaf338919dd 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -14,14 +14,17 @@ obj-$(CONFIG_SENSORS_W83781D)	+= w83781d.o
 obj-$(CONFIG_SENSORS_W83791D)   += w83791d.o
 
 obj-$(CONFIG_SENSORS_ABITUGURU) += abituguru.o
+obj-$(CONFIG_SENSORS_AD7418)    += ad7418.o
 obj-$(CONFIG_SENSORS_ADM1021)   += adm1021.o
 obj-$(CONFIG_SENSORS_ADM1025)   += adm1025.o
 obj-$(CONFIG_SENSORS_ADM1026)   += adm1026.o
 obj-$(CONFIG_SENSORS_ADM1029)   += adm1029.o
 obj-$(CONFIG_SENSORS_ADM1031)   += adm1031.o
 obj-$(CONFIG_SENSORS_ADM9240)   += adm9240.o
+obj-$(CONFIG_SENSORS_APPLESMC)  += applesmc.o
 obj-$(CONFIG_SENSORS_AMS)       += ams/
 obj-$(CONFIG_SENSORS_ATXP1)     += atxp1.o
+obj-$(CONFIG_SENSORS_CORETEMP)  += coretemp.o
 obj-$(CONFIG_SENSORS_DS1621)    += ds1621.o
 obj-$(CONFIG_SENSORS_F71805F)   += f71805f.o
 obj-$(CONFIG_SENSORS_FSCHER)    += fscher.o
@@ -43,6 +46,7 @@ obj-$(CONFIG_SENSORS_LM87)	+= lm87.o
 obj-$(CONFIG_SENSORS_LM90)      += lm90.o
 obj-$(CONFIG_SENSORS_LM92)      += lm92.o
 obj-$(CONFIG_SENSORS_MAX1619)   += max1619.o
+obj-$(CONFIG_SENSORS_MAX6650)   += max6650.o
 obj-$(CONFIG_SENSORS_PC87360)   += pc87360.o
 obj-$(CONFIG_SENSORS_PC87427)   += pc87427.o
 obj-$(CONFIG_SENSORS_SIS5595)   += sis5595.o
diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c
new file mode 100644
index 000000000000..cc8b624a1e51
--- /dev/null
+++ b/drivers/hwmon/ad7418.c
@@ -0,0 +1,373 @@
+/*
+ * An hwmon driver for the Analog Devices AD7416/17/18
+ * Copyright (C) 2006-07 Tower Technologies
+ *
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * Based on lm75.c
+ * Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License,
+ * as published by the Free Software Foundation - version 2.
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+
+#include "lm75.h"
+
+#define DRV_VERSION "0.3"
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END };
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_3(ad7416, ad7417, ad7418);
+
+/* AD7418 registers */
+#define AD7418_REG_TEMP_IN      0x00
+#define AD7418_REG_CONF         0x01
+#define AD7418_REG_TEMP_HYST    0x02
+#define AD7418_REG_TEMP_OS      0x03
+#define AD7418_REG_ADC          0x04
+#define AD7418_REG_CONF2        0x05
+
+#define AD7418_REG_ADC_CH(x)    ((x) << 5)
+#define AD7418_CH_TEMP          AD7418_REG_ADC_CH(0)
+
+static const u8 AD7418_REG_TEMP[] = { AD7418_REG_TEMP_IN,
+                                        AD7418_REG_TEMP_HYST,
+                                        AD7418_REG_TEMP_OS };
+
+struct ad7418_data {
+        struct i2c_client       client;
+        struct class_device     *class_dev;
+        struct attribute_group  attrs;
+        enum chips              type;
+        struct mutex            lock;
+        int                     adc_max;        /* number of ADC channels */
+        char                    valid;
+        unsigned long           last_updated;   /* In jiffies */
+        s16                     temp[3];        /* Register values */
+        u16                     in[4];
+};
+
+static int ad7418_attach_adapter(struct i2c_adapter *adapter);
+static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind);
+static int ad7418_detach_client(struct i2c_client *client);
+
+static struct i2c_driver ad7418_driver = {
+        .driver = {
+                .name   = "ad7418",
+        },
+        .attach_adapter = ad7418_attach_adapter,
+        .detach_client  = ad7418_detach_client,
+};
+
+/* All registers are word-sized, except for the configuration registers.
+ * AD7418 uses a high-byte first convention. Do NOT use those functions to
+ * access the configuration registers CONF and CONF2, as they are byte-sized.
+ */
+static inline int ad7418_read(struct i2c_client *client, u8 reg)
+{
+        return swab16(i2c_smbus_read_word_data(client, reg));
+}
+
+static inline int ad7418_write(struct i2c_client *client, u8 reg, u16 value)
+{
+        return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
+static void ad7418_init_client(struct i2c_client *client)
+{
+        struct ad7418_data *data = i2c_get_clientdata(client);
+
+        int reg = i2c_smbus_read_byte_data(client, AD7418_REG_CONF);
+        if (reg < 0) {
+                dev_err(&client->dev, "cannot read configuration register\n");
+        } else {
+                dev_info(&client->dev, "configuring for mode 1\n");
+                i2c_smbus_write_byte_data(client, AD7418_REG_CONF, reg & 0xfe);
+
+                if (data->type == ad7417 || data->type == ad7418)
+                        i2c_smbus_write_byte_data(client,
+                                                AD7418_REG_CONF2, 0x00);
+        }
+}
+
+static struct ad7418_data *ad7418_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct ad7418_data *data = i2c_get_clientdata(client);
+
+        mutex_lock(&data->lock);
+
+        if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+                || !data->valid) {
+                u8 cfg;
+                int i, ch;
+
+                /* read config register and clear channel bits */
+                cfg = i2c_smbus_read_byte_data(client, AD7418_REG_CONF);
+                cfg &= 0x1F;
+
+                i2c_smbus_write_byte_data(client, AD7418_REG_CONF,
+                                                cfg | AD7418_CH_TEMP);
+                udelay(30);
+
+                for (i = 0; i < 3; i++) {
+                        data->temp[i] = ad7418_read(client, AD7418_REG_TEMP[i]);
+                }
+
+                for (i = 0, ch = 4; i < data->adc_max; i++, ch--) {
+                        i2c_smbus_write_byte_data(client,
+                                        AD7418_REG_CONF,
+                                        cfg | AD7418_REG_ADC_CH(ch));
+
+                        udelay(15);
+                        data->in[data->adc_max - 1 - i] =
+                                ad7418_read(client, AD7418_REG_ADC);
+                }
+
+                /* restore old configuration value */
+                ad7418_write(client, AD7418_REG_CONF, cfg);
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->lock);
+
+        return data;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct ad7418_data *data = ad7418_update_device(dev);
+        return sprintf(buf, "%d\n",
+                LM75_TEMP_FROM_REG(data->temp[attr->index]));
+}
+
+static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct ad7418_data *data = ad7418_update_device(dev);
+
+        return sprintf(buf, "%d\n",
+                ((data->in[attr->index] >> 6) * 2500 + 512) / 1024);
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct ad7418_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->lock);
+        data->temp[attr->index] = LM75_TEMP_TO_REG(temp);
+        ad7418_write(client, AD7418_REG_TEMP[attr->index], data->temp[attr->index]);
+        mutex_unlock(&data->lock);
+        return count;
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,
+                                show_temp, set_temp, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
+                                show_temp, set_temp, 2);
+
+static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 0);
+static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 1);
+static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 2);
+static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 3);
+
+static int ad7418_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, ad7418_detect);
+}
+
+static struct attribute *ad7416_attributes[] = {
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        NULL
+};
+
+static struct attribute *ad7417_attributes[] = {
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in3_input.dev_attr.attr,
+        &sensor_dev_attr_in4_input.dev_attr.attr,
+        NULL
+};
+
+static struct attribute *ad7418_attributes[] = {
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        NULL
+};
+
+static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct ad7418_data *data;
+        int err = 0;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
+                                        I2C_FUNC_SMBUS_WORD_DATA))
+                goto exit;
+
+        if (!(data = kzalloc(sizeof(struct ad7418_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        client = &data->client;
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &ad7418_driver;
+
+        i2c_set_clientdata(client, data);
+
+        mutex_init(&data->lock);
+
+        /* AD7418 has a curious behaviour on registers 6 and 7. They
+         * both always read 0xC071 and are not documented on the datasheet.
+         * We use them to detect the chip.
+         */
+        if (kind <= 0) {
+                int reg, reg6, reg7;
+
+                /* the AD7416 lies within this address range, but I have
+                 * no means to check.
+                 */
+                if (address >= 0x48 && address <= 0x4f) {
+                        /* XXX add tests for AD7416 here */
+                        /* data->type = ad7416; */
+                }
+                /* here we might have AD7417 or AD7418 */
+                else if (address >= 0x28 && address <= 0x2f) {
+                        reg6 = i2c_smbus_read_word_data(client, 0x06);
+                        reg7 = i2c_smbus_read_word_data(client, 0x07);
+
+                        if (address == 0x28 && reg6 == 0xC071 && reg7 == 0xC071)
+                                data->type = ad7418;
+
+                        /* XXX add tests for AD7417 here */
+
+
+                        /* both AD7417 and AD7418 have bits 0-5 of
+                         * the CONF2 register at 0
+                         */
+                        reg = i2c_smbus_read_byte_data(client,
+                                                        AD7418_REG_CONF2);
+                        if (reg & 0x3F)
+                                data->type = any_chip; /* detection failed */
+                }
+        } else {
+                dev_dbg(&adapter->dev, "detection forced\n");
+        }
+
+        if (kind > 0)
+                data->type = kind;
+        else if (kind < 0 && data->type == any_chip) {
+                err = -ENODEV;
+                goto exit_free;
+        }
+
+        switch (data->type) {
+        case any_chip:
+        case ad7416:
+                data->adc_max = 0;
+                data->attrs.attrs = ad7416_attributes;
+                strlcpy(client->name, "ad7416", I2C_NAME_SIZE);
+                break;
+
+        case ad7417:
+                data->adc_max = 4;
+                data->attrs.attrs = ad7417_attributes;
+                strlcpy(client->name, "ad7417", I2C_NAME_SIZE);
+                break;
+
+        case ad7418:
+                data->adc_max = 1;
+                data->attrs.attrs = ad7418_attributes;
+                strlcpy(client->name, "ad7418", I2C_NAME_SIZE);
+                break;
+        }
+
+        if ((err = i2c_attach_client(client)))
+                goto exit_free;
+
+        dev_info(&client->dev, "%s chip found\n", client->name);
+
+        /* Initialize the AD7418 chip */
+        ad7418_init_client(client);
+
+        /* Register sysfs hooks */
+        if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
+                goto exit_detach;
+
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove;
+        }
+
+        return 0;
+
+exit_remove:
+        sysfs_remove_group(&client->dev.kobj, &data->attrs);
+exit_detach:
+        i2c_detach_client(client);
+exit_free:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int ad7418_detach_client(struct i2c_client *client)
+{
+        struct ad7418_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&client->dev.kobj, &data->attrs);
+        i2c_detach_client(client);
+        kfree(data);
+        return 0;
+}
+
+static int __init ad7418_init(void)
+{
+        return i2c_add_driver(&ad7418_driver);
+}
+
+static void __exit ad7418_exit(void)
+{
+        i2c_del_driver(&ad7418_driver);
+}
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("AD7416/17/18 driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(ad7418_init);
+module_exit(ad7418_exit);
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index f5ebad561412..6db973739725 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -144,7 +144,7 @@ int ams_sensor_attach(void)
         const u32 *prop;
 
         /* Get orientation */
-        prop = get_property(ams_info.of_node, "orientation", NULL);
+        prop = of_get_property(ams_info.of_node, "orientation", NULL);
         if (!prop)
                 return -ENODEV;
         ams_info.orient1 = *prop;
@@ -208,20 +208,17 @@ int __init ams_init(void)
 
 #ifdef CONFIG_SENSORS_AMS_I2C
         np = of_find_node_by_name(NULL, "accelerometer");
-        if (np && device_is_compatible(np, "AAPL,accelerometer_1"))
+        if (np && of_device_is_compatible(np, "AAPL,accelerometer_1"))
                 /* Found I2C motion sensor */
                 return ams_i2c_init(np);
 #endif
 
 #ifdef CONFIG_SENSORS_AMS_PMU
         np = of_find_node_by_name(NULL, "sms");
-        if (np && device_is_compatible(np, "sms"))
+        if (np && of_device_is_compatible(np, "sms"))
                 /* Found PMU motion sensor */
                 return ams_pmu_init(np);
 #endif
-
-        printk(KERN_ERR "ams: No motion sensor found.\n");
-
         return -ENODEV;
 }
 
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index 485d333bcb3e..957760536a4c 100644
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -85,17 +85,17 @@ static int ams_i2c_write(u8 reg, u8 value)
 static int ams_i2c_cmd(enum ams_i2c_cmd cmd)
 {
         s32 result;
-        int remaining = HZ / 20;
+        int count = 3;
 
         ams_i2c_write(AMS_COMMAND, cmd);
-        mdelay(5);
+        msleep(5);
 
-        while (remaining) {
+        while (count--) {
                 result = ams_i2c_read(AMS_COMMAND);
                 if (result == 0 || result & 0x80)
                         return 0;
 
-                remaining = schedule_timeout(remaining);
+                schedule_timeout_uninterruptible(HZ / 20);
         }
 
         return -1;
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np)
         ams_info.bustype = BUS_I2C;
 
         /* look for bus either using "reg" or by path */
-        prop = get_property(ams_info.of_node, "reg", NULL);
+        prop = of_get_property(ams_info.of_node, "reg", NULL);
         if (!prop) {
                 result = -ENODEV;
 
diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c
index 18210164e307..ca7095d96ad0 100644
--- a/drivers/hwmon/ams/ams-input.c
+++ b/drivers/hwmon/ams/ams-input.c
@@ -87,7 +87,7 @@ static void ams_input_enable(void)
         ams_info.idev->id.vendor = 0;
         ams_info.idev->open = ams_input_open;
         ams_info.idev->close = ams_input_close;
-        ams_info.idev->cdev.dev = &ams_info.of_dev->dev;
+        ams_info.idev->dev.parent = &ams_info.of_dev->dev;
 
         input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
         input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0);
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c
index 1b01c215bfe7..9463e9768f6f 100644
--- a/drivers/hwmon/ams/ams-pmu.c
+++ b/drivers/hwmon/ams/ams-pmu.c
@@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np)
         ams_info.bustype = BUS_HOST;
 
         /* Get PMU command, should be 0x4e, but we can never know */
-        prop = get_property(ams_info.of_node, "reg", NULL);
+        prop = of_get_property(ams_info.of_node, "reg", NULL);
         if (!prop) {
                 result = -ENODEV;
                 goto exit;
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
new file mode 100644
index 000000000000..0c160675b3ac
--- /dev/null
+++ b/drivers/hwmon/applesmc.c
@@ -0,0 +1,1340 @@
+/*
+ * drivers/hwmon/applesmc.c - driver for Apple's SMC (accelerometer, temperature
+ * sensors, fan control, keyboard backlight control) used in Intel-based Apple
+ * computers.
+ *
+ * Copyright (C) 2007 Nicolas Boichat <nicolas@boichat.ch>
+ *
+ * Based on hdaps.c driver:
+ * Copyright (C) 2005 Robert Love <rml@novell.com>
+ * Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>
+ *
+ * Fan control based on smcFanControl:
+ * Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/timer.h>
+#include <linux/dmi.h>
+#include <linux/mutex.h>
+#include <linux/hwmon-sysfs.h>
+#include <asm/io.h>
+#include <linux/leds.h>
+#include <linux/hwmon.h>
+#include <linux/workqueue.h>
+
+/* data port used by Apple SMC */
+#define APPLESMC_DATA_PORT      0x300
+/* command/status port used by Apple SMC */
+#define APPLESMC_CMD_PORT       0x304
+
+#define APPLESMC_NR_PORTS       32 /* 0x300-0x31f */
+
+#define APPLESMC_MAX_DATA_LENGTH 32
+
+#define APPLESMC_STATUS_MASK    0x0f
+#define APPLESMC_READ_CMD       0x10
+#define APPLESMC_WRITE_CMD      0x11
+#define APPLESMC_GET_KEY_BY_INDEX_CMD   0x12
+#define APPLESMC_GET_KEY_TYPE_CMD       0x13
+
+#define KEY_COUNT_KEY           "#KEY" /* r-o ui32 */
+
+#define LIGHT_SENSOR_LEFT_KEY   "ALV0" /* r-o {alv (6 bytes) */
+#define LIGHT_SENSOR_RIGHT_KEY  "ALV1" /* r-o {alv (6 bytes) */
+#define BACKLIGHT_KEY           "LKSB" /* w-o {lkb (2 bytes) */
+
+#define CLAMSHELL_KEY           "MSLD" /* r-o ui8 (unused) */
+
+#define MOTION_SENSOR_X_KEY     "MO_X" /* r-o sp78 (2 bytes) */
+#define MOTION_SENSOR_Y_KEY     "MO_Y" /* r-o sp78 (2 bytes) */
+#define MOTION_SENSOR_Z_KEY     "MO_Z" /* r-o sp78 (2 bytes) */
+#define MOTION_SENSOR_KEY       "MOCN" /* r/w ui16 */
+
+#define FANS_COUNT              "FNum" /* r-o ui8 */
+#define FANS_MANUAL             "FS! " /* r-w ui16 */
+#define FAN_ACTUAL_SPEED        "F0Ac" /* r-o fpe2 (2 bytes) */
+#define FAN_MIN_SPEED           "F0Mn" /* r-o fpe2 (2 bytes) */
+#define FAN_MAX_SPEED           "F0Mx" /* r-o fpe2 (2 bytes) */
+#define FAN_SAFE_SPEED          "F0Sf" /* r-o fpe2 (2 bytes) */
+#define FAN_TARGET_SPEED        "F0Tg" /* r-w fpe2 (2 bytes) */
+#define FAN_POSITION            "F0ID" /* r-o char[16] */
+
+/*
+ * Temperature sensors keys (sp78 - 2 bytes).
+ * First set for Macbook(Pro), second for Macmini.
+ */
+static const char* temperature_sensors_sets[][13] = {
+        { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
+          "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
+        { "TC0D", "TC0P", NULL }
+};
+
+/* List of keys used to read/write fan speeds */
+static const char* fan_speed_keys[] = {
+        FAN_ACTUAL_SPEED,
+        FAN_MIN_SPEED,
+        FAN_MAX_SPEED,
+        FAN_SAFE_SPEED,
+        FAN_TARGET_SPEED
+};
+
+#define INIT_TIMEOUT_MSECS      5000    /* wait up to 5s for device init ... */
+#define INIT_WAIT_MSECS         50      /* ... in 50ms increments */
+
+#define APPLESMC_POLL_PERIOD    (HZ/20) /* poll for input every 1/20s */
+#define APPLESMC_INPUT_FUZZ     4       /* input event threshold */
+#define APPLESMC_INPUT_FLAT     4
+
+#define SENSOR_X 0
+#define SENSOR_Y 1
+#define SENSOR_Z 2
+
+/* Structure to be passed to DMI_MATCH function */
+struct dmi_match_data {
+/* Indicates whether this computer has an accelerometer. */
+        int accelerometer;
+/* Indicates whether this computer has light sensors and keyboard backlight. */
+        int light;
+/* Indicates which temperature sensors set to use. */
+        int temperature_set;
+};
+
+static const int debug;
+static struct platform_device *pdev;
+static s16 rest_x;
+static s16 rest_y;
+static struct timer_list applesmc_timer;
+static struct input_dev *applesmc_idev;
+static struct class_device *hwmon_class_dev;
+
+/* Indicates whether this computer has an accelerometer. */
+static unsigned int applesmc_accelerometer;
+
+/* Indicates whether this computer has light sensors and keyboard backlight. */
+static unsigned int applesmc_light;
+
+/* Indicates which temperature sensors set to use. */
+static unsigned int applesmc_temperature_set;
+
+static struct mutex applesmc_lock;
+
+/*
+ * Last index written to key_at_index sysfs file, and value to use for all other
+ * key_at_index_* sysfs files.
+ */
+static unsigned int key_at_index;
+
+static struct workqueue_struct *applesmc_led_wq;
+
+/*
+ * __wait_status - Wait up to 2ms for the status port to get a certain value
+ * (masked with 0x0f), returning zero if the value is obtained.  Callers must
+ * hold applesmc_lock.
+ */
+static int __wait_status(u8 val)
+{
+        unsigned int i;
+
+        val = val & APPLESMC_STATUS_MASK;
+
+        for (i = 0; i < 200; i++) {
+                if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val) {
+                        if (debug)
+                                printk(KERN_DEBUG
+                                                "Waited %d us for status %x\n",
+                                                i*10, val);
+                        return 0;
+                }
+                udelay(10);
+        }
+
+        printk(KERN_WARNING "applesmc: wait status failed: %x != %x\n",
+                                                val, inb(APPLESMC_CMD_PORT));
+
+        return -EIO;
+}
+
+/*
+ * applesmc_read_key - reads len bytes from a given key, and put them in buffer.
+ * Returns zero on success or a negative error on failure. Callers must
+ * hold applesmc_lock.
+ */
+static int applesmc_read_key(const char* key, u8* buffer, u8 len)
+{
+        int i;
+
+        if (len > APPLESMC_MAX_DATA_LENGTH) {
+                printk(KERN_ERR "applesmc_read_key: cannot read more than "
+                                        "%d bytes\n", APPLESMC_MAX_DATA_LENGTH);
+                return -EINVAL;
+        }
+
+        outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT);
+        if (__wait_status(0x0c))
+                return -EIO;
+
+        for (i = 0; i < 4; i++) {
+                outb(key[i], APPLESMC_DATA_PORT);
+                if (__wait_status(0x04))
+                        return -EIO;
+        }
+        if (debug)
+                printk(KERN_DEBUG "<%s", key);
+
+        outb(len, APPLESMC_DATA_PORT);
+        if (debug)
+                printk(KERN_DEBUG ">%x", len);
+
+        for (i = 0; i < len; i++) {
+                if (__wait_status(0x05))
+                        return -EIO;
+                buffer[i] = inb(APPLESMC_DATA_PORT);
+                if (debug)
+                        printk(KERN_DEBUG "<%x", buffer[i]);
+        }
+        if (debug)
+                printk(KERN_DEBUG "\n");
+
+        return 0;
+}
+
+/*
+ * applesmc_write_key - writes len bytes from buffer to a given key.
+ * Returns zero on success or a negative error on failure. Callers must
+ * hold applesmc_lock.
+ */
+static int applesmc_write_key(const char* key, u8* buffer, u8 len)
+{
+        int i;
+
+        if (len > APPLESMC_MAX_DATA_LENGTH) {
+                printk(KERN_ERR "applesmc_write_key: cannot write more than "
+                                        "%d bytes\n", APPLESMC_MAX_DATA_LENGTH);
+                return -EINVAL;
+        }
+
+        outb(APPLESMC_WRITE_CMD, APPLESMC_CMD_PORT);
+        if (__wait_status(0x0c))
+                return -EIO;
+
+        for (i = 0; i < 4; i++) {
+                outb(key[i], APPLESMC_DATA_PORT);
+                if (__wait_status(0x04))
+                        return -EIO;
+        }
+
+        outb(len, APPLESMC_DATA_PORT);
+
+        for (i = 0; i < len; i++) {
+                if (__wait_status(0x04))
+                        return -EIO;
+                outb(buffer[i], APPLESMC_DATA_PORT);
+        }
+
+        return 0;
+}
+
+/*
+ * applesmc_get_key_at_index - get key at index, and put the result in key
+ * (char[6]). Returns zero on success or a negative error on failure. Callers
+ * must hold applesmc_lock.
+ */
+static int applesmc_get_key_at_index(int index, char* key)
+{
+        int i;
+        u8 readkey[4];
+        readkey[0] = index >> 24;
+        readkey[1] = index >> 16;
+        readkey[2] = index >> 8;
+        readkey[3] = index;
+
+        outb(APPLESMC_GET_KEY_BY_INDEX_CMD, APPLESMC_CMD_PORT);
+        if (__wait_status(0x0c))
+                return -EIO;
+
+        for (i = 0; i < 4; i++) {
+                outb(readkey[i], APPLESMC_DATA_PORT);
+                if (__wait_status(0x04))
+                        return -EIO;
+        }
+
+        outb(4, APPLESMC_DATA_PORT);
+
+        for (i = 0; i < 4; i++) {
+                if (__wait_status(0x05))
+                        return -EIO;
+                key[i] = inb(APPLESMC_DATA_PORT);
+        }
+        key[4] = 0;
+
+        return 0;
+}
+
+/*
+ * applesmc_get_key_type - get key type, and put the result in type (char[6]).
+ * Returns zero on success or a negative error on failure. Callers must
+ * hold applesmc_lock.
+ */
+static int applesmc_get_key_type(char* key, char* type)
+{
+        int i;
+
+        outb(APPLESMC_GET_KEY_TYPE_CMD, APPLESMC_CMD_PORT);
+        if (__wait_status(0x0c))
+                return -EIO;
+
+        for (i = 0; i < 4; i++) {
+                outb(key[i], APPLESMC_DATA_PORT);
+                if (__wait_status(0x04))
+                        return -EIO;
+        }
+
+        outb(5, APPLESMC_DATA_PORT);
+
+        for (i = 0; i < 6; i++) {
+                if (__wait_status(0x05))
+                        return -EIO;
+                type[i] = inb(APPLESMC_DATA_PORT);
+        }
+        type[5] = 0;
+
+        return 0;
+}
+
+/*
+ * applesmc_read_motion_sensor - Read motion sensor (X, Y or Z). Callers must
+ * hold applesmc_lock.
+ */
+static int applesmc_read_motion_sensor(int index, s16* value)
+{
+        u8 buffer[2];
+        int ret;
+
+        switch (index) {
+        case SENSOR_X:
+                ret = applesmc_read_key(MOTION_SENSOR_X_KEY, buffer, 2);
+                break;
+        case SENSOR_Y:
+                ret = applesmc_read_key(MOTION_SENSOR_Y_KEY, buffer, 2);
+                break;
+        case SENSOR_Z:
+                ret = applesmc_read_key(MOTION_SENSOR_Z_KEY, buffer, 2);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        *value = ((s16)buffer[0] << 8) | buffer[1];
+
+        return ret;
+}
+
+/*
+ * applesmc_device_init - initialize the accelerometer.  Returns zero on success
+ * and negative error code on failure.  Can sleep.
+ */
+static int applesmc_device_init(void)
+{
+        int total, ret = -ENXIO;
+        u8 buffer[2];
+
+        if (!applesmc_accelerometer)
+                return 0;
+
+        mutex_lock(&applesmc_lock);
+
+        for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
+                if (debug)
+                        printk(KERN_DEBUG "applesmc try %d\n", total);
+                if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) &&
+                                (buffer[0] != 0x00 || buffer[1] != 0x00)) {
+                        if (total == INIT_TIMEOUT_MSECS) {
+                                printk(KERN_DEBUG "applesmc: device has"
+                                                " already been initialized"
+                                                " (0x%02x, 0x%02x).\n",
+                                                buffer[0], buffer[1]);
+                        } else {
+                                printk(KERN_DEBUG "applesmc: device"
+                                                " successfully initialized"
+                                                " (0x%02x, 0x%02x).\n",
+                                                buffer[0], buffer[1]);
+                        }
+                        ret = 0;
+                        goto out;
+                }
+                buffer[0] = 0xe0;
+                buffer[1] = 0x00;
+                applesmc_write_key(MOTION_SENSOR_KEY, buffer, 2);
+                msleep(INIT_WAIT_MSECS);
+        }
+
+        printk(KERN_WARNING "applesmc: failed to init the device\n");
+
+out:
+        mutex_unlock(&applesmc_lock);
+        return ret;
+}
+
+/*
+ * applesmc_get_fan_count - get the number of fans. Callers must NOT hold
+ * applesmc_lock.
+ */
+static int applesmc_get_fan_count(void)
+{
+        int ret;
+        u8 buffer[1];
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(FANS_COUNT, buffer, 1);
+
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return buffer[0];
+}
+
+/* Device model stuff */
+static int applesmc_probe(struct platform_device *dev)
+{
+        int ret;
+
+        ret = applesmc_device_init();
+        if (ret)
+                return ret;
+
+        printk(KERN_INFO "applesmc: device successfully initialized.\n");
+        return 0;
+}
+
+static int applesmc_resume(struct platform_device *dev)
+{
+        return applesmc_device_init();
+}
+
+static struct platform_driver applesmc_driver = {
+        .probe = applesmc_probe,
+        .resume = applesmc_resume,
+        .driver = {
+                .name = "applesmc",
+                .owner = THIS_MODULE,
+        },
+};
+
+/*
+ * applesmc_calibrate - Set our "resting" values.  Callers must
+ * hold applesmc_lock.
+ */
+static void applesmc_calibrate(void)
+{
+        applesmc_read_motion_sensor(SENSOR_X, &rest_x);
+        applesmc_read_motion_sensor(SENSOR_Y, &rest_y);
+        rest_x = -rest_x;
+}
+
+static int applesmc_idev_open(struct input_dev *dev)
+{
+        add_timer(&applesmc_timer);
+
+        return 0;
+}
+
+static void applesmc_idev_close(struct input_dev *dev)
+{
+        del_timer_sync(&applesmc_timer);
+}
+
+static void applesmc_idev_poll(unsigned long unused)
+{
+        s16 x, y;
+
+        /* Cannot sleep.  Try nonblockingly.  If we fail, try again later. */
+        if (!mutex_trylock(&applesmc_lock)) {
+                mod_timer(&applesmc_timer, jiffies + APPLESMC_POLL_PERIOD);
+                return;
+        }
+
+        if (applesmc_read_motion_sensor(SENSOR_X, &x))
+                goto out;
+        if (applesmc_read_motion_sensor(SENSOR_Y, &y))
+                goto out;
+
+        x = -x;
+        input_report_abs(applesmc_idev, ABS_X, x - rest_x);
+        input_report_abs(applesmc_idev, ABS_Y, y - rest_y);
+        input_sync(applesmc_idev);
+
+out:
+        mod_timer(&applesmc_timer, jiffies + APPLESMC_POLL_PERIOD);
+
+        mutex_unlock(&applesmc_lock);
+}
+
+/* Sysfs Files */
+
+static ssize_t applesmc_position_show(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
+{
+        int ret;
+        s16 x, y, z;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_motion_sensor(SENSOR_X, &x);
+        if (ret)
+                goto out;
+        ret = applesmc_read_motion_sensor(SENSOR_Y, &y);
+        if (ret)
+                goto out;
+        ret = applesmc_read_motion_sensor(SENSOR_Z, &z);
+        if (ret)
+                goto out;
+
+out:
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return snprintf(buf, PAGE_SIZE, "(%d,%d,%d)\n", x, y, z);
+}
+
+static ssize_t applesmc_light_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        int ret;
+        u8 left = 0, right = 0;
+        u8 buffer[6];
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, 6);
+        left = buffer[2];
+        if (ret)
+                goto out;
+        ret = applesmc_read_key(LIGHT_SENSOR_RIGHT_KEY, buffer, 6);
+        right = buffer[2];
+
+out:
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return snprintf(sysfsbuf, PAGE_SIZE, "(%d,%d)\n", left, right);
+}
+
+/* Displays degree Celsius * 1000 */
+static ssize_t applesmc_show_temperature(struct device *dev,
+                        struct device_attribute *devattr, char *sysfsbuf)
+{
+        int ret;
+        u8 buffer[2];
+        unsigned int temp;
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        const char* key =
+                temperature_sensors_sets[applesmc_temperature_set][attr->index];
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(key, buffer, 2);
+        temp = buffer[0]*1000;
+        temp += (buffer[1] >> 6) * 250;
+
+        mutex_unlock(&applesmc_lock);
+
+        if (ret)
+                return ret;
+        else
+                return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", temp);
+}
+
+static ssize_t applesmc_show_fan_speed(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        int ret;
+        unsigned int speed = 0;
+        char newkey[5];
+        u8 buffer[2];
+        struct sensor_device_attribute_2 *sensor_attr =
+                                                to_sensor_dev_attr_2(attr);
+
+        newkey[0] = fan_speed_keys[sensor_attr->nr][0];
+        newkey[1] = '0' + sensor_attr->index;
+        newkey[2] = fan_speed_keys[sensor_attr->nr][2];
+        newkey[3] = fan_speed_keys[sensor_attr->nr][3];
+        newkey[4] = 0;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(newkey, buffer, 2);
+        speed = ((buffer[0] << 8 | buffer[1]) >> 2);
+
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", speed);
+}
+
+static ssize_t applesmc_store_fan_speed(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *sysfsbuf, size_t count)
+{
+        int ret;
+        u32 speed;
+        char newkey[5];
+        u8 buffer[2];
+        struct sensor_device_attribute_2 *sensor_attr =
+                                                to_sensor_dev_attr_2(attr);
+
+        speed = simple_strtoul(sysfsbuf, NULL, 10);
+
+        if (speed > 0x4000) /* Bigger than a 14-bit value */
+                return -EINVAL;
+
+        newkey[0] = fan_speed_keys[sensor_attr->nr][0];
+        newkey[1] = '0' + sensor_attr->index;
+        newkey[2] = fan_speed_keys[sensor_attr->nr][2];
+        newkey[3] = fan_speed_keys[sensor_attr->nr][3];
+        newkey[4] = 0;
+
+        mutex_lock(&applesmc_lock);
+
+        buffer[0] = (speed >> 6) & 0xff;
+        buffer[1] = (speed << 2) & 0xff;
+        ret = applesmc_write_key(newkey, buffer, 2);
+
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return count;
+}
+
+static ssize_t applesmc_show_fan_manual(struct device *dev,
+                        struct device_attribute *devattr, char *sysfsbuf)
+{
+        int ret;
+        u16 manual = 0;
+        u8 buffer[2];
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
+        manual = ((buffer[0] << 8 | buffer[1]) >> attr->index) & 0x01;
+
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", manual);
+}
+
+static ssize_t applesmc_store_fan_manual(struct device *dev,
+                                         struct device_attribute *devattr,
+                                         const char *sysfsbuf, size_t count)
+{
+        int ret;
+        u8 buffer[2];
+        u32 input;
+        u16 val;
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+        input = simple_strtoul(sysfsbuf, NULL, 10);
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
+        val = (buffer[0] << 8 | buffer[1]);
+        if (ret)
+                goto out;
+
+        if (input)
+                val = val | (0x01 << attr->index);
+        else
+                val = val & ~(0x01 << attr->index);
+
+        buffer[0] = (val >> 8) & 0xFF;
+        buffer[1] = val & 0xFF;
+
+        ret = applesmc_write_key(FANS_MANUAL, buffer, 2);
+
+out:
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return count;
+}
+
+static ssize_t applesmc_show_fan_position(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        int ret;
+        char newkey[5];
+        u8 buffer[17];
+        struct sensor_device_attribute_2 *sensor_attr =
+                                                to_sensor_dev_attr_2(attr);
+
+        newkey[0] = FAN_POSITION[0];
+        newkey[1] = '0' + sensor_attr->index;
+        newkey[2] = FAN_POSITION[2];
+        newkey[3] = FAN_POSITION[3];
+        newkey[4] = 0;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(newkey, buffer, 16);
+        buffer[16] = 0;
+
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", buffer+4);
+}
+
+static ssize_t applesmc_calibrate_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        return snprintf(sysfsbuf, PAGE_SIZE, "(%d,%d)\n", rest_x, rest_y);
+}
+
+static ssize_t applesmc_calibrate_store(struct device *dev,
+        struct device_attribute *attr, const char *sysfsbuf, size_t count)
+{
+        mutex_lock(&applesmc_lock);
+        applesmc_calibrate();
+        mutex_unlock(&applesmc_lock);
+
+        return count;
+}
+
+/* Store the next backlight value to be written by the work */
+static unsigned int backlight_value;
+
+static void applesmc_backlight_set(struct work_struct *work)
+{
+        u8 buffer[2];
+
+        mutex_lock(&applesmc_lock);
+        buffer[0] = backlight_value;
+        buffer[1] = 0x00;
+        applesmc_write_key(BACKLIGHT_KEY, buffer, 2);
+        mutex_unlock(&applesmc_lock);
+}
+static DECLARE_WORK(backlight_work, &applesmc_backlight_set);
+
+static void applesmc_brightness_set(struct led_classdev *led_cdev,
+                                                enum led_brightness value)
+{
+        int ret;
+
+        backlight_value = value;
+        ret = queue_work(applesmc_led_wq, &backlight_work);
+
+        if (debug && (!ret))
+                printk(KERN_DEBUG "applesmc: work was already on the queue.\n");
+}
+
+static ssize_t applesmc_key_count_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        int ret;
+        u8 buffer[4];
+        u32 count;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_read_key(KEY_COUNT_KEY, buffer, 4);
+        count = ((u32)buffer[0]<<24) + ((u32)buffer[1]<<16) +
+                                                ((u32)buffer[2]<<8) + buffer[3];
+
+        mutex_unlock(&applesmc_lock);
+        if (ret)
+                return ret;
+        else
+                return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", count);
+}
+
+static ssize_t applesmc_key_at_index_read_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        char key[5];
+        char info[6];
+        int ret;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_get_key_at_index(key_at_index, key);
+
+        if (ret || !key[0]) {
+                mutex_unlock(&applesmc_lock);
+
+                return -EINVAL;
+        }
+
+        ret = applesmc_get_key_type(key, info);
+
+        if (ret) {
+                mutex_unlock(&applesmc_lock);
+
+                return ret;
+        }
+
+        /*
+         * info[0] maximum value (APPLESMC_MAX_DATA_LENGTH) is much lower than
+         * PAGE_SIZE, so we don't need any checks before writing to sysfsbuf.
+         */
+        ret = applesmc_read_key(key, sysfsbuf, info[0]);
+
+        mutex_unlock(&applesmc_lock);
+
+        if (!ret) {
+                return info[0];
+        }
+        else {
+                return ret;
+        }
+}
+
+static ssize_t applesmc_key_at_index_data_length_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        char key[5];
+        char info[6];
+        int ret;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_get_key_at_index(key_at_index, key);
+
+        if (ret || !key[0]) {
+                mutex_unlock(&applesmc_lock);
+
+                return -EINVAL;
+        }
+
+        ret = applesmc_get_key_type(key, info);
+
+        mutex_unlock(&applesmc_lock);
+
+        if (!ret)
+                return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", info[0]);
+        else
+                return ret;
+}
+
+static ssize_t applesmc_key_at_index_type_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        char key[5];
+        char info[6];
+        int ret;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_get_key_at_index(key_at_index, key);
+
+        if (ret || !key[0]) {
+                mutex_unlock(&applesmc_lock);
+
+                return -EINVAL;
+        }
+
+        ret = applesmc_get_key_type(key, info);
+
+        mutex_unlock(&applesmc_lock);
+
+        if (!ret)
+                return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", info+1);
+        else
+                return ret;
+}
+
+static ssize_t applesmc_key_at_index_name_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        char key[5];
+        int ret;
+
+        mutex_lock(&applesmc_lock);
+
+        ret = applesmc_get_key_at_index(key_at_index, key);
+
+        mutex_unlock(&applesmc_lock);
+
+        if (!ret && key[0])
+                return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", key);
+        else
+                return -EINVAL;
+}
+
+static ssize_t applesmc_key_at_index_show(struct device *dev,
+                                struct device_attribute *attr, char *sysfsbuf)
+{
+        return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", key_at_index);
+}
+
+static ssize_t applesmc_key_at_index_store(struct device *dev,
+        struct device_attribute *attr, const char *sysfsbuf, size_t count)
+{
+        mutex_lock(&applesmc_lock);
+
+        key_at_index = simple_strtoul(sysfsbuf, NULL, 10);
+
+        mutex_unlock(&applesmc_lock);
+
+        return count;
+}
+
+static struct led_classdev applesmc_backlight = {
+        .name                   = "smc:kbd_backlight",
+        .default_trigger        = "nand-disk",
+        .brightness_set         = applesmc_brightness_set,
+};
+
+static DEVICE_ATTR(position, 0444, applesmc_position_show, NULL);
+static DEVICE_ATTR(calibrate, 0644,
+                        applesmc_calibrate_show, applesmc_calibrate_store);
+
+static struct attribute *accelerometer_attributes[] = {
+        &dev_attr_position.attr,
+        &dev_attr_calibrate.attr,
+        NULL
+};
+
+static const struct attribute_group accelerometer_attributes_group =
+        { .attrs = accelerometer_attributes };
+
+static DEVICE_ATTR(light, 0444, applesmc_light_show, NULL);
+
+static DEVICE_ATTR(key_count, 0444, applesmc_key_count_show, NULL);
+static DEVICE_ATTR(key_at_index, 0644,
+                applesmc_key_at_index_show, applesmc_key_at_index_store);
+static DEVICE_ATTR(key_at_index_name, 0444,
+                                        applesmc_key_at_index_name_show, NULL);
+static DEVICE_ATTR(key_at_index_type, 0444,
+                                        applesmc_key_at_index_type_show, NULL);
+static DEVICE_ATTR(key_at_index_data_length, 0444,
+                                applesmc_key_at_index_data_length_show, NULL);
+static DEVICE_ATTR(key_at_index_data, 0444,
+                                applesmc_key_at_index_read_show, NULL);
+
+static struct attribute *key_enumeration_attributes[] = {
+        &dev_attr_key_count.attr,
+        &dev_attr_key_at_index.attr,
+        &dev_attr_key_at_index_name.attr,
+        &dev_attr_key_at_index_type.attr,
+        &dev_attr_key_at_index_data_length.attr,
+        &dev_attr_key_at_index_data.attr,
+        NULL
+};
+
+static const struct attribute_group key_enumeration_group =
+        { .attrs = key_enumeration_attributes };
+
+/*
+ * Macro defining SENSOR_DEVICE_ATTR for a fan sysfs entries.
+ *  - show actual speed
+ *  - show/store minimum speed
+ *  - show maximum speed
+ *  - show safe speed
+ *  - show/store target speed
+ *  - show/store manual mode
+ */
+#define sysfs_fan_speeds_offset(offset) \
+static SENSOR_DEVICE_ATTR_2(fan##offset##_input, S_IRUGO, \
+                        applesmc_show_fan_speed, NULL, 0, offset-1); \
+\
+static SENSOR_DEVICE_ATTR_2(fan##offset##_min, S_IRUGO | S_IWUSR, \
+        applesmc_show_fan_speed, applesmc_store_fan_speed, 1, offset-1); \
+\
+static SENSOR_DEVICE_ATTR_2(fan##offset##_max, S_IRUGO, \
+                        applesmc_show_fan_speed, NULL, 2, offset-1); \
+\
+static SENSOR_DEVICE_ATTR_2(fan##offset##_safe, S_IRUGO, \
+                        applesmc_show_fan_speed, NULL, 3, offset-1); \
+\
+static SENSOR_DEVICE_ATTR_2(fan##offset##_output, S_IRUGO | S_IWUSR, \
+        applesmc_show_fan_speed, applesmc_store_fan_speed, 4, offset-1); \
+\
+static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \
+        applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \
+\
+static SENSOR_DEVICE_ATTR(fan##offset##_label, S_IRUGO, \
+        applesmc_show_fan_position, NULL, offset-1); \
+\
+static struct attribute *fan##offset##_attributes[] = { \
+        &sensor_dev_attr_fan##offset##_input.dev_attr.attr, \
+        &sensor_dev_attr_fan##offset##_min.dev_attr.attr, \
+        &sensor_dev_attr_fan##offset##_max.dev_attr.attr, \
+        &sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \
+        &sensor_dev_attr_fan##offset##_output.dev_attr.attr, \
+        &sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \
+        &sensor_dev_attr_fan##offset##_label.dev_attr.attr, \
+        NULL \
+};
+
+/*
+ * Create the needed functions for each fan using the macro defined above
+ * (2 fans are supported)
+ */
+sysfs_fan_speeds_offset(1);
+sysfs_fan_speeds_offset(2);
+
+static const struct attribute_group fan_attribute_groups[] = {
+        { .attrs = fan1_attributes },
+        { .attrs = fan2_attributes }
+};
+
+/*
+ * Temperature sensors sysfs entries.
+ */
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 5);
+static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 6);
+static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 7);
+static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 9);
+static SENSOR_DEVICE_ATTR(temp11_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 10);
+static SENSOR_DEVICE_ATTR(temp12_input, S_IRUGO,
+                                        applesmc_show_temperature, NULL, 11);
+
+static struct attribute *temperature_attributes[] = {
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_temp3_input.dev_attr.attr,
+        &sensor_dev_attr_temp4_input.dev_attr.attr,
+        &sensor_dev_attr_temp5_input.dev_attr.attr,
+        &sensor_dev_attr_temp6_input.dev_attr.attr,
+        &sensor_dev_attr_temp7_input.dev_attr.attr,
+        &sensor_dev_attr_temp8_input.dev_attr.attr,
+        &sensor_dev_attr_temp9_input.dev_attr.attr,
+        &sensor_dev_attr_temp10_input.dev_attr.attr,
+        &sensor_dev_attr_temp11_input.dev_attr.attr,
+        &sensor_dev_attr_temp12_input.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group temperature_attributes_group =
+        { .attrs = temperature_attributes };
+
+/* Module stuff */
+
+/*
+ * applesmc_dmi_match - found a match.  return one, short-circuiting the hunt.
+ */
+static int applesmc_dmi_match(struct dmi_system_id *id)
+{
+        int i = 0;
+        struct dmi_match_data* dmi_data = id->driver_data;
+        printk(KERN_INFO "applesmc: %s detected:\n", id->ident);
+        applesmc_accelerometer = dmi_data->accelerometer;
+        printk(KERN_INFO "applesmc:  - Model %s accelerometer\n",
+                                applesmc_accelerometer ? "with" : "without");
+        applesmc_light = dmi_data->light;
+        printk(KERN_INFO "applesmc:  - Model %s light sensors and backlight\n",
+                                        applesmc_light ? "with" : "without");
+
+        applesmc_temperature_set =  dmi_data->temperature_set;
+        while (temperature_sensors_sets[applesmc_temperature_set][i] != NULL)
+                i++;
+        printk(KERN_INFO "applesmc:  - Model with %d temperature sensors\n", i);
+        return 1;
+}
+
+/* Create accelerometer ressources */
+static int applesmc_create_accelerometer(void)
+{
+        int ret;
+
+        ret = sysfs_create_group(&pdev->dev.kobj,
+                                        &accelerometer_attributes_group);
+        if (ret)
+                goto out;
+
+        applesmc_idev = input_allocate_device();
+        if (!applesmc_idev) {
+                ret = -ENOMEM;
+                goto out_sysfs;
+        }
+
+        /* initial calibrate for the input device */
+        applesmc_calibrate();
+
+        /* initialize the input class */
+        applesmc_idev->name = "applesmc";
+        applesmc_idev->id.bustype = BUS_HOST;
+        applesmc_idev->dev.parent = &pdev->dev;
+        applesmc_idev->evbit[0] = BIT(EV_ABS);
+        applesmc_idev->open = applesmc_idev_open;
+        applesmc_idev->close = applesmc_idev_close;
+        input_set_abs_params(applesmc_idev, ABS_X,
+                        -256, 256, APPLESMC_INPUT_FUZZ, APPLESMC_INPUT_FLAT);
+        input_set_abs_params(applesmc_idev, ABS_Y,
+                        -256, 256, APPLESMC_INPUT_FUZZ, APPLESMC_INPUT_FLAT);
+
+        ret = input_register_device(applesmc_idev);
+        if (ret)
+                goto out_idev;
+
+        /* start up our timer for the input device */
+        init_timer(&applesmc_timer);
+        applesmc_timer.function = applesmc_idev_poll;
+        applesmc_timer.expires = jiffies + APPLESMC_POLL_PERIOD;
+
+        return 0;
+
+out_idev:
+        input_free_device(applesmc_idev);
+
+out_sysfs:
+        sysfs_remove_group(&pdev->dev.kobj, &accelerometer_attributes_group);
+
+out:
+        printk(KERN_WARNING "applesmc: driver init failed (ret=%d)!\n", ret);
+        return ret;
+}
+
+/* Release all ressources used by the accelerometer */
+static void applesmc_release_accelerometer(void)
+{
+        del_timer_sync(&applesmc_timer);
+        input_unregister_device(applesmc_idev);
+        sysfs_remove_group(&pdev->dev.kobj, &accelerometer_attributes_group);
+}
+
+static __initdata struct dmi_match_data applesmc_dmi_data[] = {
+/* MacBook Pro: accelerometer, backlight and temperature set 0 */
+        { .accelerometer = 1, .light = 1, .temperature_set = 0 },
+/* MacBook: accelerometer and temperature set 0 */
+        { .accelerometer = 1, .light = 0, .temperature_set = 0 },
+/* MacBook: temperature set 1 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 1 }
+};
+
+/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
+ * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
+static __initdata struct dmi_system_id applesmc_whitelist[] = {
+        { applesmc_dmi_match, "Apple MacBook Pro", {
+          DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
+                (void*)&applesmc_dmi_data[0]},
+        { applesmc_dmi_match, "Apple MacBook", {
+          DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
+                (void*)&applesmc_dmi_data[1]},
+        { applesmc_dmi_match, "Apple Macmini", {
+          DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
+                (void*)&applesmc_dmi_data[2]},
+        { .ident = NULL }
+};
+
+static int __init applesmc_init(void)
+{
+        int ret;
+        int count;
+        int i;
+
+        mutex_init(&applesmc_lock);
+
+        if (!dmi_check_system(applesmc_whitelist)) {
+                printk(KERN_WARNING "applesmc: supported laptop not found!\n");
+                ret = -ENODEV;
+                goto out;
+        }
+
+        if (!request_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS,
+                                                                "applesmc")) {
+                ret = -ENXIO;
+                goto out;
+        }
+
+        ret = platform_driver_register(&applesmc_driver);
+        if (ret)
+                goto out_region;
+
+        pdev = platform_device_register_simple("applesmc", APPLESMC_DATA_PORT,
+                                               NULL, 0);
+        if (IS_ERR(pdev)) {
+                ret = PTR_ERR(pdev);
+                goto out_driver;
+        }
+
+        /* Create key enumeration sysfs files */
+        ret = sysfs_create_group(&pdev->dev.kobj, &key_enumeration_group);
+        if (ret)
+                goto out_device;
+
+        /* create fan files */
+        count = applesmc_get_fan_count();
+        if (count < 0) {
+                printk(KERN_ERR "applesmc: Cannot get the number of fans.\n");
+        } else {
+                printk(KERN_INFO "applesmc: %d fans found.\n", count);
+
+                switch (count) {
+                default:
+                        printk(KERN_WARNING "applesmc: More than 2 fans found,"
+                                        " but at most 2 fans are supported"
+                                                " by the driver.\n");
+                case 2:
+                        ret = sysfs_create_group(&pdev->dev.kobj,
+                                                 &fan_attribute_groups[1]);
+                        if (ret)
+                                goto out_key_enumeration;
+                case 1:
+                        ret = sysfs_create_group(&pdev->dev.kobj,
+                                                 &fan_attribute_groups[0]);
+                        if (ret)
+                                goto out_fan_1;
+                case 0:
+                        ;
+                }
+        }
+
+        for (i = 0;
+             temperature_sensors_sets[applesmc_temperature_set][i] != NULL;
+             i++) {
+                if (temperature_attributes[i] == NULL) {
+                        printk(KERN_ERR "applesmc: More temperature sensors "
+                                "in temperature_sensors_sets (at least %i)"
+                                "than available sysfs files in "
+                                "temperature_attributes (%i), please report "
+                                "this bug.\n", i, i-1);
+                        goto out_temperature;
+                }
+                ret = sysfs_create_file(&pdev->dev.kobj,
+                                                temperature_attributes[i]);
+                if (ret)
+                        goto out_temperature;
+        }
+
+        if (applesmc_accelerometer) {
+                ret = applesmc_create_accelerometer();
+                if (ret)
+                        goto out_temperature;
+        }
+
+        if (applesmc_light) {
+                /* Add light sensor file */
+                ret = sysfs_create_file(&pdev->dev.kobj, &dev_attr_light.attr);
+                if (ret)
+                        goto out_accelerometer;
+
+                /* Create the workqueue */
+                applesmc_led_wq = create_singlethread_workqueue("applesmc-led");
+                if (!applesmc_led_wq) {
+                        ret = -ENOMEM;
+                        goto out_light_sysfs;
+                }
+
+                /* register as a led device */
+                ret = led_classdev_register(&pdev->dev, &applesmc_backlight);
+                if (ret < 0)
+                        goto out_light_wq;
+        }
+
+        hwmon_class_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(hwmon_class_dev)) {
+                ret = PTR_ERR(hwmon_class_dev);
+                goto out_light_ledclass;
+        }
+
+        printk(KERN_INFO "applesmc: driver successfully loaded.\n");
+
+        return 0;
+
+out_light_ledclass:
+        if (applesmc_light)
+                led_classdev_unregister(&applesmc_backlight);
+out_light_wq:
+        if (applesmc_light)
+                destroy_workqueue(applesmc_led_wq);
+out_light_sysfs:
+        if (applesmc_light)
+                sysfs_remove_file(&pdev->dev.kobj, &dev_attr_light.attr);
+out_accelerometer:
+        if (applesmc_accelerometer)
+                applesmc_release_accelerometer();
+out_temperature:
+        sysfs_remove_group(&pdev->dev.kobj, &temperature_attributes_group);
+        sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[0]);
+out_fan_1:
+        sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[1]);
+out_key_enumeration:
+        sysfs_remove_group(&pdev->dev.kobj, &key_enumeration_group);
+out_device:
+        platform_device_unregister(pdev);
+out_driver:
+        platform_driver_unregister(&applesmc_driver);
+out_region:
+        release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS);
+out:
+        printk(KERN_WARNING "applesmc: driver init failed (ret=%d)!\n", ret);
+        return ret;
+}
+
+static void __exit applesmc_exit(void)
+{
+        hwmon_device_unregister(hwmon_class_dev);
+        if (applesmc_light) {
+                led_classdev_unregister(&applesmc_backlight);
+                destroy_workqueue(applesmc_led_wq);
+                sysfs_remove_file(&pdev->dev.kobj, &dev_attr_light.attr);
+        }
+        if (applesmc_accelerometer)
+                applesmc_release_accelerometer();
+        sysfs_remove_group(&pdev->dev.kobj, &temperature_attributes_group);
+        sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[0]);
+        sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[1]);
+        sysfs_remove_group(&pdev->dev.kobj, &key_enumeration_group);
+        platform_device_unregister(pdev);
+        platform_driver_unregister(&applesmc_driver);
+        release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS);
+
+        printk(KERN_INFO "applesmc: driver unloaded.\n");
+}
+
+module_init(applesmc_init);
+module_exit(applesmc_exit);
+
+MODULE_AUTHOR("Nicolas Boichat");
+MODULE_DESCRIPTION("Apple SMC");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
new file mode 100644
index 000000000000..75e3911810a3
--- /dev/null
+++ b/drivers/hwmon/coretemp.c
@@ -0,0 +1,408 @@
+/*
+ * coretemp.c - Linux kernel module for hardware monitoring
+ *
+ * Copyright (C) 2007 Rudolf Marek <r.marek@assembler.cz>
+ *
+ * Inspired from many hwmon drivers
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/hwmon.h>
+#include <linux/sysfs.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/list.h>
+#include <linux/platform_device.h>
+#include <linux/cpu.h>
+#include <asm/msr.h>
+#include <asm/processor.h>
+
+#define DRVNAME "coretemp"
+
+typedef enum { SHOW_TEMP, SHOW_TJMAX, SHOW_LABEL, SHOW_NAME } SHOW;
+
+/*
+ * Functions declaration
+ */
+
+static struct coretemp_data *coretemp_update_device(struct device *dev);
+
+struct coretemp_data {
+        struct class_device *class_dev;
+        struct mutex update_lock;
+        const char *name;
+        u32 id;
+        char valid;             /* zero until following fields are valid */
+        unsigned long last_updated;     /* in jiffies */
+        int temp;
+        int tjmax;
+        u8 alarm;
+};
+
+static struct coretemp_data *coretemp_update_device(struct device *dev);
+
+/*
+ * Sysfs stuff
+ */
+
+static ssize_t show_name(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
+{
+        int ret;
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct coretemp_data *data = dev_get_drvdata(dev);
+
+        if (attr->index == SHOW_NAME)
+                ret = sprintf(buf, "%s\n", data->name);
+        else    /* show label */
+                ret = sprintf(buf, "Core %d\n", data->id);
+        return ret;
+}
+
+static ssize_t show_alarm(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
+{
+        struct coretemp_data *data = coretemp_update_device(dev);
+        /* read the Out-of-spec log, never clear */
+        return sprintf(buf, "%d\n", data->alarm);
+}
+
+static ssize_t show_temp(struct device *dev,
+                         struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct coretemp_data *data = coretemp_update_device(dev);
+        int err;
+
+        if (attr->index == SHOW_TEMP)
+                err = data->valid ? sprintf(buf, "%d\n", data->temp) : -EAGAIN;
+        else
+                err = sprintf(buf, "%d\n", data->tjmax);
+
+        return err;
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL,
+                          SHOW_TEMP);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL,
+                          SHOW_TJMAX);
+static DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL);
+static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL);
+static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, SHOW_NAME);
+
+static struct attribute *coretemp_attributes[] = {
+        &sensor_dev_attr_name.dev_attr.attr,
+        &sensor_dev_attr_temp1_label.dev_attr.attr,
+        &dev_attr_temp1_crit_alarm.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp1_crit.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group coretemp_group = {
+        .attrs = coretemp_attributes,
+};
+
+static struct coretemp_data *coretemp_update_device(struct device *dev)
+{
+        struct coretemp_data *data = dev_get_drvdata(dev);
+
+        mutex_lock(&data->update_lock);
+
+        if (!data->valid || time_after(jiffies, data->last_updated + HZ)) {
+                u32 eax, edx;
+
+                data->valid = 0;
+                rdmsr_on_cpu(data->id, MSR_IA32_THERM_STATUS, &eax, &edx);
+                data->alarm = (eax >> 5) & 1;
+                /* update only if data has been valid */
+                if (eax & 0x80000000) {
+                        data->temp = data->tjmax - (((eax >> 16)
+                                                        & 0x7f) * 1000);
+                        data->valid = 1;
+                } else {
+                        dev_dbg(dev, "Temperature data invalid (0x%x)\n", eax);
+                }
+                data->last_updated = jiffies;
+        }
+
+        mutex_unlock(&data->update_lock);
+        return data;
+}
+
+static int __devinit coretemp_probe(struct platform_device *pdev)
+{
+        struct coretemp_data *data;
+        struct cpuinfo_x86 *c = &(cpu_data)[pdev->id];
+        int err;
+        u32 eax, edx;
+
+        if (!(data = kzalloc(sizeof(struct coretemp_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                dev_err(&pdev->dev, "Out of memory\n");
+                goto exit;
+        }
+
+        data->id = pdev->id;
+        data->name = "coretemp";
+        mutex_init(&data->update_lock);
+        /* Tjmax default is 100 degrees C */
+        data->tjmax = 100000;
+
+        /* test if we can access the THERM_STATUS MSR */
+        err = rdmsr_safe_on_cpu(data->id, MSR_IA32_THERM_STATUS, &eax, &edx);
+        if (err) {
+                dev_err(&pdev->dev,
+                        "Unable to access THERM_STATUS MSR, giving up\n");
+                goto exit_free;
+        }
+
+        /* Some processors have Tjmax 85 following magic should detect it
+           Intel won't disclose the information without signed NDA, but
+           individuals cannot sign it. Catch(ed) 22.
+        */
+
+        if (((c->x86_model == 0xf) && (c->x86_mask > 3)) ||
+                (c->x86_model == 0xe))  {
+                err = rdmsr_safe_on_cpu(data->id, 0xee, &eax, &edx);
+                if (err) {
+                        dev_warn(&pdev->dev,
+                                 "Unable to access MSR 0xEE, Tjmax left at %d "
+                                 "degrees C\n", data->tjmax/1000);
+                } else if (eax & 0x40000000) {
+                        data->tjmax = 85000;
+                }
+        }
+
+        platform_set_drvdata(pdev, data);
+
+        if ((err = sysfs_create_group(&pdev->dev.kobj, &coretemp_group)))
+                goto exit_free;
+
+        data->class_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                dev_err(&pdev->dev, "Class registration failed (%d)\n",
+                        err);
+                goto exit_class;
+        }
+
+        return 0;
+
+exit_class:
+        sysfs_remove_group(&pdev->dev.kobj, &coretemp_group);
+exit_free:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int __devexit coretemp_remove(struct platform_device *pdev)
+{
+        struct coretemp_data *data = platform_get_drvdata(pdev);
+
+        hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&pdev->dev.kobj, &coretemp_group);
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+        return 0;
+}
+
+static struct platform_driver coretemp_driver = {
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = DRVNAME,
+        },
+        .probe = coretemp_probe,
+        .remove = __devexit_p(coretemp_remove),
+};
+
+struct pdev_entry {
+        struct list_head list;
+        struct platform_device *pdev;
+        unsigned int cpu;
+};
+
+static LIST_HEAD(pdev_list);
+static DEFINE_MUTEX(pdev_list_mutex);
+
+static int __cpuinit coretemp_device_add(unsigned int cpu)
+{
+        int err;
+        struct platform_device *pdev;
+        struct pdev_entry *pdev_entry;
+
+        pdev = platform_device_alloc(DRVNAME, cpu);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL);
+        if (!pdev_entry) {
+                err = -ENOMEM;
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_free;
+        }
+
+        pdev_entry->pdev = pdev;
+        pdev_entry->cpu = cpu;
+        mutex_lock(&pdev_list_mutex);
+        list_add_tail(&pdev_entry->list, &pdev_list);
+        mutex_unlock(&pdev_list_mutex);
+
+        return 0;
+
+exit_device_free:
+        kfree(pdev_entry);
+exit_device_put:
+        platform_device_put(pdev);
+exit:
+        return err;
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+void coretemp_device_remove(unsigned int cpu)
+{
+        struct pdev_entry *p, *n;
+        mutex_lock(&pdev_list_mutex);
+        list_for_each_entry_safe(p, n, &pdev_list, list) {
+                if (p->cpu == cpu) {
+                        platform_device_unregister(p->pdev);
+                        list_del(&p->list);
+                        kfree(p);
+                }
+        }
+        mutex_unlock(&pdev_list_mutex);
+}
+
+static int coretemp_cpu_callback(struct notifier_block *nfb,
+                                 unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned long) hcpu;
+
+        switch (action) {
+        case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
+                coretemp_device_add(cpu);
+                break;
+        case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
+                coretemp_device_remove(cpu);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block __cpuinitdata coretemp_cpu_notifier = {
+        .notifier_call = coretemp_cpu_callback,
+};
+#endif                          /* !CONFIG_HOTPLUG_CPU */
+
+static int __init coretemp_init(void)
+{
+        int i, err = -ENODEV;
+        struct pdev_entry *p, *n;
+
+        printk(KERN_NOTICE DRVNAME ": This driver uses undocumented features "
+                "of Core CPU. Temperature might be wrong!\n");
+
+        /* quick check if we run Intel */
+        if (cpu_data[0].x86_vendor != X86_VENDOR_INTEL)
+                goto exit;
+
+        err = platform_driver_register(&coretemp_driver);
+        if (err)
+                goto exit;
+
+        for_each_online_cpu(i) {
+                struct cpuinfo_x86 *c = &(cpu_data)[i];
+
+                /* check if family 6, models e, f */
+                if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
+                    !((c->x86_model == 0xe) || (c->x86_model == 0xf))) {
+
+                        /* supported CPU not found, but report the unknown
+                           family 6 CPU */
+                        if ((c->x86 == 0x6) && (c->x86_model > 0xf))
+                                printk(KERN_WARNING DRVNAME ": Unknown CPU "
+                                        "model %x\n", c->x86_model);
+                        continue;
+                }
+
+                err = coretemp_device_add(i);
+                if (err)
+                        goto exit_devices_unreg;
+        }
+        if (list_empty(&pdev_list)) {
+                err = -ENODEV;
+                goto exit_driver_unreg;
+        }
+
+#ifdef CONFIG_HOTPLUG_CPU
+        register_hotcpu_notifier(&coretemp_cpu_notifier);
+#endif
+        return 0;
+
+exit_devices_unreg:
+        mutex_lock(&pdev_list_mutex);
+        list_for_each_entry_safe(p, n, &pdev_list, list) {
+                platform_device_unregister(p->pdev);
+                list_del(&p->list);
+                kfree(p);
+        }
+        mutex_unlock(&pdev_list_mutex);
+exit_driver_unreg:
+        platform_driver_unregister(&coretemp_driver);
+exit:
+        return err;
+}
+
+static void __exit coretemp_exit(void)
+{
+        struct pdev_entry *p, *n;
+#ifdef CONFIG_HOTPLUG_CPU
+        unregister_hotcpu_notifier(&coretemp_cpu_notifier);
+#endif
+        mutex_lock(&pdev_list_mutex);
+        list_for_each_entry_safe(p, n, &pdev_list, list) {
+                platform_device_unregister(p->pdev);
+                list_del(&p->list);
+                kfree(p);
+        }
+        mutex_unlock(&pdev_list_mutex);
+        platform_driver_unregister(&coretemp_driver);
+}
+
+MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>");
+MODULE_DESCRIPTION("Intel Core temperature monitor");
+MODULE_LICENSE("GPL");
+
+module_init(coretemp_init)
+module_exit(coretemp_exit)
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 7c2973487122..cdbe309b8fc4 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -35,6 +35,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 
 static struct platform_device *pdev;
@@ -1140,6 +1141,13 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
         }
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start + ADDR_REG_OFFSET, 2, DRVNAME)) {
+                err = -EBUSY;
+                dev_err(&pdev->dev, "Failed to request region 0x%lx-0x%lx\n",
+                        (unsigned long)(res->start + ADDR_REG_OFFSET),
+                        (unsigned long)(res->start + ADDR_REG_OFFSET + 1));
+                goto exit_free;
+        }
         data->addr = res->start;
         data->name = names[sio_data->kind];
         mutex_init(&data->update_lock);
@@ -1165,7 +1173,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
 
         /* Register sysfs interface files */
         if ((err = sysfs_create_group(&pdev->dev.kobj, &f71805f_group)))
-                goto exit_free;
+                goto exit_release_region;
         if (data->has_in & (1 << 4)) { /* in4 */
                 if ((err = sysfs_create_group(&pdev->dev.kobj,
                                               &f71805f_group_optin[0])))
@@ -1219,6 +1227,8 @@ exit_remove_files:
         for (i = 0; i < 4; i++)
                 sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
         sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
+exit_release_region:
+        release_region(res->start + ADDR_REG_OFFSET, 2);
 exit_free:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
@@ -1229,6 +1239,7 @@ exit:
 static int __devexit f71805f_remove(struct platform_device *pdev)
 {
         struct f71805f_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
         int i;
 
         platform_set_drvdata(pdev, NULL);
@@ -1239,6 +1250,9 @@ static int __devexit f71805f_remove(struct platform_device *pdev)
         sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
         kfree(data);
 
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start + ADDR_REG_OFFSET, 2);
+
         return 0;
 }
 
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index bf759ea545ac..e0cf5e6fe5bc 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -30,10 +30,12 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/kernel.h>
+#include <linux/mutex.h>
 #include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/dmi.h>
 #include <linux/jiffies.h>
+
 #include <asm/io.h>
 
 #define HDAPS_LOW_PORT          0x1600  /* first port used by hdaps */
@@ -71,10 +73,10 @@ static u8 km_activity;
 static int rest_x;
 static int rest_y;
 
-static DECLARE_MUTEX(hdaps_sem);
+static DEFINE_MUTEX(hdaps_mtx);
 
 /*
- * __get_latch - Get the value from a given port.  Callers must hold hdaps_sem.
+ * __get_latch - Get the value from a given port.  Callers must hold hdaps_mtx.
  */
 static inline u8 __get_latch(u16 port)
 {
@@ -83,7 +85,7 @@ static inline u8 __get_latch(u16 port)
 
 /*
  * __check_latch - Check a port latch for a given value.  Returns zero if the
- * port contains the given value.  Callers must hold hdaps_sem.
+ * port contains the given value.  Callers must hold hdaps_mtx.
  */
 static inline int __check_latch(u16 port, u8 val)
 {
@@ -94,7 +96,7 @@ static inline int __check_latch(u16 port, u8 val)
 
 /*
  * __wait_latch - Wait up to 100us for a port latch to get a certain value,
- * returning zero if the value is obtained.  Callers must hold hdaps_sem.
+ * returning zero if the value is obtained.  Callers must hold hdaps_mtx.
  */
 static int __wait_latch(u16 port, u8 val)
 {
@@ -111,7 +113,7 @@ static int __wait_latch(u16 port, u8 val)
 
 /*
  * __device_refresh - request a refresh from the accelerometer.  Does not wait
- * for refresh to complete.  Callers must hold hdaps_sem.
+ * for refresh to complete.  Callers must hold hdaps_mtx.
  */
 static void __device_refresh(void)
 {
@@ -125,7 +127,7 @@ static void __device_refresh(void)
 /*
  * __device_refresh_sync - request a synchronous refresh from the
  * accelerometer.  We wait for the refresh to complete.  Returns zero if
- * successful and nonzero on error.  Callers must hold hdaps_sem.
+ * successful and nonzero on error.  Callers must hold hdaps_mtx.
  */
 static int __device_refresh_sync(void)
 {
@@ -135,7 +137,7 @@ static int __device_refresh_sync(void)
 
 /*
  * __device_complete - indicate to the accelerometer that we are done reading
- * data, and then initiate an async refresh.  Callers must hold hdaps_sem.
+ * data, and then initiate an async refresh.  Callers must hold hdaps_mtx.
  */
 static inline void __device_complete(void)
 {
@@ -153,7 +155,7 @@ static int hdaps_readb_one(unsigned int port, u8 *val)
 {
         int ret;
 
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mtx);
 
         /* do a sync refresh -- we need to be sure that we read fresh data */
         ret = __device_refresh_sync();
@@ -164,7 +166,7 @@ static int hdaps_readb_one(unsigned int port, u8 *val)
         __device_complete();
 
 out:
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mtx);
         return ret;
 }
 
@@ -199,9 +201,9 @@ static int hdaps_read_pair(unsigned int port1, unsigned int port2,
 {
         int ret;
 
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mtx);
         ret = __hdaps_read_pair(port1, port2, val1, val2);
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mtx);
 
         return ret;
 }
@@ -214,7 +216,7 @@ static int hdaps_device_init(void)
 {
         int total, ret = -ENXIO;
 
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mtx);
 
         outb(0x13, 0x1610);
         outb(0x01, 0x161f);
@@ -280,7 +282,7 @@ static int hdaps_device_init(void)
         }
 
 out:
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mtx);
         return ret;
 }
 
@@ -314,7 +316,7 @@ static struct platform_driver hdaps_driver = {
 };
 
 /*
- * hdaps_calibrate - Set our "resting" values.  Callers must hold hdaps_sem.
+ * hdaps_calibrate - Set our "resting" values.  Callers must hold hdaps_mtx.
  */
 static void hdaps_calibrate(void)
 {
@@ -326,7 +328,7 @@ static void hdaps_mousedev_poll(unsigned long unused)
         int x, y;
 
         /* Cannot sleep.  Try nonblockingly.  If we fail, try again later. */
-        if (down_trylock(&hdaps_sem)) {
+        if (mutex_trylock(&hdaps_mtx)) {
                 mod_timer(&hdaps_timer,jiffies + HDAPS_POLL_PERIOD);
                 return;
         }
@@ -341,7 +343,7 @@ static void hdaps_mousedev_poll(unsigned long unused)
         mod_timer(&hdaps_timer, jiffies + HDAPS_POLL_PERIOD);
 
 out:
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mtx);
 }
 
 
@@ -421,9 +423,9 @@ static ssize_t hdaps_calibrate_store(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
 {
-        down(&hdaps_sem);
+        mutex_lock(&hdaps_mtx);
         hdaps_calibrate();
-        up(&hdaps_sem);
+        mutex_unlock(&hdaps_mtx);
 
         return count;
 }
@@ -572,7 +574,7 @@ static int __init hdaps_init(void)
 
         /* initialize the input class */
         hdaps_idev->name = "hdaps";
-        hdaps_idev->cdev.dev = &pdev->dev;
+        hdaps_idev->dev.parent = &pdev->dev;
         hdaps_idev->evbit[0] = BIT(EV_ABS);
         input_set_abs_params(hdaps_idev, ABS_X,
                         -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index b80f6ed5acfc..5aab23b93e24 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -166,16 +166,16 @@ static struct vrm_model vrm_models[] = {
         {X86_VENDOR_INTEL, 0x6, 0xE, ANY, 14},          /* Intel Core (65 nm) */
         {X86_VENDOR_INTEL, 0x6, 0xF, ANY, 110},         /* Intel Conroe */
         {X86_VENDOR_INTEL, 0x6, ANY, ANY, 82},          /* any P6 */
-        {X86_VENDOR_INTEL, 0x7, ANY, ANY, 0},           /* Itanium */
         {X86_VENDOR_INTEL, 0xF, 0x0, ANY, 90},          /* P4 */
         {X86_VENDOR_INTEL, 0xF, 0x1, ANY, 90},          /* P4 Willamette */
         {X86_VENDOR_INTEL, 0xF, 0x2, ANY, 90},          /* P4 Northwood */
         {X86_VENDOR_INTEL, 0xF, ANY, ANY, 100},         /* Prescott and above assume VRD 10 */
-        {X86_VENDOR_INTEL, 0x10, ANY, ANY, 0},          /* Itanium 2 */
         {X86_VENDOR_CENTAUR, 0x6, 0x7, ANY, 85},        /* Eden ESP/Ezra */
         {X86_VENDOR_CENTAUR, 0x6, 0x8, 0x7, 85},        /* Ezra T */
         {X86_VENDOR_CENTAUR, 0x6, 0x9, 0x7, 85},        /* Nemiah */
-        {X86_VENDOR_CENTAUR, 0x6, 0x9, ANY, 17},        /* C3-M */
+        {X86_VENDOR_CENTAUR, 0x6, 0x9, ANY, 17},        /* C3-M, Eden-N */
+        {X86_VENDOR_CENTAUR, 0x6, 0xA, 0x7, 0},         /* No information */
+        {X86_VENDOR_CENTAUR, 0x6, 0xA, ANY, 13},        /* C7, Esther */
         {X86_VENDOR_UNKNOWN, ANY, ANY, ANY, 0}          /* stop here */
 };
 
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 7c65b8bb6d72..a40166ffad12 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -24,6 +24,7 @@
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include "lm75.h"
@@ -39,10 +40,12 @@ I2C_CLIENT_INSMOD_1(lm75);
 /* Many LM75 constants specified below */
 
 /* The LM75 registers */
-#define LM75_REG_TEMP           0x00
 #define LM75_REG_CONF           0x01
-#define LM75_REG_TEMP_HYST      0x02
-#define LM75_REG_TEMP_OS        0x03
+static const u8 LM75_REG_TEMP[3] = {
+        0x00,           /* input */
+        0x03,           /* max */
+        0x02,           /* hyst */
+};
 
 /* Each client has this additional data */
 struct lm75_data {
@@ -51,9 +54,10 @@ struct lm75_data {
         struct mutex            update_lock;
         char                    valid;          /* !=0 if following fields are valid */
         unsigned long           last_updated;   /* In jiffies */
-        u16                     temp_input;     /* Register values */
-        u16                     temp_max;
-        u16                     temp_hyst;
+        u16                     temp[3];        /* Register values,
+                                                   0 = input
+                                                   1 = max
+                                                   2 = hyst */
 };
 
 static int lm75_attach_adapter(struct i2c_adapter *adapter);
@@ -75,35 +79,36 @@ static struct i2c_driver lm75_driver = {
         .detach_client  = lm75_detach_client,
 };
 
-#define show(value)     \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
-{                                                                       \
-        struct lm75_data *data = lm75_update_device(dev);               \
-        return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value));   \
+static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+                         char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct lm75_data *data = lm75_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       LM75_TEMP_FROM_REG(data->temp[attr->index]));
 }
-show(temp_max);
-show(temp_hyst);
-show(temp_input);
-
-#define set(value, reg) \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
-{                                                               \
-        struct i2c_client *client = to_i2c_client(dev);         \
-        struct lm75_data *data = i2c_get_clientdata(client);    \
-        int temp = simple_strtoul(buf, NULL, 10);               \
-                                                                \
-        mutex_lock(&data->update_lock);                         \
-        data->value = LM75_TEMP_TO_REG(temp);                   \
-        lm75_write_value(client, reg, data->value);             \
-        mutex_unlock(&data->update_lock);                                       \
-        return count;                                           \
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm75_data *data = i2c_get_clientdata(client);
+        int nr = attr->index;
+        unsigned long temp = simple_strtoul(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->temp[nr] = LM75_TEMP_TO_REG(temp);
+        lm75_write_value(client, LM75_REG_TEMP[nr], data->temp[nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
 }
-set(temp_max, LM75_REG_TEMP_OS);
-set(temp_hyst, LM75_REG_TEMP_HYST);
 
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, set_temp_max);
-static DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO, show_temp_hyst, set_temp_hyst);
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input, NULL);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
+                        show_temp, set_temp, 1);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,
+                        show_temp, set_temp, 2);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 
 static int lm75_attach_adapter(struct i2c_adapter *adapter)
 {
@@ -113,9 +118,9 @@ static int lm75_attach_adapter(struct i2c_adapter *adapter)
 }
 
 static struct attribute *lm75_attributes[] = {
-        &dev_attr_temp1_input.attr,
-        &dev_attr_temp1_max.attr,
-        &dev_attr_temp1_max_hyst.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
 
         NULL
 };
@@ -283,11 +288,12 @@ static struct lm75_data *lm75_update_device(struct device *dev)
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
+                int i;
                 dev_dbg(&client->dev, "Starting lm75 update\n");
 
-                data->temp_input = lm75_read_value(client, LM75_REG_TEMP);
-                data->temp_max = lm75_read_value(client, LM75_REG_TEMP_OS);
-                data->temp_hyst = lm75_read_value(client, LM75_REG_TEMP_HYST);
+                for (i = 0; i < ARRAY_SIZE(data->temp); i++)
+                        data->temp[i] = lm75_read_value(client,
+                                                        LM75_REG_TEMP[i]);
                 data->last_updated = jiffies;
                 data->valid = 1;
         }
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 886786c33916..9fb572f03ba5 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -2,6 +2,7 @@
     lm78.c - Part of lm_sensors, Linux kernel modules for hardware
              monitoring
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> 
+    Copyright (c) 2007        Jean Delvare <khali@linux-fr.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
@@ -23,13 +24,18 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
+#include <linux/ioport.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <asm/io.h>
 
+/* ISA device, if found */
+static struct platform_device *pdev;
+
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
                                         0x25, 0x26, 0x27, 0x28, 0x29,
@@ -121,12 +127,8 @@ static inline int TEMP_FROM_REG(s8 val)
    a bit - except if there could be more than one SMBus. Groan. No solution
    for this yet. */
 
-/* This module may seem overly long and complicated. In fact, it is not so
-   bad. Quite a lot of bookkeeping is done. A real driver can often cut
-   some corners. */
-
-/* For each registered chip, we need to keep some data in memory.
-   The structure is dynamically allocated. */
+/* For ISA chips, we abuse the i2c_client addr and name fields. We also use
+   the driver field to differentiate between I2C and ISA chips. */
 struct lm78_data {
         struct i2c_client client;
         struct class_device *class_dev;
@@ -152,14 +154,16 @@ struct lm78_data {
 
 
 static int lm78_attach_adapter(struct i2c_adapter *adapter);
-static int lm78_isa_attach_adapter(struct i2c_adapter *adapter);
 static int lm78_detect(struct i2c_adapter *adapter, int address, int kind);
 static int lm78_detach_client(struct i2c_client *client);
 
-static int lm78_read_value(struct i2c_client *client, u8 reg);
-static int lm78_write_value(struct i2c_client *client, u8 reg, u8 value);
+static int __devinit lm78_isa_probe(struct platform_device *pdev);
+static int __devexit lm78_isa_remove(struct platform_device *pdev);
+
+static int lm78_read_value(struct lm78_data *data, u8 reg);
+static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value);
 static struct lm78_data *lm78_update_device(struct device *dev);
-static void lm78_init_client(struct i2c_client *client);
+static void lm78_init_device(struct lm78_data *data);
 
 
 static struct i2c_driver lm78_driver = {
@@ -171,95 +175,78 @@ static struct i2c_driver lm78_driver = {
         .detach_client  = lm78_detach_client,
 };
 
-static struct i2c_driver lm78_isa_driver = {
+static struct platform_driver lm78_isa_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
-                .name   = "lm78-isa",
+                .name   = "lm78",
         },
-        .attach_adapter = lm78_isa_attach_adapter,
-        .detach_client  = lm78_detach_client,
+        .probe          = lm78_isa_probe,
+        .remove         = lm78_isa_remove,
 };
 
 
 /* 7 Voltages */
-static ssize_t show_in(struct device *dev, char *buf, int nr)
+static ssize_t show_in(struct device *dev, struct device_attribute *da,
+                       char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr]));
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in[attr->index]));
 }
 
-static ssize_t show_in_min(struct device *dev, char *buf, int nr)
+static ssize_t show_in_min(struct device *dev, struct device_attribute *da,
+                           char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr]));
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[attr->index]));
 }
 
-static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+static ssize_t show_in_max(struct device *dev, struct device_attribute *da,
+                           char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr]));
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[attr->index]));
 }
 
-static ssize_t set_in_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_in_min(struct device *dev, struct device_attribute *da,
+                          const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct lm78_data *data = dev_get_drvdata(dev);
         unsigned long val = simple_strtoul(buf, NULL, 10);
+        int nr = attr->index;
 
         mutex_lock(&data->update_lock);
         data->in_min[nr] = IN_TO_REG(val);
-        lm78_write_value(client, LM78_REG_IN_MIN(nr), data->in_min[nr]);
+        lm78_write_value(data, LM78_REG_IN_MIN(nr), data->in_min[nr]);
         mutex_unlock(&data->update_lock);
         return count;
 }
 
-static ssize_t set_in_max(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_in_max(struct device *dev, struct device_attribute *da,
+                          const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct lm78_data *data = dev_get_drvdata(dev);
         unsigned long val = simple_strtoul(buf, NULL, 10);
+        int nr = attr->index;
 
         mutex_lock(&data->update_lock);
         data->in_max[nr] = IN_TO_REG(val);
-        lm78_write_value(client, LM78_REG_IN_MAX(nr), data->in_max[nr]);
+        lm78_write_value(data, LM78_REG_IN_MAX(nr), data->in_max[nr]);
         mutex_unlock(&data->update_lock);
         return count;
 }
         
 #define show_in_offset(offset)                                  \
-static ssize_t                                                  \
-        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
-{                                                               \
-        return show_in(dev, buf, offset);                       \
-}                                                               \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO,                 \
-                show_in##offset, NULL);                         \
-static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
-{                                                               \
-        return show_in_min(dev, buf, offset);                   \
-}                                                               \
-static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)   \
-{                                                               \
-        return show_in_max(dev, buf, offset);                   \
-}                                                               \
-static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
-                const char *buf, size_t count)                  \
-{                                                               \
-        return set_in_min(dev, buf, count, offset);             \
-}                                                               \
-static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
-                const char *buf, size_t count)                  \
-{                                                               \
-        return set_in_max(dev, buf, count, offset);             \
-}                                                               \
-static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,         \
-                show_in##offset##_min, set_in##offset##_min);   \
-static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,         \
-                show_in##offset##_max, set_in##offset##_max);
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,          \
+                show_in, NULL, offset);                         \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,  \
+                show_in_min, set_in_min, offset);               \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,  \
+                show_in_max, set_in_max, offset);
 
 show_in_offset(0);
 show_in_offset(1);
@@ -270,46 +257,49 @@ show_in_offset(5);
 show_in_offset(6);
 
 /* Temperature */
-static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+                         char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *da,
+                              char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
 }
 
-static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_temp_over(struct device *dev, struct device_attribute *da,
+                             const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct lm78_data *data = dev_get_drvdata(dev);
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_over = TEMP_TO_REG(val);
-        lm78_write_value(client, LM78_REG_TEMP_OVER, data->temp_over);
+        lm78_write_value(data, LM78_REG_TEMP_OVER, data->temp_over);
         mutex_unlock(&data->update_lock);
         return count;
 }
 
-static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *da,
+                              char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst));
 }
 
-static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *da,
+                             const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct lm78_data *data = dev_get_drvdata(dev);
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_hyst = TEMP_TO_REG(val);
-        lm78_write_value(client, LM78_REG_TEMP_HYST, data->temp_hyst);
+        lm78_write_value(data, LM78_REG_TEMP_HYST, data->temp_hyst);
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -321,49 +311,59 @@ static DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR,
                 show_temp_hyst, set_temp_hyst);
 
 /* 3 Fans */
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute *da,
+                        char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm78_data *data = lm78_update_device(dev);
+        int nr = attr->index;
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
                 DIV_FROM_REG(data->fan_div[nr])) );
 }
 
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,
+                            char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm78_data *data = lm78_update_device(dev);
+        int nr = attr->index;
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan_min[nr],
                 DIV_FROM_REG(data->fan_div[nr])) );
 }
 
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,
+                           const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct lm78_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
-        lm78_write_value(client, LM78_REG_FAN_MIN(nr), data->fan_min[nr]);
+        lm78_write_value(data, LM78_REG_FAN_MIN(nr), data->fan_min[nr]);
         mutex_unlock(&data->update_lock);
         return count;
 }
 
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,
+                            char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]) );
+        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index]));
 }
 
 /* Note: we save and restore the fan minimum here, because its value is
    determined in part by the fan divisor.  This follows the principle of
    least surprise; the user doesn't expect the fan minimum to change just
    because the divisor changed. */
-static ssize_t set_fan_div(struct device *dev, const char *buf,
-        size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,
+                           const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct lm78_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         unsigned long val = simple_strtoul(buf, NULL, 10);
         unsigned long min;
         u8 reg;
@@ -378,13 +378,13 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         case 4: data->fan_div[nr] = 2; break;
         case 8: data->fan_div[nr] = 3; break;
         default:
-                dev_err(&client->dev, "fan_div value %ld not "
+                dev_err(dev, "fan_div value %ld not "
                         "supported. Choose one of 1, 2, 4 or 8!\n", val);
                 mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
 
-        reg = lm78_read_value(client, LM78_REG_VID_FANDIV);
+        reg = lm78_read_value(data, LM78_REG_VID_FANDIV);
         switch (nr) {
         case 0:
                 reg = (reg & 0xcf) | (data->fan_div[nr] << 4);
@@ -393,63 +393,36 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
                 reg = (reg & 0x3f) | (data->fan_div[nr] << 6);
                 break;
         }
-        lm78_write_value(client, LM78_REG_VID_FANDIV, reg);
+        lm78_write_value(data, LM78_REG_VID_FANDIV, reg);
 
         data->fan_min[nr] =
                 FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
-        lm78_write_value(client, LM78_REG_FAN_MIN(nr), data->fan_min[nr]);
+        lm78_write_value(data, LM78_REG_FAN_MIN(nr), data->fan_min[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
 }
 
-#define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{                                                                       \
-        return show_fan(dev, buf, offset - 1);                          \
-}                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)  \
-{                                                                       \
-        return show_fan_min(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)  \
-{                                                                       \
-        return show_fan_div(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_fan_min(dev, buf, count, offset - 1);                \
-}                                                                       \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_min, set_fan_##offset##_min);
-
-static ssize_t set_fan_1_div(struct device *dev, struct device_attribute *attr, const char *buf,
-                size_t count)
-{
-        return set_fan_div(dev, buf, count, 0) ;
-}
-
-static ssize_t set_fan_2_div(struct device *dev, struct device_attribute *attr, const char *buf,
-                size_t count)
-{
-        return set_fan_div(dev, buf, count, 1) ;
-}
+#define show_fan_offset(offset)                         \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,         \
+                show_fan, NULL, offset - 1);                    \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                show_fan_min, set_fan_min, offset - 1);
 
 show_fan_offset(1);
 show_fan_offset(2);
 show_fan_offset(3);
 
 /* Fan 3 divisor is locked in H/W */
-static DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR,
-                show_fan_1_div, set_fan_1_div);
-static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
-                show_fan_2_div, set_fan_2_div);
-static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
+static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR,
+                show_fan_div, set_fan_div, 0);
+static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
+                show_fan_div, set_fan_div, 1);
+static SENSOR_DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_div, NULL, 2);
 
 /* VID */
-static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *da,
+                        char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, 82));
@@ -457,7 +430,8 @@ static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *da,
+                           char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
@@ -475,45 +449,40 @@ static int lm78_attach_adapter(struct i2c_adapter *adapter)
         return i2c_probe(adapter, &addr_data, lm78_detect);
 }
 
-static int lm78_isa_attach_adapter(struct i2c_adapter *adapter)
-{
-        return lm78_detect(adapter, isa_address, -1);
-}
-
 static struct attribute *lm78_attributes[] = {
-        &dev_attr_in0_input.attr,
-        &dev_attr_in0_min.attr,
-        &dev_attr_in0_max.attr,
-        &dev_attr_in1_input.attr,
-        &dev_attr_in1_min.attr,
-        &dev_attr_in1_max.attr,
-        &dev_attr_in2_input.attr,
-        &dev_attr_in2_min.attr,
-        &dev_attr_in2_max.attr,
-        &dev_attr_in3_input.attr,
-        &dev_attr_in3_min.attr,
-        &dev_attr_in3_max.attr,
-        &dev_attr_in4_input.attr,
-        &dev_attr_in4_min.attr,
-        &dev_attr_in4_max.attr,
-        &dev_attr_in5_input.attr,
-        &dev_attr_in5_min.attr,
-        &dev_attr_in5_max.attr,
-        &dev_attr_in6_input.attr,
-        &dev_attr_in6_min.attr,
-        &dev_attr_in6_max.attr,
+        &sensor_dev_attr_in0_input.dev_attr.attr,
+        &sensor_dev_attr_in0_min.dev_attr.attr,
+        &sensor_dev_attr_in0_max.dev_attr.attr,
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in1_min.dev_attr.attr,
+        &sensor_dev_attr_in1_max.dev_attr.attr,
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in2_min.dev_attr.attr,
+        &sensor_dev_attr_in2_max.dev_attr.attr,
+        &sensor_dev_attr_in3_input.dev_attr.attr,
+        &sensor_dev_attr_in3_min.dev_attr.attr,
+        &sensor_dev_attr_in3_max.dev_attr.attr,
+        &sensor_dev_attr_in4_input.dev_attr.attr,
+        &sensor_dev_attr_in4_min.dev_attr.attr,
+        &sensor_dev_attr_in4_max.dev_attr.attr,
+        &sensor_dev_attr_in5_input.dev_attr.attr,
+        &sensor_dev_attr_in5_min.dev_attr.attr,
+        &sensor_dev_attr_in5_max.dev_attr.attr,
+        &sensor_dev_attr_in6_input.dev_attr.attr,
+        &sensor_dev_attr_in6_min.dev_attr.attr,
+        &sensor_dev_attr_in6_max.dev_attr.attr,
         &dev_attr_temp1_input.attr,
         &dev_attr_temp1_max.attr,
         &dev_attr_temp1_max_hyst.attr,
-        &dev_attr_fan1_input.attr,
-        &dev_attr_fan1_min.attr,
-        &dev_attr_fan1_div.attr,
-        &dev_attr_fan2_input.attr,
-        &dev_attr_fan2_min.attr,
-        &dev_attr_fan2_div.attr,
-        &dev_attr_fan3_input.attr,
-        &dev_attr_fan3_min.attr,
-        &dev_attr_fan3_div.attr,
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_min.dev_attr.attr,
+        &sensor_dev_attr_fan1_div.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_min.dev_attr.attr,
+        &sensor_dev_attr_fan2_div.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_min.dev_attr.attr,
+        &sensor_dev_attr_fan3_div.dev_attr.attr,
         &dev_attr_alarms.attr,
         &dev_attr_cpu0_vid.attr,
 
@@ -524,6 +493,17 @@ static const struct attribute_group lm78_group = {
         .attrs = lm78_attributes,
 };
 
+/* I2C devices get this name attribute automatically, but for ISA devices
+   we must create it by ourselves. */
+static ssize_t show_name(struct device *dev, struct device_attribute
+                         *devattr, char *buf)
+{
+        struct lm78_data *data = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%s\n", data->client.name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+
 /* This function is called by i2c_probe */
 static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 {
@@ -531,54 +511,10 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         struct i2c_client *new_client;
         struct lm78_data *data;
         const char *client_name = "";
-        int is_isa = i2c_is_isa_adapter(adapter);
 
-        if (!is_isa &&
-            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 err = -ENODEV;
-                goto ERROR0;
-        }
-
-        /* Reserve the ISA region */
-        if (is_isa)
-                if (!request_region(address, LM78_EXTENT,
-                                    lm78_isa_driver.driver.name)) {
-                        err = -EBUSY;
-                        goto ERROR0;
-                }
-
-        /* Probe whether there is anything available on this address. Already
-           done for SMBus clients */
-        if (kind < 0) {
-                if (is_isa) {
-
-#define REALLY_SLOW_IO
-                        /* We need the timeouts for at least some LM78-like
-                           chips. But only if we read 'undefined' registers. */
-                        i = inb_p(address + 1);
-                        if (inb_p(address + 2) != i) {
-                                err = -ENODEV;
-                                goto ERROR1;
-                        }
-                        if (inb_p(address + 3) != i) {
-                                err = -ENODEV;
-                                goto ERROR1;
-                        }
-                        if (inb_p(address + 7) != i) {
-                                err = -ENODEV;
-                                goto ERROR1;
-                        }
-#undef REALLY_SLOW_IO
-
-                        /* Let's just hope nothing breaks here */
-                        i = inb_p(address + 5) & 0x7f;
-                        outb_p(~i & 0x7f, address + 5);
-                        if ((inb_p(address + 5) & 0x7f) != (~i & 0x7f)) {
-                                outb_p(i, address + 5);
-                                err = -ENODEV;
-                                goto ERROR1;
-                        }
-                }
+                goto ERROR1;
         }
 
         /* OK. For now, we presume we have a valid client. We now create the
@@ -591,22 +527,19 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         new_client = &data->client;
-        if (is_isa)
-                mutex_init(&data->lock);
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
-        new_client->driver = is_isa ? &lm78_isa_driver : &lm78_driver;
-        new_client->flags = 0;
+        new_client->driver = &lm78_driver;
 
         /* Now, we do the remaining detection. */
         if (kind < 0) {
-                if (lm78_read_value(new_client, LM78_REG_CONFIG) & 0x80) {
+                if (lm78_read_value(data, LM78_REG_CONFIG) & 0x80) {
                         err = -ENODEV;
                         goto ERROR2;
                 }
-                if (!is_isa && (lm78_read_value(
-                                new_client, LM78_REG_I2C_ADDR) != address)) {
+                if (lm78_read_value(data, LM78_REG_I2C_ADDR) !=
+                    address) {
                         err = -ENODEV;
                         goto ERROR2;
                 }
@@ -614,7 +547,7 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Determine the chip type. */
         if (kind <= 0) {
-                i = lm78_read_value(new_client, LM78_REG_CHIPID);
+                i = lm78_read_value(data, LM78_REG_CHIPID);
                 if (i == 0x00 || i == 0x20      /* LM78 */
                  || i == 0x40)                  /* LM78-J */
                         kind = lm78;
@@ -641,21 +574,12 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
         data->type = kind;
 
-        data->valid = 0;
-        mutex_init(&data->update_lock);
-
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
                 goto ERROR2;
 
         /* Initialize the LM78 chip */
-        lm78_init_client(new_client);
-
-        /* A few vars need to be filled upon startup */
-        for (i = 0; i < 3; i++) {
-                data->fan_min[i] = lm78_read_value(new_client,
-                                        LM78_REG_FAN_MIN(i));
-        }
+        lm78_init_device(data);
 
         /* Register sysfs hooks */
         if ((err = sysfs_create_group(&new_client->dev.kobj, &lm78_group)))
@@ -676,9 +600,6 @@ ERROR3:
 ERROR2:
         kfree(data);
 ERROR1:
-        if (is_isa)
-                release_region(address, LM78_EXTENT);
-ERROR0:
         return err;
 }
 
@@ -693,9 +614,77 @@ static int lm78_detach_client(struct i2c_client *client)
         if ((err = i2c_detach_client(client)))
                 return err;
 
-        if(i2c_is_isa_client(client))
-                release_region(client->addr, LM78_EXTENT);
+        kfree(data);
+
+        return 0;
+}
+
+static int __devinit lm78_isa_probe(struct platform_device *pdev)
+{
+        int err;
+        struct lm78_data *data;
+        struct resource *res;
+        const char *name;
+
+        /* Reserve the ISA region */
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, LM78_EXTENT, "lm78")) {
+                err = -EBUSY;
+                goto exit;
+        }
+
+        if (!(data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_release_region;
+        }
+        mutex_init(&data->lock);
+        data->client.addr = res->start;
+        i2c_set_clientdata(&data->client, data);
+        platform_set_drvdata(pdev, data);
+
+        if (lm78_read_value(data, LM78_REG_CHIPID) & 0x80) {
+                data->type = lm79;
+                name = "lm79";
+        } else {
+                data->type = lm78;
+                name = "lm78";
+        }
+        strlcpy(data->client.name, name, I2C_NAME_SIZE);
+
+        /* Initialize the LM78 chip */
+        lm78_init_device(data);
+
+        /* Register sysfs hooks */
+        if ((err = sysfs_create_group(&pdev->dev.kobj, &lm78_group))
+         || (err = device_create_file(&pdev->dev, &dev_attr_name)))
+                goto exit_remove_files;
+
+        data->class_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove_files;
+        }
+
+        return 0;
+
+ exit_remove_files:
+        sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        kfree(data);
+ exit_release_region:
+        release_region(res->start, LM78_EXTENT);
+ exit:
+        return err;
+}
+
+static int __devexit lm78_isa_remove(struct platform_device *pdev)
+{
+        struct lm78_data *data = platform_get_drvdata(pdev);
 
+        hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        release_region(data->client.addr, LM78_EXTENT);
         kfree(data);
 
         return 0;
@@ -706,11 +695,12 @@ static int lm78_detach_client(struct i2c_client *client)
    separately.
    We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
    would slow down the LM78 access and should not be necessary.  */
-static int lm78_read_value(struct i2c_client *client, u8 reg)
+static int lm78_read_value(struct lm78_data *data, u8 reg)
 {
-        int res;
-        if (i2c_is_isa_client(client)) {
-                struct lm78_data *data = i2c_get_clientdata(client);
+        struct i2c_client *client = &data->client;
+
+        if (!client->driver) { /* ISA device */
+                int res;
                 mutex_lock(&data->lock);
                 outb_p(reg, client->addr + LM78_ADDR_REG_OFFSET);
                 res = inb_p(client->addr + LM78_DATA_REG_OFFSET);
@@ -727,10 +717,11 @@ static int lm78_read_value(struct i2c_client *client, u8 reg)
    would slow down the LM78 access and should not be necessary. 
    There are some ugly typecasts here, but the good new is - they should
    nowhere else be necessary! */
-static int lm78_write_value(struct i2c_client *client, u8 reg, u8 value)
+static int lm78_write_value(struct lm78_data *data, u8 reg, u8 value)
 {
-        if (i2c_is_isa_client(client)) {
-                struct lm78_data *data = i2c_get_clientdata(client);
+        struct i2c_client *client = &data->client;
+
+        if (!client->driver) { /* ISA device */
                 mutex_lock(&data->lock);
                 outb_p(reg, client->addr + LM78_ADDR_REG_OFFSET);
                 outb_p(value, client->addr + LM78_DATA_REG_OFFSET);
@@ -740,20 +731,29 @@ static int lm78_write_value(struct i2c_client *client, u8 reg, u8 value)
                 return i2c_smbus_write_byte_data(client, reg, value);
 }
 
-static void lm78_init_client(struct i2c_client *client)
+static void lm78_init_device(struct lm78_data *data)
 {
-        u8 config = lm78_read_value(client, LM78_REG_CONFIG);
+        u8 config;
+        int i;
 
         /* Start monitoring */
-        if (!(config & 0x01))
-                lm78_write_value(client, LM78_REG_CONFIG,
+        config = lm78_read_value(data, LM78_REG_CONFIG);
+        if ((config & 0x09) != 0x01)
+                lm78_write_value(data, LM78_REG_CONFIG,
                                  (config & 0xf7) | 0x01);
+
+        /* A few vars need to be filled upon startup */
+        for (i = 0; i < 3; i++) {
+                data->fan_min[i] = lm78_read_value(data,
+                                        LM78_REG_FAN_MIN(i));
+        }
+
+        mutex_init(&data->update_lock);
 }
 
 static struct lm78_data *lm78_update_device(struct device *dev)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct lm78_data *data = i2c_get_clientdata(client);
+        struct lm78_data *data = dev_get_drvdata(dev);
         int i;
 
         mutex_lock(&data->update_lock);
@@ -761,39 +761,39 @@ static struct lm78_data *lm78_update_device(struct device *dev)
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
             || !data->valid) {
 
-                dev_dbg(&client->dev, "Starting lm78 update\n");
+                dev_dbg(dev, "Starting lm78 update\n");
 
                 for (i = 0; i <= 6; i++) {
                         data->in[i] =
-                            lm78_read_value(client, LM78_REG_IN(i));
+                            lm78_read_value(data, LM78_REG_IN(i));
                         data->in_min[i] =
-                            lm78_read_value(client, LM78_REG_IN_MIN(i));
+                            lm78_read_value(data, LM78_REG_IN_MIN(i));
                         data->in_max[i] =
-                            lm78_read_value(client, LM78_REG_IN_MAX(i));
+                            lm78_read_value(data, LM78_REG_IN_MAX(i));
                 }
                 for (i = 0; i < 3; i++) {
                         data->fan[i] =
-                            lm78_read_value(client, LM78_REG_FAN(i));
+                            lm78_read_value(data, LM78_REG_FAN(i));
                         data->fan_min[i] =
-                            lm78_read_value(client, LM78_REG_FAN_MIN(i));
+                            lm78_read_value(data, LM78_REG_FAN_MIN(i));
                 }
-                data->temp = lm78_read_value(client, LM78_REG_TEMP);
+                data->temp = lm78_read_value(data, LM78_REG_TEMP);
                 data->temp_over =
-                    lm78_read_value(client, LM78_REG_TEMP_OVER);
+                    lm78_read_value(data, LM78_REG_TEMP_OVER);
                 data->temp_hyst =
-                    lm78_read_value(client, LM78_REG_TEMP_HYST);
-                i = lm78_read_value(client, LM78_REG_VID_FANDIV);
+                    lm78_read_value(data, LM78_REG_TEMP_HYST);
+                i = lm78_read_value(data, LM78_REG_VID_FANDIV);
                 data->vid = i & 0x0f;
                 if (data->type == lm79)
                         data->vid |=
-                            (lm78_read_value(client, LM78_REG_CHIPID) &
+                            (lm78_read_value(data, LM78_REG_CHIPID) &
                              0x01) << 4;
                 else
                         data->vid |= 0x10;
                 data->fan_div[0] = (i >> 4) & 0x03;
                 data->fan_div[1] = i >> 6;
-                data->alarms = lm78_read_value(client, LM78_REG_ALARM1) +
-                    (lm78_read_value(client, LM78_REG_ALARM2) << 8);
+                data->alarms = lm78_read_value(data, LM78_REG_ALARM1) +
+                    (lm78_read_value(data, LM78_REG_ALARM2) << 8);
                 data->last_updated = jiffies;
                 data->valid = 1;
 
@@ -805,26 +805,154 @@ static struct lm78_data *lm78_update_device(struct device *dev)
         return data;
 }
 
+/* return 1 if a supported chip is found, 0 otherwise */
+static int __init lm78_isa_found(unsigned short address)
+{
+        int val, save, found = 0;
+
+        if (!request_region(address, LM78_EXTENT, "lm78"))
+                return 0;
+
+#define REALLY_SLOW_IO
+        /* We need the timeouts for at least some LM78-like
+           chips. But only if we read 'undefined' registers. */
+        val = inb_p(address + 1);
+        if (inb_p(address + 2) != val
+         || inb_p(address + 3) != val
+         || inb_p(address + 7) != val)
+                goto release;
+#undef REALLY_SLOW_IO
+
+        /* We should be able to change the 7 LSB of the address port. The
+           MSB (busy flag) should be clear initially, set after the write. */
+        save = inb_p(address + LM78_ADDR_REG_OFFSET);
+        if (save & 0x80)
+                goto release;
+        val = ~save & 0x7f;
+        outb_p(val, address + LM78_ADDR_REG_OFFSET);
+        if (inb_p(address + LM78_ADDR_REG_OFFSET) != (val | 0x80)) {
+                outb_p(save, address + LM78_ADDR_REG_OFFSET);
+                goto release;
+        }
+
+        /* We found a device, now see if it could be an LM78 */
+        outb_p(LM78_REG_CONFIG, address + LM78_ADDR_REG_OFFSET);
+        val = inb_p(address + LM78_DATA_REG_OFFSET);
+        if (val & 0x80)
+                goto release;
+        outb_p(LM78_REG_I2C_ADDR, address + LM78_ADDR_REG_OFFSET);
+        val = inb_p(address + LM78_DATA_REG_OFFSET);
+        if (val < 0x03 || val > 0x77)   /* Not a valid I2C address */
+                goto release;
+
+        /* The busy flag should be clear again */
+        if (inb_p(address + LM78_ADDR_REG_OFFSET) & 0x80)
+                goto release;
+
+        /* Explicitly prevent the misdetection of Winbond chips */
+        outb_p(0x4f, address + LM78_ADDR_REG_OFFSET);
+        val = inb_p(address + LM78_DATA_REG_OFFSET);
+        if (val == 0xa3 || val == 0x5c)
+                goto release;
+
+        /* Explicitly prevent the misdetection of ITE chips */
+        outb_p(0x58, address + LM78_ADDR_REG_OFFSET);
+        val = inb_p(address + LM78_DATA_REG_OFFSET);
+        if (val == 0x90)
+                goto release;
+
+        /* Determine the chip type */
+        outb_p(LM78_REG_CHIPID, address + LM78_ADDR_REG_OFFSET);
+        val = inb_p(address + LM78_DATA_REG_OFFSET);
+        if (val == 0x00                 /* LM78 */
+         || val == 0x40                 /* LM78-J */
+         || (val & 0xfe) == 0xc0)       /* LM79 */
+                found = 1;
+
+        if (found)
+                pr_info("lm78: Found an %s chip at %#x\n",
+                        val & 0x80 ? "LM79" : "LM78", (int)address);
+
+ release:
+        release_region(address, LM78_EXTENT);
+        return found;
+}
+
+static int __init lm78_isa_device_add(unsigned short address)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + LM78_EXTENT,
+                .name   = "lm78",
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc("lm78", address);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR "lm78: Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR "lm78: Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR "lm78: Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+ exit_device_put:
+        platform_device_put(pdev);
+ exit:
+        pdev = NULL;
+        return err;
+}
+
 static int __init sm_lm78_init(void)
 {
         int res;
 
         res = i2c_add_driver(&lm78_driver);
         if (res)
-                return res;
+                goto exit;
 
-        /* Don't exit if this one fails, we still want the I2C variants
-           to work! */
-        if (i2c_isa_add_driver(&lm78_isa_driver))
-                isa_address = 0;
+        if (lm78_isa_found(isa_address)) {
+                res = platform_driver_register(&lm78_isa_driver);
+                if (res)
+                        goto exit_unreg_i2c_driver;
+
+                /* Sets global pdev as a side effect */
+                res = lm78_isa_device_add(isa_address);
+                if (res)
+                        goto exit_unreg_isa_driver;
+        }
 
         return 0;
+
+ exit_unreg_isa_driver:
+        platform_driver_unregister(&lm78_isa_driver);
+ exit_unreg_i2c_driver:
+        i2c_del_driver(&lm78_driver);
+ exit:
+        return res;
 }
 
 static void __exit sm_lm78_exit(void)
 {
-        if (isa_address)
-                i2c_isa_del_driver(&lm78_isa_driver);
+        if (pdev) {
+                platform_device_unregister(pdev);
+                platform_driver_unregister(&lm78_isa_driver);
+        }
         i2c_del_driver(&lm78_driver);
 }
 
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 3ce825489e34..988ae1c4aada 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -747,6 +747,7 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         if (!(data->channel & CHAN_NO_VID)) {
+                data->vrm = vid_which_vrm();
                 if ((err = device_create_file(&new_client->dev,
                                         &dev_attr_cpu0_vid))
                  || (err = device_create_file(&new_client->dev,
@@ -779,7 +780,6 @@ static void lm87_init_client(struct i2c_client *client)
         u8 config;
 
         data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
-        data->vrm = vid_which_vrm();
 
         config = lm87_read_value(client, LM87_REG_CONFIG);
         if (!(config & 0x01)) {
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c
new file mode 100644
index 000000000000..8415664f33c2
--- /dev/null
+++ b/drivers/hwmon/max6650.c
@@ -0,0 +1,693 @@
+/*
+ * max6650.c - Part of lm_sensors, Linux kernel modules for hardware
+ *             monitoring.
+ *
+ * (C) 2007 by Hans J. Koch <hjk@linutronix.de>
+ *
+ * based on code written by John Morris <john.morris@spirentcom.com>
+ * Copyright (c) 2003 Spirent Communications
+ * and Claus Gindhart <claus.gindhart@kontron.com>
+ *
+ * This module has only been tested with the MAX6650 chip. It should
+ * also work with the MAX6651. It does not distinguish max6650 and max6651
+ * chips.
+ *
+ * Tha datasheet was last seen at:
+ *
+ *        http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf
+ *
+ * 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/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+
+/*
+ * Addresses to scan. There are four disjoint possibilities, by pin config.
+ */
+
+static unsigned short normal_i2c[] = {0x1b, 0x1f, 0x48, 0x4b, I2C_CLIENT_END};
+
+/*
+ * Insmod parameters
+ */
+
+/* fan_voltage: 5=5V fan, 12=12V fan, 0=don't change */
+static int fan_voltage;
+/* prescaler: Possible values are 1, 2, 4, 8, 16 or 0 for don't change */
+static int prescaler;
+/* clock: The clock frequency of the chip the driver should assume */
+static int clock = 254000;
+
+module_param(fan_voltage, int, S_IRUGO);
+module_param(prescaler, int, S_IRUGO);
+module_param(clock, int, S_IRUGO);
+
+I2C_CLIENT_INSMOD_1(max6650);
+
+/*
+ * MAX 6650/6651 registers
+ */
+
+#define MAX6650_REG_SPEED       0x00
+#define MAX6650_REG_CONFIG      0x02
+#define MAX6650_REG_GPIO_DEF    0x04
+#define MAX6650_REG_DAC         0x06
+#define MAX6650_REG_ALARM_EN    0x08
+#define MAX6650_REG_ALARM       0x0A
+#define MAX6650_REG_TACH0       0x0C
+#define MAX6650_REG_TACH1       0x0E
+#define MAX6650_REG_TACH2       0x10
+#define MAX6650_REG_TACH3       0x12
+#define MAX6650_REG_GPIO_STAT   0x14
+#define MAX6650_REG_COUNT       0x16
+
+/*
+ * Config register bits
+ */
+
+#define MAX6650_CFG_V12                 0x08
+#define MAX6650_CFG_PRESCALER_MASK      0x07
+#define MAX6650_CFG_PRESCALER_2         0x01
+#define MAX6650_CFG_PRESCALER_4         0x02
+#define MAX6650_CFG_PRESCALER_8         0x03
+#define MAX6650_CFG_PRESCALER_16        0x04
+#define MAX6650_CFG_MODE_MASK           0x30
+#define MAX6650_CFG_MODE_ON             0x00
+#define MAX6650_CFG_MODE_OFF            0x10
+#define MAX6650_CFG_MODE_CLOSED_LOOP    0x20
+#define MAX6650_CFG_MODE_OPEN_LOOP      0x30
+#define MAX6650_COUNT_MASK              0x03
+
+/* Minimum and maximum values of the FAN-RPM */
+#define FAN_RPM_MIN 240
+#define FAN_RPM_MAX 30000
+
+#define DIV_FROM_REG(reg) (1 << (reg & 7))
+
+static int max6650_attach_adapter(struct i2c_adapter *adapter);
+static int max6650_detect(struct i2c_adapter *adapter, int address, int kind);
+static int max6650_init_client(struct i2c_client *client);
+static int max6650_detach_client(struct i2c_client *client);
+static struct max6650_data *max6650_update_device(struct device *dev);
+
+/*
+ * Driver data (common to all clients)
+ */
+
+static struct i2c_driver max6650_driver = {
+        .driver = {
+                .name   = "max6650",
+        },
+        .attach_adapter = max6650_attach_adapter,
+        .detach_client  = max6650_detach_client,
+};
+
+/*
+ * Client data (each client gets its own)
+ */
+
+struct max6650_data
+{
+        struct i2c_client client;
+        struct class_device *class_dev;
+        struct mutex update_lock;
+        char valid; /* zero until following fields are valid */
+        unsigned long last_updated; /* in jiffies */
+
+        /* register values */
+        u8 speed;
+        u8 config;
+        u8 tach[4];
+        u8 count;
+        u8 dac;
+};
+
+static ssize_t get_fan(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct max6650_data *data = max6650_update_device(dev);
+        int rpm;
+
+        /*
+        * Calculation details:
+        *
+        * Each tachometer counts over an interval given by the "count"
+        * register (0.25, 0.5, 1 or 2 seconds). This module assumes
+        * that the fans produce two pulses per revolution (this seems
+        * to be the most common).
+        */
+
+        rpm = ((data->tach[attr->index] * 120) / DIV_FROM_REG(data->count));
+        return sprintf(buf, "%d\n", rpm);
+}
+
+/*
+ * Set the fan speed to the specified RPM (or read back the RPM setting).
+ * This works in closed loop mode only. Use pwm1 for open loop speed setting.
+ *
+ * The MAX6650/1 will automatically control fan speed when in closed loop
+ * mode.
+ *
+ * Assumptions:
+ *
+ * 1) The MAX6650/1 internal 254kHz clock frequency is set correctly. Use
+ *    the clock module parameter if you need to fine tune this.
+ *
+ * 2) The prescaler (low three bits of the config register) has already
+ *    been set to an appropriate value. Use the prescaler module parameter
+ *    if your BIOS doesn't initialize the chip properly.
+ *
+ * The relevant equations are given on pages 21 and 22 of the datasheet.
+ *
+ * From the datasheet, the relevant equation when in regulation is:
+ *
+ *    [fCLK / (128 x (KTACH + 1))] = 2 x FanSpeed / KSCALE
+ *
+ * where:
+ *
+ *    fCLK is the oscillator frequency (either the 254kHz internal
+ *         oscillator or the externally applied clock)
+ *
+ *    KTACH is the value in the speed register
+ *
+ *    FanSpeed is the speed of the fan in rps
+ *
+ *    KSCALE is the prescaler value (1, 2, 4, 8, or 16)
+ *
+ * When reading, we need to solve for FanSpeed. When writing, we need to
+ * solve for KTACH.
+ *
+ * Note: this tachometer is completely separate from the tachometers
+ * used to measure the fan speeds. Only one fan's speed (fan1) is
+ * controlled.
+ */
+
+static ssize_t get_target(struct device *dev, struct device_attribute *devattr,
+                         char *buf)
+{
+        struct max6650_data *data = max6650_update_device(dev);
+        int kscale, ktach, rpm;
+
+        /*
+        * Use the datasheet equation:
+        *
+        *    FanSpeed = KSCALE x fCLK / [256 x (KTACH + 1)]
+        *
+        * then multiply by 60 to give rpm.
+        */
+
+        kscale = DIV_FROM_REG(data->config);
+        ktach = data->speed;
+        rpm = 60 * kscale * clock / (256 * (ktach + 1));
+        return sprintf(buf, "%d\n", rpm);
+}
+
+static ssize_t set_target(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct max6650_data *data = i2c_get_clientdata(client);
+        int rpm = simple_strtoul(buf, NULL, 10);
+        int kscale, ktach;
+
+        rpm = SENSORS_LIMIT(rpm, FAN_RPM_MIN, FAN_RPM_MAX);
+
+        /*
+        * Divide the required speed by 60 to get from rpm to rps, then
+        * use the datasheet equation:
+        *
+        *     KTACH = [(fCLK x KSCALE) / (256 x FanSpeed)] - 1
+        */
+
+        mutex_lock(&data->update_lock);
+
+        kscale = DIV_FROM_REG(data->config);
+        ktach = ((clock * kscale) / (256 * rpm / 60)) - 1;
+        if (ktach < 0)
+                ktach = 0;
+        if (ktach > 255)
+                ktach = 255;
+        data->speed = ktach;
+
+        i2c_smbus_write_byte_data(client, MAX6650_REG_SPEED, data->speed);
+
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+/*
+ * Get/set the fan speed in open loop mode using pwm1 sysfs file.
+ * Speed is given as a relative value from 0 to 255, where 255 is maximum
+ * speed. Note that this is done by writing directly to the chip's DAC,
+ * it won't change the closed loop speed set by fan1_target.
+ * Also note that due to rounding errors it is possible that you don't read
+ * back exactly the value you have set.
+ */
+
+static ssize_t get_pwm(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+        int pwm;
+        struct max6650_data *data = max6650_update_device(dev);
+
+        /* Useful range for dac is 0-180 for 12V fans and 0-76 for 5V fans.
+           Lower DAC values mean higher speeds. */
+        if (data->config & MAX6650_CFG_V12)
+                pwm = 255 - (255 * (int)data->dac)/180;
+        else
+                pwm = 255 - (255 * (int)data->dac)/76;
+
+        if (pwm < 0)
+                pwm = 0;
+
+        return sprintf(buf, "%d\n", pwm);
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
+                        const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct max6650_data *data = i2c_get_clientdata(client);
+        int pwm = simple_strtoul(buf, NULL, 10);
+
+        pwm = SENSORS_LIMIT(pwm, 0, 255);
+
+        mutex_lock(&data->update_lock);
+
+        if (data->config & MAX6650_CFG_V12)
+                data->dac = 180 - (180 * pwm)/255;
+        else
+                data->dac = 76 - (76 * pwm)/255;
+
+        i2c_smbus_write_byte_data(client, MAX6650_REG_DAC, data->dac);
+
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+/*
+ * Get/Set controller mode:
+ * Possible values:
+ * 0 = Fan always on
+ * 1 = Open loop, Voltage is set according to speed, not regulated.
+ * 2 = Closed loop, RPM for all fans regulated by fan1 tachometer
+ */
+
+static ssize_t get_enable(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+        struct max6650_data *data = max6650_update_device(dev);
+        int mode = (data->config & MAX6650_CFG_MODE_MASK) >> 4;
+        int sysfs_modes[4] = {0, 1, 2, 1};
+
+        return sprintf(buf, "%d\n", sysfs_modes[mode]);
+}
+
+static ssize_t set_enable(struct device *dev, struct device_attribute *devattr,
+                          const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct max6650_data *data = i2c_get_clientdata(client);
+        int mode = simple_strtoul(buf, NULL, 10);
+        int max6650_modes[3] = {0, 3, 2};
+
+        if ((mode < 0)||(mode > 2)) {
+                dev_err(&client->dev,
+                        "illegal value for pwm1_enable (%d)\n", mode);
+                return -EINVAL;
+        }
+
+        mutex_lock(&data->update_lock);
+
+        data->config = i2c_smbus_read_byte_data(client, MAX6650_REG_CONFIG);
+        data->config = (data->config & ~MAX6650_CFG_MODE_MASK)
+                       | (max6650_modes[mode] << 4);
+
+        i2c_smbus_write_byte_data(client, MAX6650_REG_CONFIG, data->config);
+
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+/*
+ * Read/write functions for fan1_div sysfs file. The MAX6650 has no such
+ * divider. We handle this by converting between divider and counttime:
+ *
+ * (counttime == k) <==> (divider == 2^k), k = 0, 1, 2, or 3
+ *
+ * Lower values of k allow to connect a faster fan without the risk of
+ * counter overflow. The price is lower resolution. You can also set counttime
+ * using the module parameter. Note that the module parameter "prescaler" also
+ * influences the behaviour. Unfortunately, there's no sysfs attribute
+ * defined for that. See the data sheet for details.
+ */
+
+static ssize_t get_div(struct device *dev, struct device_attribute *devattr,
+                       char *buf)
+{
+        struct max6650_data *data = max6650_update_device(dev);
+
+        return sprintf(buf, "%d\n", DIV_FROM_REG(data->count));
+}
+
+static ssize_t set_div(struct device *dev, struct device_attribute *devattr,
+                       const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct max6650_data *data = i2c_get_clientdata(client);
+        int div = simple_strtoul(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        switch (div) {
+        case 1:
+                data->count = 0;
+                break;
+        case 2:
+                data->count = 1;
+                break;
+        case 4:
+                data->count = 2;
+                break;
+        case 8:
+                data->count = 3;
+                break;
+        default:
+                dev_err(&client->dev,
+                        "illegal value for fan divider (%d)\n", div);
+                return -EINVAL;
+        }
+
+        i2c_smbus_write_byte_data(client, MAX6650_REG_COUNT, data->count);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, get_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, get_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, get_fan, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, get_fan, NULL, 3);
+static DEVICE_ATTR(fan1_target, S_IWUSR | S_IRUGO, get_target, set_target);
+static DEVICE_ATTR(fan1_div, S_IWUSR | S_IRUGO, get_div, set_div);
+static DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO, get_enable, set_enable);
+static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, get_pwm, set_pwm);
+
+
+static struct attribute *max6650_attrs[] = {
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan4_input.dev_attr.attr,
+        &dev_attr_fan1_target.attr,
+        &dev_attr_fan1_div.attr,
+        &dev_attr_pwm1_enable.attr,
+        &dev_attr_pwm1.attr,
+        NULL
+};
+
+static struct attribute_group max6650_attr_grp = {
+        .attrs = max6650_attrs,
+};
+
+/*
+ * Real code
+ */
+
+static int max6650_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON)) {
+                dev_dbg(&adapter->dev,
+                        "FATAL: max6650_attach_adapter class HWMON not set\n");
+                return 0;
+        }
+
+        return i2c_probe(adapter, &addr_data, max6650_detect);
+}
+
+/*
+ * The following function does more than just detection. If detection
+ * succeeds, it also registers the new chip.
+ */
+
+static int max6650_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct max6650_data *data;
+        int err = -ENODEV;
+
+        dev_dbg(&adapter->dev, "max6650_detect called, kind = %d\n", kind);
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_dbg(&adapter->dev, "max6650: I2C bus doesn't support "
+                                        "byte read mode, skipping.\n");
+                return 0;
+        }
+
+        if (!(data = kzalloc(sizeof(struct max6650_data), GFP_KERNEL))) {
+                dev_err(&adapter->dev, "max6650: out of memory.\n");
+                return -ENOMEM;
+        }
+
+        client = &data->client;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &max6650_driver;
+
+        /*
+         * Now we do the remaining detection. A negative kind means that
+         * the driver was loaded with no force parameter (default), so we
+         * must both detect and identify the chip (actually there is only
+         * one possible kind of chip for now, max6650). A zero kind means that
+         * the driver was loaded with the force parameter, the detection
+         * step shall be skipped. A positive kind means that the driver
+         * was loaded with the force parameter and a given kind of chip is
+         * requested, so both the detection and the identification steps
+         * are skipped.
+         *
+         * Currently I can find no way to distinguish between a MAX6650 and
+         * a MAX6651. This driver has only been tried on the former.
+         */
+
+        if ((kind < 0) &&
+           (  (i2c_smbus_read_byte_data(client, MAX6650_REG_CONFIG) & 0xC0)
+            ||(i2c_smbus_read_byte_data(client, MAX6650_REG_GPIO_STAT) & 0xE0)
+            ||(i2c_smbus_read_byte_data(client, MAX6650_REG_ALARM_EN) & 0xE0)
+            ||(i2c_smbus_read_byte_data(client, MAX6650_REG_ALARM) & 0xE0)
+            ||(i2c_smbus_read_byte_data(client, MAX6650_REG_COUNT) & 0xFC))) {
+                dev_dbg(&adapter->dev,
+                        "max6650: detection failed at 0x%02x.\n", address);
+                goto err_free;
+        }
+
+        dev_info(&adapter->dev, "max6650: chip found at 0x%02x.\n", address);
+
+        strlcpy(client->name, "max6650", I2C_NAME_SIZE);
+        mutex_init(&data->update_lock);
+
+        if ((err = i2c_attach_client(client))) {
+                dev_err(&adapter->dev, "max6650: failed to attach client.\n");
+                goto err_free;
+        }
+
+        /*
+         * Initialize the max6650 chip
+         */
+        if (max6650_init_client(client))
+                goto err_detach;
+
+        err = sysfs_create_group(&client->dev.kobj, &max6650_attr_grp);
+        if (err)
+                goto err_detach;
+
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (!IS_ERR(data->class_dev))
+                return 0;
+
+        err = PTR_ERR(data->class_dev);
+        dev_err(&client->dev, "error registering hwmon device.\n");
+        sysfs_remove_group(&client->dev.kobj, &max6650_attr_grp);
+err_detach:
+        i2c_detach_client(client);
+err_free:
+        kfree(data);
+        return err;
+}
+
+static int max6650_detach_client(struct i2c_client *client)
+{
+        struct max6650_data *data = i2c_get_clientdata(client);
+        int err;
+
+        sysfs_remove_group(&client->dev.kobj, &max6650_attr_grp);
+        hwmon_device_unregister(data->class_dev);
+        err = i2c_detach_client(client);
+        if (!err)
+                kfree(data);
+        return err;
+}
+
+static int max6650_init_client(struct i2c_client *client)
+{
+        struct max6650_data *data = i2c_get_clientdata(client);
+        int config;
+        int err = -EIO;
+
+        config = i2c_smbus_read_byte_data(client, MAX6650_REG_CONFIG);
+
+        if (config < 0) {
+                dev_err(&client->dev, "Error reading config, aborting.\n");
+                return err;
+        }
+
+        switch (fan_voltage) {
+                case 0:
+                        break;
+                case 5:
+                        config &= ~MAX6650_CFG_V12;
+                        break;
+                case 12:
+                        config |= MAX6650_CFG_V12;
+                        break;
+                default:
+                        dev_err(&client->dev,
+                                "illegal value for fan_voltage (%d)\n",
+                                fan_voltage);
+        }
+
+        dev_info(&client->dev, "Fan voltage is set to %dV.\n",
+                 (config & MAX6650_CFG_V12) ? 12 : 5);
+
+        switch (prescaler) {
+                case 0:
+                        break;
+                case 1:
+                        config &= ~MAX6650_CFG_PRESCALER_MASK;
+                        break;
+                case 2:
+                        config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+                                 | MAX6650_CFG_PRESCALER_2;
+                        break;
+                case  4:
+                        config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+                                 | MAX6650_CFG_PRESCALER_4;
+                        break;
+                case  8:
+                        config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+                                 | MAX6650_CFG_PRESCALER_8;
+                        break;
+                case 16:
+                        config = (config & ~MAX6650_CFG_PRESCALER_MASK)
+                                 | MAX6650_CFG_PRESCALER_16;
+                        break;
+                default:
+                        dev_err(&client->dev,
+                                "illegal value for prescaler (%d)\n",
+                                prescaler);
+        }
+
+        dev_info(&client->dev, "Prescaler is set to %d.\n",
+                 1 << (config & MAX6650_CFG_PRESCALER_MASK));
+
+        /* If mode is set to "full off", we change it to "open loop" and
+         * set DAC to 255, which has the same effect. We do this because
+         * there's no "full off" mode defined in hwmon specifcations.
+         */
+
+        if ((config & MAX6650_CFG_MODE_MASK) == MAX6650_CFG_MODE_OFF) {
+                dev_dbg(&client->dev, "Change mode to open loop, full off.\n");
+                config = (config & ~MAX6650_CFG_MODE_MASK)
+                         | MAX6650_CFG_MODE_OPEN_LOOP;
+                if (i2c_smbus_write_byte_data(client, MAX6650_REG_DAC, 255)) {
+                        dev_err(&client->dev, "DAC write error, aborting.\n");
+                        return err;
+                }
+        }
+
+        if (i2c_smbus_write_byte_data(client, MAX6650_REG_CONFIG, config)) {
+                dev_err(&client->dev, "Config write error, aborting.\n");
+                return err;
+        }
+
+        data->config = config;
+        data->count = i2c_smbus_read_byte_data(client, MAX6650_REG_COUNT);
+
+        return 0;
+}
+
+static const u8 tach_reg[] = {
+        MAX6650_REG_TACH0,
+        MAX6650_REG_TACH1,
+        MAX6650_REG_TACH2,
+        MAX6650_REG_TACH3,
+};
+
+static struct max6650_data *max6650_update_device(struct device *dev)
+{
+        int i;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct max6650_data *data = i2c_get_clientdata(client);
+
+        mutex_lock(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
+                data->speed = i2c_smbus_read_byte_data(client,
+                                                       MAX6650_REG_SPEED);
+                data->config = i2c_smbus_read_byte_data(client,
+                                                        MAX6650_REG_CONFIG);
+                for (i = 0; i < 4; i++) {
+                        data->tach[i] = i2c_smbus_read_byte_data(client,
+                                                                 tach_reg[i]);
+                }
+                data->count = i2c_smbus_read_byte_data(client,
+                                                        MAX6650_REG_COUNT);
+                data->dac = i2c_smbus_read_byte_data(client, MAX6650_REG_DAC);
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->update_lock);
+
+        return data;
+}
+
+static int __init sensors_max6650_init(void)
+{
+        return i2c_add_driver(&max6650_driver);
+}
+
+static void __exit sensors_max6650_exit(void)
+{
+        i2c_del_driver(&max6650_driver);
+}
+
+MODULE_AUTHOR("Hans J. Koch");
+MODULE_DESCRIPTION("MAX6650 sensor driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_max6650_init);
+module_exit(sensors_max6650_exit);
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c
index affa21a5ccfd..29354fa26f81 100644
--- a/drivers/hwmon/pc87427.c
+++ b/drivers/hwmon/pc87427.c
@@ -31,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 
 static struct platform_device *pdev;
@@ -429,6 +430,12 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
         /* This will need to be revisited when we add support for
            temperature and voltage monitoring. */
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, res->end - res->start + 1, DRVNAME)) {
+                err = -EBUSY;
+                dev_err(&pdev->dev, "Failed to request region 0x%lx-0x%lx\n",
+                        (unsigned long)res->start, (unsigned long)res->end);
+                goto exit_kfree;
+        }
         data->address[0] = res->start;
 
         mutex_init(&data->lock);
@@ -438,7 +445,7 @@ static int __devinit pc87427_probe(struct platform_device *pdev)
 
         /* Register sysfs hooks */
         if ((err = device_create_file(&pdev->dev, &dev_attr_name)))
-                goto exit_kfree;
+                goto exit_release_region;
         for (i = 0; i < 8; i++) {
                 if (!(data->fan_enabled & (1 << i)))
                         continue;
@@ -462,6 +469,8 @@ exit_remove_files:
                         continue;
                 sysfs_remove_group(&pdev->dev.kobj, &pc87427_group_fan[i]);
         }
+exit_release_region:
+        release_region(res->start, res->end - res->start + 1);
 exit_kfree:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
@@ -472,6 +481,7 @@ exit:
 static int __devexit pc87427_remove(struct platform_device *pdev)
 {
         struct pc87427_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
         int i;
 
         platform_set_drvdata(pdev, NULL);
@@ -484,6 +494,9 @@ static int __devexit pc87427_remove(struct platform_device *pdev)
         }
         kfree(data);
 
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start, res->end - res->start + 1);
+
         return 0;
 }
 
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 72b0e2d8650c..943abbd95ab5 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -30,16 +30,17 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <asm/io.h>
 
-/* Address is autodetected, there is no default value */
-static unsigned short address;
+static struct platform_device *pdev;
+
+#define DRVNAME "smsc47b397"
 
 /* Super-I/0 registers and commands */
 
@@ -91,7 +92,8 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
 #define SMSC47B397_REG_FAN_MSB(nr) (0x29 + 2 * (nr))
 
 struct smsc47b397_data {
-        struct i2c_client client;
+        unsigned short addr;
+        const char *name;
         struct class_device *class_dev;
         struct mutex lock;
 
@@ -104,45 +106,43 @@ struct smsc47b397_data {
         u8 temp[4];
 };
 
-static int smsc47b397_read_value(struct i2c_client *client, u8 reg)
+static int smsc47b397_read_value(struct smsc47b397_data* data, u8 reg)
 {
-        struct smsc47b397_data *data = i2c_get_clientdata(client);
         int res;
 
         mutex_lock(&data->lock);
-        outb(reg, client->addr);
-        res = inb_p(client->addr + 1);
+        outb(reg, data->addr);
+        res = inb_p(data->addr + 1);
         mutex_unlock(&data->lock);
         return res;
 }
 
 static struct smsc47b397_data *smsc47b397_update_device(struct device *dev)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct smsc47b397_data *data = i2c_get_clientdata(client);
+        struct smsc47b397_data *data = dev_get_drvdata(dev);
         int i;
 
         mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
-                dev_dbg(&client->dev, "starting device update...\n");
+                dev_dbg(dev, "starting device update...\n");
 
                 /* 4 temperature inputs, 4 fan inputs */
                 for (i = 0; i < 4; i++) {
-                        data->temp[i] = smsc47b397_read_value(client,
+                        data->temp[i] = smsc47b397_read_value(data,
                                         SMSC47B397_REG_TEMP(i));
 
                         /* must read LSB first */
-                        data->fan[i]  = smsc47b397_read_value(client,
+                        data->fan[i]  = smsc47b397_read_value(data,
                                         SMSC47B397_REG_FAN_LSB(i));
-                        data->fan[i] |= smsc47b397_read_value(client,
+                        data->fan[i] |= smsc47b397_read_value(data,
                                         SMSC47B397_REG_FAN_MSB(i)) << 8;
                 }
 
                 data->last_updated = jiffies;
                 data->valid = 1;
 
-                dev_dbg(&client->dev, "... device update complete\n");
+                dev_dbg(dev, "... device update complete\n");
         }
 
         mutex_unlock(&data->update_lock);
@@ -157,24 +157,18 @@ static int temp_from_reg(u8 reg)
         return (s8)reg * 1000;
 }
 
-/* 0 <= nr <= 3 */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
+static ssize_t show_temp(struct device *dev, struct device_attribute
+                         *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct smsc47b397_data *data = smsc47b397_update_device(dev);
-        return sprintf(buf, "%d\n", temp_from_reg(data->temp[nr]));
+        return sprintf(buf, "%d\n", temp_from_reg(data->temp[attr->index]));
 }
 
-#define sysfs_temp(num) \
-static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_temp(dev, buf, num-1); \
-} \
-static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL)
-
-sysfs_temp(1);
-sysfs_temp(2);
-sysfs_temp(3);
-sysfs_temp(4);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 3);
 
 /* FAN: 1 RPM/bit
    REG: count of 90kHz pulses / revolution */
@@ -183,35 +177,37 @@ static int fan_from_reg(u16 reg)
         return 90000 * 60 / reg;
 }
 
-/* 0 <= nr <= 3 */
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute
+                        *devattr, char *buf)
 {
-        struct smsc47b397_data *data = smsc47b397_update_device(dev);
-        return sprintf(buf, "%d\n", fan_from_reg(data->fan[nr]));
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct smsc47b397_data *data = smsc47b397_update_device(dev);
+        return sprintf(buf, "%d\n", fan_from_reg(data->fan[attr->index]));
 }
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 3);
 
-#define sysfs_fan(num) \
-static ssize_t show_fan##num(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan(dev, buf, num-1); \
-} \
-static DEVICE_ATTR(fan##num##_input, S_IRUGO, show_fan##num, NULL)
-
-sysfs_fan(1);
-sysfs_fan(2);
-sysfs_fan(3);
-sysfs_fan(4);
+static ssize_t show_name(struct device *dev, struct device_attribute
+                         *devattr, char *buf)
+{
+        struct smsc47b397_data *data = dev_get_drvdata(dev);
+        return sprintf(buf, "%s\n", data->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
 static struct attribute *smsc47b397_attributes[] = {
-        &dev_attr_temp1_input.attr,
-        &dev_attr_temp2_input.attr,
-        &dev_attr_temp3_input.attr,
-        &dev_attr_temp4_input.attr,
-        &dev_attr_fan1_input.attr,
-        &dev_attr_fan2_input.attr,
-        &dev_attr_fan3_input.attr,
-        &dev_attr_fan4_input.attr,
-
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_temp3_input.dev_attr.attr,
+        &sensor_dev_attr_temp4_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan4_input.dev_attr.attr,
+
+        &dev_attr_name.attr,
         NULL
 };
 
@@ -219,44 +215,44 @@ static const struct attribute_group smsc47b397_group = {
         .attrs = smsc47b397_attributes,
 };
 
-static int smsc47b397_detach_client(struct i2c_client *client)
+static int __devexit smsc47b397_remove(struct platform_device *pdev)
 {
-        struct smsc47b397_data *data = i2c_get_clientdata(client);
-        int err;
+        struct smsc47b397_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
 
         hwmon_device_unregister(data->class_dev);
-        sysfs_remove_group(&client->dev.kobj, &smsc47b397_group);
-
-        if ((err = i2c_detach_client(client)))
-                return err;
-
-        release_region(client->addr, SMSC_EXTENT);
+        sysfs_remove_group(&pdev->dev.kobj, &smsc47b397_group);
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start, SMSC_EXTENT);
         kfree(data);
 
         return 0;
 }
 
-static int smsc47b397_detect(struct i2c_adapter *adapter);
+static int smsc47b397_probe(struct platform_device *pdev);
 
-static struct i2c_driver smsc47b397_driver = {
+static struct platform_driver smsc47b397_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
-                .name   = "smsc47b397",
+                .name   = DRVNAME,
         },
-        .attach_adapter = smsc47b397_detect,
-        .detach_client  = smsc47b397_detach_client,
+        .probe          = smsc47b397_probe,
+        .remove         = __devexit_p(smsc47b397_remove),
 };
 
-static int smsc47b397_detect(struct i2c_adapter *adapter)
+static int __devinit smsc47b397_probe(struct platform_device *pdev)
 {
-        struct i2c_client *new_client;
+        struct device *dev = &pdev->dev;
         struct smsc47b397_data *data;
+        struct resource *res;
         int err = 0;
 
-        if (!request_region(address, SMSC_EXTENT,
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, SMSC_EXTENT,
                             smsc47b397_driver.driver.name)) {
-                dev_err(&adapter->dev, "Region 0x%x already in use!\n",
-                        address);
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        (unsigned long)res->start,
+                        (unsigned long)res->start + SMSC_EXTENT - 1);
                 return -EBUSY;
         }
 
@@ -265,25 +261,16 @@ static int smsc47b397_detect(struct i2c_adapter *adapter)
                 goto error_release;
         }
 
-        new_client = &data->client;
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
+        data->addr = res->start;
+        data->name = "smsc47b397";
         mutex_init(&data->lock);
-        new_client->adapter = adapter;
-        new_client->driver = &smsc47b397_driver;
-        new_client->flags = 0;
-
-        strlcpy(new_client->name, "smsc47b397", I2C_NAME_SIZE);
-
         mutex_init(&data->update_lock);
+        platform_set_drvdata(pdev, data);
 
-        if ((err = i2c_attach_client(new_client)))
+        if ((err = sysfs_create_group(&dev->kobj, &smsc47b397_group)))
                 goto error_free;
 
-        if ((err = sysfs_create_group(&new_client->dev.kobj, &smsc47b397_group)))
-                goto error_detach;
-
-        data->class_dev = hwmon_device_register(&new_client->dev);
+        data->class_dev = hwmon_device_register(dev);
         if (IS_ERR(data->class_dev)) {
                 err = PTR_ERR(data->class_dev);
                 goto error_remove;
@@ -292,13 +279,50 @@ static int smsc47b397_detect(struct i2c_adapter *adapter)
         return 0;
 
 error_remove:
-        sysfs_remove_group(&new_client->dev.kobj, &smsc47b397_group);
-error_detach:
-        i2c_detach_client(new_client);
+        sysfs_remove_group(&dev->kobj, &smsc47b397_group);
 error_free:
         kfree(data);
 error_release:
-        release_region(address, SMSC_EXTENT);
+        release_region(res->start, SMSC_EXTENT);
+        return err;
+}
+
+static int __init smsc47b397_device_add(unsigned short address)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + SMSC_EXTENT - 1,
+                .name   = DRVNAME,
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc(DRVNAME, address);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+exit_device_put:
+        platform_device_put(pdev);
+exit:
         return err;
 }
 
@@ -320,7 +344,7 @@ static int __init smsc47b397_find(unsigned short *addr)
         *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
                  |  superio_inb(SUPERIO_REG_BASE_LSB);
 
-        printk(KERN_INFO "smsc47b397: found SMSC %s "
+        printk(KERN_INFO DRVNAME ": found SMSC %s "
                 "(base address 0x%04x, revision %u)\n",
                 id == 0x81 ? "SCH5307-NS" : "LPC47B397-NC", *addr, rev);
 
@@ -330,17 +354,33 @@ static int __init smsc47b397_find(unsigned short *addr)
 
 static int __init smsc47b397_init(void)
 {
+        unsigned short address;
         int ret;
 
         if ((ret = smsc47b397_find(&address)))
                 return ret;
 
-        return i2c_isa_add_driver(&smsc47b397_driver);
+        ret = platform_driver_register(&smsc47b397_driver);
+        if (ret)
+                goto exit;
+
+        /* Sets global pdev as a side effect */
+        ret = smsc47b397_device_add(address);
+        if (ret)
+                goto exit_driver;
+
+        return 0;
+
+exit_driver:
+        platform_driver_unregister(&smsc47b397_driver);
+exit:
+        return ret;
 }
 
 static void __exit smsc47b397_exit(void)
 {
-        i2c_isa_del_driver(&smsc47b397_driver);
+        platform_device_unregister(pdev);
+        platform_driver_unregister(&smsc47b397_driver);
 }
 
 MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index beb881c4b2e8..1e21c8cc948f 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -3,10 +3,11 @@
                  for hardware monitoring
 
     Supports the SMSC LPC47B27x, LPC47M10x, LPC47M112, LPC47M13x,
-    LPC47M14x, LPC47M15x, LPC47M192 and LPC47M997 Super-I/O chips.
+    LPC47M14x, LPC47M15x, LPC47M192, LPC47M292 and LPC47M997
+    Super-I/O chips.
 
     Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
-    Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2004-2007 Jean Delvare <khali@linux-fr.org>
     Ported to Linux 2.6 by Gabriele Gorla <gorlik@yahoo.com>
                         and Jean Delvare
 
@@ -29,17 +30,19 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 #include <asm/io.h>
 
-/* Address is autodetected, there is no default value */
-static unsigned short address;
+static struct platform_device *pdev;
+
+#define DRVNAME "smsc47m1"
+enum chips { smsc47m1, smsc47m2 };
 
 /* Super-I/0 registers and commands */
 
@@ -87,10 +90,18 @@ superio_exit(void)
 #define SMSC47M1_REG_ALARM              0x04
 #define SMSC47M1_REG_TPIN(nr)           (0x34 - (nr))
 #define SMSC47M1_REG_PPIN(nr)           (0x36 - (nr))
-#define SMSC47M1_REG_PWM(nr)            (0x56 + (nr))
 #define SMSC47M1_REG_FANDIV             0x58
-#define SMSC47M1_REG_FAN(nr)            (0x59 + (nr))
-#define SMSC47M1_REG_FAN_PRELOAD(nr)    (0x5B + (nr))
+
+static const u8 SMSC47M1_REG_FAN[3]             = { 0x59, 0x5a, 0x6b };
+static const u8 SMSC47M1_REG_FAN_PRELOAD[3]     = { 0x5b, 0x5c, 0x6c };
+static const u8 SMSC47M1_REG_PWM[3]             = { 0x56, 0x57, 0x69 };
+
+#define SMSC47M2_REG_ALARM6             0x09
+#define SMSC47M2_REG_TPIN1              0x38
+#define SMSC47M2_REG_TPIN2              0x37
+#define SMSC47M2_REG_TPIN3              0x2d
+#define SMSC47M2_REG_PPIN3              0x2c
+#define SMSC47M2_REG_FANDIV3            0x6a
 
 #define MIN_FROM_REG(reg,div)           ((reg)>=192 ? 0 : \
                                          983040/((192-(reg))*(div)))
@@ -102,45 +113,57 @@ superio_exit(void)
 #define PWM_TO_REG(reg)                 (((reg) >> 1) & 0x7E)
 
 struct smsc47m1_data {
-        struct i2c_client client;
+        unsigned short addr;
+        const char *name;
+        enum chips type;
         struct class_device *class_dev;
-        struct mutex lock;
 
         struct mutex update_lock;
         unsigned long last_updated;     /* In jiffies */
 
-        u8 fan[2];              /* Register value */
-        u8 fan_preload[2];      /* Register value */
-        u8 fan_div[2];          /* Register encoding, shifted right */
+        u8 fan[3];              /* Register value */
+        u8 fan_preload[3];      /* Register value */
+        u8 fan_div[3];          /* Register encoding, shifted right */
         u8 alarms;              /* Register encoding */
-        u8 pwm[2];              /* Register value (bit 7 is enable) */
+        u8 pwm[3];              /* Register value (bit 0 is disable) */
 };
 
+struct smsc47m1_sio_data {
+        enum chips type;
+};
 
-static int smsc47m1_detect(struct i2c_adapter *adapter);
-static int smsc47m1_detach_client(struct i2c_client *client);
-
-static int smsc47m1_read_value(struct i2c_client *client, u8 reg);
-static void smsc47m1_write_value(struct i2c_client *client, u8 reg, u8 value);
 
+static int smsc47m1_probe(struct platform_device *pdev);
+static int smsc47m1_remove(struct platform_device *pdev);
 static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
                 int init);
 
+static inline int smsc47m1_read_value(struct smsc47m1_data *data, u8 reg)
+{
+        return inb_p(data->addr + reg);
+}
 
-static struct i2c_driver smsc47m1_driver = {
+static inline void smsc47m1_write_value(struct smsc47m1_data *data, u8 reg,
+                u8 value)
+{
+        outb_p(value, data->addr + reg);
+}
+
+static struct platform_driver smsc47m1_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
-                .name   = "smsc47m1",
+                .name   = DRVNAME,
         },
-        .attach_adapter = smsc47m1_detect,
-        .detach_client  = smsc47m1_detach_client,
+        .probe          = smsc47m1_probe,
+        .remove         = __devexit_p(smsc47m1_remove),
 };
 
-/* nr is 0 or 1 in the callback functions below */
-
-static ssize_t get_fan(struct device *dev, char *buf, int nr)
+static ssize_t get_fan(struct device *dev, struct device_attribute
+                       *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
+        int nr = attr->index;
         /* This chip (stupidly) stops monitoring fan speed if PWM is
            enabled and duty cycle is 0%. This is fine if the monitoring
            and control concern the same fan, but troublesome if they are
@@ -152,43 +175,54 @@ static ssize_t get_fan(struct device *dev, char *buf, int nr)
         return sprintf(buf, "%d\n", rpm);
 }
 
-static ssize_t get_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t get_fan_min(struct device *dev, struct device_attribute
+                           *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
+        int nr = attr->index;
         int rpm = MIN_FROM_REG(data->fan_preload[nr],
                                DIV_FROM_REG(data->fan_div[nr]));
         return sprintf(buf, "%d\n", rpm);
 }
 
-static ssize_t get_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t get_fan_div(struct device *dev, struct device_attribute
+                           *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
-        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]));
+        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index]));
 }
 
-static ssize_t get_pwm(struct device *dev, char *buf, int nr)
+static ssize_t get_pwm(struct device *dev, struct device_attribute
+                       *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
-        return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr]));
+        return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[attr->index]));
 }
 
-static ssize_t get_pwm_en(struct device *dev, char *buf, int nr)
+static ssize_t get_pwm_en(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
-        return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr]));
+        return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[attr->index]));
 }
 
-static ssize_t get_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t get_alarms(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
 {
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
         return sprintf(buf, "%d\n", data->alarms);
 }
 
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute
+                           *devattr, const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct smsc47m1_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct smsc47m1_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         long rpmdiv, val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
@@ -200,7 +234,7 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         }
 
         data->fan_preload[nr] = 192 - ((983040 + rpmdiv / 2) / rpmdiv);
-        smsc47m1_write_value(client, SMSC47M1_REG_FAN_PRELOAD(nr),
+        smsc47m1_write_value(data, SMSC47M1_REG_FAN_PRELOAD[nr],
                              data->fan_preload[nr]);
         mutex_unlock(&data->update_lock);
 
@@ -211,12 +245,12 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
    determined in part by the fan clock divider.  This follows the principle
    of least surprise; the user doesn't expect the fan minimum to change just
    because the divider changed. */
-static ssize_t set_fan_div(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute
+                           *devattr, const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct smsc47m1_data *data = i2c_get_clientdata(client);
-
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct smsc47m1_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         long new_div = simple_strtol(buf, NULL, 10), tmp;
         u8 old_div = DIV_FROM_REG(data->fan_div[nr]);
 
@@ -234,27 +268,38 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
                 return -EINVAL;
         }
 
-        tmp = smsc47m1_read_value(client, SMSC47M1_REG_FANDIV) & 0x0F;
-        tmp |= (data->fan_div[0] << 4) | (data->fan_div[1] << 6);
-        smsc47m1_write_value(client, SMSC47M1_REG_FANDIV, tmp);
+        switch (nr) {
+        case 0:
+        case 1:
+                tmp = smsc47m1_read_value(data, SMSC47M1_REG_FANDIV)
+                      & ~(0x03 << (4 + 2 * nr));
+                tmp |= data->fan_div[nr] << (4 + 2 * nr);
+                smsc47m1_write_value(data, SMSC47M1_REG_FANDIV, tmp);
+                break;
+        case 2:
+                tmp = smsc47m1_read_value(data, SMSC47M2_REG_FANDIV3) & 0xCF;
+                tmp |= data->fan_div[2] << 4;
+                smsc47m1_write_value(data, SMSC47M2_REG_FANDIV3, tmp);
+                break;
+        }
 
         /* Preserve fan min */
         tmp = 192 - (old_div * (192 - data->fan_preload[nr])
                      + new_div / 2) / new_div;
         data->fan_preload[nr] = SENSORS_LIMIT(tmp, 0, 191);
-        smsc47m1_write_value(client, SMSC47M1_REG_FAN_PRELOAD(nr),
+        smsc47m1_write_value(data, SMSC47M1_REG_FAN_PRELOAD[nr],
                              data->fan_preload[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
 }
 
-static ssize_t set_pwm(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_pwm(struct device *dev, struct device_attribute
+                       *devattr, const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct smsc47m1_data *data = i2c_get_clientdata(client);
-
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct smsc47m1_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
         if (val < 0 || val > 255)
@@ -263,19 +308,19 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
         mutex_lock(&data->update_lock);
         data->pwm[nr] &= 0x81; /* Preserve additional bits */
         data->pwm[nr] |= PWM_TO_REG(val);
-        smsc47m1_write_value(client, SMSC47M1_REG_PWM(nr),
+        smsc47m1_write_value(data, SMSC47M1_REG_PWM[nr],
                              data->pwm[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
 }
 
-static ssize_t set_pwm_en(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_pwm_en(struct device *dev, struct device_attribute
+                          *devattr, const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct smsc47m1_data *data = i2c_get_clientdata(client);
-
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct smsc47m1_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
         
         if (val != 0 && val != 1)
@@ -284,7 +329,7 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
         mutex_lock(&data->update_lock);
         data->pwm[nr] &= 0xFE; /* preserve the other bits */
         data->pwm[nr] |= !val;
-        smsc47m1_write_value(client, SMSC47M1_REG_PWM(nr),
+        smsc47m1_write_value(data, SMSC47M1_REG_PWM[nr],
                              data->pwm[nr]);
         mutex_unlock(&data->update_lock);
 
@@ -292,79 +337,55 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
 }
 
 #define fan_present(offset)                                             \
-static ssize_t get_fan##offset (struct device *dev, struct device_attribute *attr, char *buf)           \
-{                                                                       \
-        return get_fan(dev, buf, offset - 1);                           \
-}                                                                       \
-static ssize_t get_fan##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)     \
-{                                                                       \
-        return get_fan_min(dev, buf, offset - 1);                       \
-}                                                                       \
-static ssize_t set_fan##offset##_min (struct device *dev, struct device_attribute *attr,                \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_fan_min(dev, buf, count, offset - 1);                \
-}                                                                       \
-static ssize_t get_fan##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)     \
-{                                                                       \
-        return get_fan_div(dev, buf, offset - 1);                       \
-}                                                                       \
-static ssize_t set_fan##offset##_div (struct device *dev, struct device_attribute *attr,                \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_fan_div(dev, buf, count, offset - 1);                \
-}                                                                       \
-static ssize_t get_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf)           \
-{                                                                       \
-        return get_pwm(dev, buf, offset - 1);                           \
-}                                                                       \
-static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr,                      \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_pwm(dev, buf, count, offset - 1);                    \
-}                                                                       \
-static ssize_t get_pwm##offset##_en (struct device *dev, struct device_attribute *attr, char *buf)      \
-{                                                                       \
-        return get_pwm_en(dev, buf, offset - 1);                        \
-}                                                                       \
-static ssize_t set_pwm##offset##_en (struct device *dev, struct device_attribute *attr,         \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_pwm_en(dev, buf, count, offset - 1);                 \
-}                                                                       \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan##offset,       \
-                NULL);                                                  \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
-                get_fan##offset##_min, set_fan##offset##_min);          \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,                \
-                get_fan##offset##_div, set_fan##offset##_div);          \
-static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,                      \
-                get_pwm##offset, set_pwm##offset);                      \
-static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,             \
-                get_pwm##offset##_en, set_pwm##offset##_en);
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan,        \
+                NULL, offset - 1);                                      \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,         \
+                get_fan_min, set_fan_min, offset - 1);                  \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,         \
+                get_fan_div, set_fan_div, offset - 1);                  \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,               \
+                get_pwm, set_pwm, offset - 1);                          \
+static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,      \
+                get_pwm_en, set_pwm_en, offset - 1)
 
 fan_present(1);
 fan_present(2);
+fan_present(3);
 
 static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL);
 
+static ssize_t show_name(struct device *dev, struct device_attribute
+                         *devattr, char *buf)
+{
+        struct smsc47m1_data *data = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%s\n", data->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+
 /* Almost all sysfs files may or may not be created depending on the chip
    setup so we create them individually. It is still convenient to define a
    group to remove them all at once. */
 static struct attribute *smsc47m1_attributes[] = {
-        &dev_attr_fan1_input.attr,
-        &dev_attr_fan1_min.attr,
-        &dev_attr_fan1_div.attr,
-        &dev_attr_fan2_input.attr,
-        &dev_attr_fan2_min.attr,
-        &dev_attr_fan2_div.attr,
-
-        &dev_attr_pwm1.attr,
-        &dev_attr_pwm1_enable.attr,
-        &dev_attr_pwm2.attr,
-        &dev_attr_pwm2_enable.attr,
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_min.dev_attr.attr,
+        &sensor_dev_attr_fan1_div.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_min.dev_attr.attr,
+        &sensor_dev_attr_fan2_div.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_min.dev_attr.attr,
+        &sensor_dev_attr_fan3_div.dev_attr.attr,
+
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
+        &sensor_dev_attr_pwm3_enable.dev_attr.attr,
 
         &dev_attr_alarms.attr,
+        &dev_attr_name.attr,
         NULL
 };
 
@@ -372,7 +393,8 @@ static const struct attribute_group smsc47m1_group = {
         .attrs = smsc47m1_attributes,
 };
 
-static int __init smsc47m1_find(unsigned short *addr)
+static int __init smsc47m1_find(unsigned short *addr,
+                                struct smsc47m1_sio_data *sio_data)
 {
         u8 val;
 
@@ -386,18 +408,32 @@ static int __init smsc47m1_find(unsigned short *addr)
          * can do much more besides (device id 0x60).
          * The LPC47M997 is undocumented, but seems to be compatible with
          * the LPC47M192, and has the same device id.
+         * The LPC47M292 (device id 0x6B) is somewhat compatible, but it
+         * supports a 3rd fan, and the pin configuration registers are
+         * unfortunately different.
          */
-        if (val == 0x51)
-                printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n");
-        else if (val == 0x59)
-                printk(KERN_INFO "smsc47m1: Found SMSC "
-                       "LPC47M10x/LPC47M112/LPC47M13x\n");
-        else if (val == 0x5F)
-                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n");
-        else if (val == 0x60)
-                printk(KERN_INFO "smsc47m1: Found SMSC "
-                       "LPC47M15x/LPC47M192/LPC47M997\n");
-        else {
+        switch (val) {
+        case 0x51:
+                pr_info(DRVNAME ": Found SMSC LPC47B27x\n");
+                sio_data->type = smsc47m1;
+                break;
+        case 0x59:
+                pr_info(DRVNAME ": Found SMSC LPC47M10x/LPC47M112/LPC47M13x\n");
+                sio_data->type = smsc47m1;
+                break;
+        case 0x5F:
+                pr_info(DRVNAME ": Found SMSC LPC47M14x\n");
+                sio_data->type = smsc47m1;
+                break;
+        case 0x60:
+                pr_info(DRVNAME ": Found SMSC LPC47M15x/LPC47M192/LPC47M997\n");
+                sio_data->type = smsc47m1;
+                break;
+        case 0x6B:
+                pr_info(DRVNAME ": Found SMSC LPC47M292\n");
+                sio_data->type = smsc47m2;
+                break;
+        default:
                 superio_exit();
                 return -ENODEV;
         }
@@ -407,7 +443,7 @@ static int __init smsc47m1_find(unsigned short *addr)
               |  superio_inb(SUPERIO_REG_BASE + 1);
         val = superio_inb(SUPERIO_REG_ACT);
         if (*addr == 0 || (val & 0x01) == 0) {
-                printk(KERN_INFO "smsc47m1: Device is disabled, will not use\n");
+                pr_info(DRVNAME ": Device is disabled, will not use\n");
                 superio_exit();
                 return -ENODEV;
         }
@@ -416,15 +452,25 @@ static int __init smsc47m1_find(unsigned short *addr)
         return 0;
 }
 
-static int smsc47m1_detect(struct i2c_adapter *adapter)
+static int __devinit smsc47m1_probe(struct platform_device *pdev)
 {
-        struct i2c_client *new_client;
+        struct device *dev = &pdev->dev;
+        struct smsc47m1_sio_data *sio_data = dev->platform_data;
         struct smsc47m1_data *data;
+        struct resource *res;
         int err = 0;
-        int fan1, fan2, pwm1, pwm2;
-
-        if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.driver.name)) {
-                dev_err(&adapter->dev, "Region 0x%x already in use!\n", address);
+        int fan1, fan2, fan3, pwm1, pwm2, pwm3;
+
+        static const char *names[] = {
+                "smsc47m1",
+                "smsc47m2",
+        };
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, SMSC_EXTENT, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        (unsigned long)res->start,
+                        (unsigned long)res->end);
                 return -EBUSY;
         }
 
@@ -433,93 +479,114 @@ static int smsc47m1_detect(struct i2c_adapter *adapter)
                 goto error_release;
         }
 
-        new_client = &data->client;
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
-        mutex_init(&data->lock);
-        new_client->adapter = adapter;
-        new_client->driver = &smsc47m1_driver;
-        new_client->flags = 0;
-
-        strlcpy(new_client->name, "smsc47m1", I2C_NAME_SIZE);
+        data->addr = res->start;
+        data->type = sio_data->type;
+        data->name = names[sio_data->type];
         mutex_init(&data->update_lock);
+        platform_set_drvdata(pdev, data);
 
         /* If no function is properly configured, there's no point in
            actually registering the chip. */
-        fan1 = (smsc47m1_read_value(new_client, SMSC47M1_REG_TPIN(0)) & 0x05)
-               == 0x05;
-        fan2 = (smsc47m1_read_value(new_client, SMSC47M1_REG_TPIN(1)) & 0x05)
-               == 0x05;
-        pwm1 = (smsc47m1_read_value(new_client, SMSC47M1_REG_PPIN(0)) & 0x05)
+        pwm1 = (smsc47m1_read_value(data, SMSC47M1_REG_PPIN(0)) & 0x05)
                == 0x04;
-        pwm2 = (smsc47m1_read_value(new_client, SMSC47M1_REG_PPIN(1)) & 0x05)
+        pwm2 = (smsc47m1_read_value(data, SMSC47M1_REG_PPIN(1)) & 0x05)
                == 0x04;
-        if (!(fan1 || fan2 || pwm1 || pwm2)) {
-                dev_warn(&adapter->dev, "Device at 0x%x is not configured, "
-                         "will not use\n", new_client->addr);
+        if (data->type == smsc47m2) {
+                fan1 = (smsc47m1_read_value(data, SMSC47M2_REG_TPIN1)
+                        & 0x0d) == 0x09;
+                fan2 = (smsc47m1_read_value(data, SMSC47M2_REG_TPIN2)
+                        & 0x0d) == 0x09;
+                fan3 = (smsc47m1_read_value(data, SMSC47M2_REG_TPIN3)
+                        & 0x0d) == 0x0d;
+                pwm3 = (smsc47m1_read_value(data, SMSC47M2_REG_PPIN3)
+                        & 0x0d) == 0x08;
+        } else {
+                fan1 = (smsc47m1_read_value(data, SMSC47M1_REG_TPIN(0))
+                        & 0x05) == 0x05;
+                fan2 = (smsc47m1_read_value(data, SMSC47M1_REG_TPIN(1))
+                        & 0x05) == 0x05;
+                fan3 = 0;
+                pwm3 = 0;
+        }
+        if (!(fan1 || fan2 || fan3 || pwm1 || pwm2 || pwm3)) {
+                dev_warn(dev, "Device not configured, will not use\n");
                 err = -ENODEV;
                 goto error_free;
         }
 
-        if ((err = i2c_attach_client(new_client)))
-                goto error_free;
-
         /* Some values (fan min, clock dividers, pwm registers) may be
            needed before any update is triggered, so we better read them
            at least once here. We don't usually do it that way, but in
            this particular case, manually reading 5 registers out of 8
            doesn't make much sense and we're better using the existing
            function. */
-        smsc47m1_update_device(&new_client->dev, 1);
+        smsc47m1_update_device(dev, 1);
 
         /* Register sysfs hooks */
         if (fan1) {
-                if ((err = device_create_file(&new_client->dev,
-                                              &dev_attr_fan1_input))
-                 || (err = device_create_file(&new_client->dev,
-                                              &dev_attr_fan1_min))
-                 || (err = device_create_file(&new_client->dev,
-                                              &dev_attr_fan1_div)))
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_fan1_input.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan1_min.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan1_div.dev_attr)))
                         goto error_remove_files;
         } else
-                dev_dbg(&new_client->dev, "Fan 1 not enabled by hardware, "
-                        "skipping\n");
+                dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n");
 
         if (fan2) {
-                if ((err = device_create_file(&new_client->dev,
-                                              &dev_attr_fan2_input))
-                 || (err = device_create_file(&new_client->dev,
-                                              &dev_attr_fan2_min))
-                 || (err = device_create_file(&new_client->dev,
-                                              &dev_attr_fan2_div)))
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_fan2_input.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan2_min.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan2_div.dev_attr)))
                         goto error_remove_files;
         } else
-                dev_dbg(&new_client->dev, "Fan 2 not enabled by hardware, "
-                        "skipping\n");
+                dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n");
+
+        if (fan3) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_fan3_input.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan3_min.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan3_div.dev_attr)))
+                        goto error_remove_files;
+        } else
+                dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n");
 
         if (pwm1) {
-                if ((err = device_create_file(&new_client->dev,
-                                              &dev_attr_pwm1))
-                 || (err = device_create_file(&new_client->dev,
-                                              &dev_attr_pwm1_enable)))
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_pwm1.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_pwm1_enable.dev_attr)))
                         goto error_remove_files;
         } else
-                dev_dbg(&new_client->dev, "PWM 1 not enabled by hardware, "
-                        "skipping\n");
+                dev_dbg(dev, "PWM 1 not enabled by hardware, skipping\n");
+
         if (pwm2) {
-                if ((err = device_create_file(&new_client->dev,
-                                              &dev_attr_pwm2))
-                 || (err = device_create_file(&new_client->dev,
-                                              &dev_attr_pwm2_enable)))
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_pwm2.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_pwm2_enable.dev_attr)))
+                        goto error_remove_files;
+        } else
+                dev_dbg(dev, "PWM 2 not enabled by hardware, skipping\n");
+
+        if (pwm3) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_pwm3.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_pwm3_enable.dev_attr)))
                         goto error_remove_files;
         } else
-                dev_dbg(&new_client->dev, "PWM 2 not enabled by hardware, "
-                        "skipping\n");
+                dev_dbg(dev, "PWM 3 not enabled by hardware, skipping\n");
 
-        if ((err = device_create_file(&new_client->dev, &dev_attr_alarms)))
+        if ((err = device_create_file(dev, &dev_attr_alarms)))
                 goto error_remove_files;
 
-        data->class_dev = hwmon_device_register(&new_client->dev);
+        data->class_dev = hwmon_device_register(dev);
         if (IS_ERR(data->class_dev)) {
                 err = PTR_ERR(data->class_dev);
                 goto error_remove_files;
@@ -528,78 +595,71 @@ static int smsc47m1_detect(struct i2c_adapter *adapter)
         return 0;
 
 error_remove_files:
-        sysfs_remove_group(&new_client->dev.kobj, &smsc47m1_group);
-        i2c_detach_client(new_client);
+        sysfs_remove_group(&dev->kobj, &smsc47m1_group);
 error_free:
         kfree(data);
 error_release:
-        release_region(address, SMSC_EXTENT);
+        release_region(res->start, SMSC_EXTENT);
         return err;
 }
 
-static int smsc47m1_detach_client(struct i2c_client *client)
+static int __devexit smsc47m1_remove(struct platform_device *pdev)
 {
-        struct smsc47m1_data *data = i2c_get_clientdata(client);
-        int err;
+        struct smsc47m1_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
 
+        platform_set_drvdata(pdev, NULL);
         hwmon_device_unregister(data->class_dev);
-        sysfs_remove_group(&client->dev.kobj, &smsc47m1_group);
-
-        if ((err = i2c_detach_client(client)))
-                return err;
+        sysfs_remove_group(&pdev->dev.kobj, &smsc47m1_group);
 
-        release_region(client->addr, SMSC_EXTENT);
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start, SMSC_EXTENT);
         kfree(data);
 
         return 0;
 }
 
-static int smsc47m1_read_value(struct i2c_client *client, u8 reg)
-{
-        int res;
-
-        mutex_lock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
-        res = inb_p(client->addr + reg);
-        mutex_unlock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
-        return res;
-}
-
-static void smsc47m1_write_value(struct i2c_client *client, u8 reg, u8 value)
-{
-        mutex_lock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
-        outb_p(value, client->addr + reg);
-        mutex_unlock(&((struct smsc47m1_data *) i2c_get_clientdata(client))->lock);
-}
-
 static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
                 int init)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct smsc47m1_data *data = i2c_get_clientdata(client);
+        struct smsc47m1_data *data = dev_get_drvdata(dev);
 
         mutex_lock(&data->update_lock);
 
         if (time_after(jiffies, data->last_updated + HZ + HZ / 2) || init) {
-                int i;
-
-                for (i = 0; i < 2; i++) {
-                        data->fan[i] = smsc47m1_read_value(client,
-                                       SMSC47M1_REG_FAN(i));
-                        data->fan_preload[i] = smsc47m1_read_value(client,
-                                               SMSC47M1_REG_FAN_PRELOAD(i));
-                        data->pwm[i] = smsc47m1_read_value(client,
-                                       SMSC47M1_REG_PWM(i));
+                int i, fan_nr;
+                fan_nr = data->type == smsc47m2 ? 3 : 2;
+
+                for (i = 0; i < fan_nr; i++) {
+                        data->fan[i] = smsc47m1_read_value(data,
+                                       SMSC47M1_REG_FAN[i]);
+                        data->fan_preload[i] = smsc47m1_read_value(data,
+                                               SMSC47M1_REG_FAN_PRELOAD[i]);
+                        data->pwm[i] = smsc47m1_read_value(data,
+                                       SMSC47M1_REG_PWM[i]);
                 }
 
-                i = smsc47m1_read_value(client, SMSC47M1_REG_FANDIV);
+                i = smsc47m1_read_value(data, SMSC47M1_REG_FANDIV);
                 data->fan_div[0] = (i >> 4) & 0x03;
                 data->fan_div[1] = i >> 6;
 
-                data->alarms = smsc47m1_read_value(client,
+                data->alarms = smsc47m1_read_value(data,
                                SMSC47M1_REG_ALARM) >> 6;
                 /* Clear alarms if needed */
                 if (data->alarms)
-                        smsc47m1_write_value(client, SMSC47M1_REG_ALARM, 0xC0);
+                        smsc47m1_write_value(data, SMSC47M1_REG_ALARM, 0xC0);
+
+                if (fan_nr >= 3) {
+                        data->fan_div[2] = (smsc47m1_read_value(data,
+                                            SMSC47M2_REG_FANDIV3) >> 4) & 0x03;
+                        data->alarms |= (smsc47m1_read_value(data,
+                                         SMSC47M2_REG_ALARM6) & 0x40) >> 4;
+                        /* Clear alarm if needed */
+                        if (data->alarms & 0x04)
+                                smsc47m1_write_value(data,
+                                                     SMSC47M2_REG_ALARM6,
+                                                     0x40);
+                }
 
                 data->last_updated = jiffies;
         }
@@ -608,18 +668,86 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
         return data;
 }
 
+static int __init smsc47m1_device_add(unsigned short address,
+                                      const struct smsc47m1_sio_data *sio_data)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + SMSC_EXTENT - 1,
+                .name   = DRVNAME,
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc(DRVNAME, address);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        pdev->dev.platform_data = kmalloc(sizeof(struct smsc47m1_sio_data),
+                                          GFP_KERNEL);
+        if (!pdev->dev.platform_data) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
+                goto exit_device_put;
+        }
+        memcpy(pdev->dev.platform_data, sio_data,
+               sizeof(struct smsc47m1_sio_data));
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+exit_device_put:
+        platform_device_put(pdev);
+exit:
+        return err;
+}
+
 static int __init sm_smsc47m1_init(void)
 {
-        if (smsc47m1_find(&address)) {
+        int err;
+        unsigned short address;
+        struct smsc47m1_sio_data sio_data;
+
+        if (smsc47m1_find(&address, &sio_data))
                 return -ENODEV;
-        }
 
-        return i2c_isa_add_driver(&smsc47m1_driver);
+        err = platform_driver_register(&smsc47m1_driver);
+        if (err)
+                goto exit;
+
+        /* Sets global pdev as a side effect */
+        err = smsc47m1_device_add(address, &sio_data);
+        if (err)
+                goto exit_driver;
+
+        return 0;
+
+exit_driver:
+        platform_driver_unregister(&smsc47m1_driver);
+exit:
+        return err;
 }
 
 static void __exit sm_smsc47m1_exit(void)
 {
-        i2c_isa_del_driver(&smsc47m1_driver);
+        platform_device_unregister(pdev);
+        platform_driver_unregister(&smsc47m1_driver);
 }
 
 MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c
index a6833f437395..a012f396f354 100644
--- a/drivers/hwmon/smsc47m192.c
+++ b/drivers/hwmon/smsc47m192.c
@@ -1,6 +1,6 @@
 /*
     smsc47m192.c - Support for hardware monitoring block of
-                   SMSC LPC47M192 and LPC47M997 Super I/O chips
+                   SMSC LPC47M192 and compatible Super I/O chips
 
     Copyright (C) 2006  Hartmut Rick <linux@rick.claranet.de>
 
@@ -518,7 +518,7 @@ static int smsc47m192_detect(struct i2c_adapter *adapter, int address,
                  && (i2c_smbus_read_byte_data(client,
                                 SMSC47M192_REG_VID4) & 0xfe) == 0x80) {
                         dev_info(&adapter->dev,
-                                 "found SMSC47M192 or SMSC47M997, "
+                                 "found SMSC47M192 or compatible, "
                                  "version 2, stepping A%d\n", version & 0x0f);
                 } else {
                         dev_dbg(&adapter->dev,
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index 89c23d6add7b..9f3e332c5b7f 100644
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
@@ -31,6 +31,7 @@
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 
 static int uch_config = -1;
@@ -1130,6 +1131,12 @@ static int __devinit vt1211_probe(struct platform_device *pdev)
         }
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, res->end - res->start + 1, DRVNAME)) {
+                err = -EBUSY;
+                dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
+                        (unsigned long)res->start, (unsigned long)res->end);
+                goto EXIT_KFREE;
+        }
         data->addr = res->start;
         data->name = DRVNAME;
         mutex_init(&data->update_lock);
@@ -1197,6 +1204,8 @@ EXIT_DEV_REMOVE:
         dev_err(dev, "Sysfs interface creation failed (%d)\n", err);
 EXIT_DEV_REMOVE_SILENT:
         vt1211_remove_sysfs(pdev);
+        release_region(res->start, res->end - res->start + 1);
+EXIT_KFREE:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 EXIT:
@@ -1206,12 +1215,16 @@ EXIT:
 static int __devexit vt1211_remove(struct platform_device *pdev)
 {
         struct vt1211_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
 
         hwmon_device_unregister(data->class_dev);
         vt1211_remove_sysfs(pdev);
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start, res->end - res->start + 1);
+
         return 0;
 }
 
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index d7e240635b3b..a5b774b07cbd 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -5,6 +5,7 @@
     Philip Edelbrock <phil@netroedge.com>,
     and Mark Studebaker <mdsxyz123@yahoo.com>
     Ported to 2.6 by Bernhard C. Schrenk <clemy@clemy.org>
+    Copyright (c) 2007  Jean Delvare <khali@linux-fr.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
@@ -42,15 +43,20 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 #include "lm75.h"
 
+static struct platform_device *pdev;
+
+#define DRVNAME "w83627hf"
+enum chips { w83627hf, w83627thf, w83697hf, w83637hf, w83687thf };
+
 static u16 force_addr;
 module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
@@ -60,12 +66,6 @@ module_param(force_i2c, byte, 0);
 MODULE_PARM_DESC(force_i2c,
                  "Initialize the i2c address of the sensors");
 
-/* The actual ISA address is read from Super-I/O configuration space */
-static unsigned short address;
-
-/* Insmod parameters */
-enum chips { any_chip, w83627hf, w83627thf, w83697hf, w83637hf, w83687thf };
-
 static int reset;
 module_param(reset, bool, 0);
 MODULE_PARM_DESC(reset, "Set to one to reset chip on load");
@@ -156,9 +156,9 @@ superio_exit(void)
 #define WINB_REGION_OFFSET      5
 #define WINB_REGION_SIZE        2
 
-/* Where are the sensors address/data registers relative to the base address */
-#define W83781D_ADDR_REG_OFFSET 5
-#define W83781D_DATA_REG_OFFSET 6
+/* Where are the sensors address/data registers relative to the region offset */
+#define W83781D_ADDR_REG_OFFSET 0
+#define W83781D_DATA_REG_OFFSET 1
 
 /* The W83781D registers */
 /* The W83782D registers for nr=7,8 are in bank 5 */
@@ -289,7 +289,8 @@ static inline u8 DIV_TO_REG(long val)
 /* For each registered chip, we need to keep some data in memory.
    The structure is dynamically allocated. */
 struct w83627hf_data {
-        struct i2c_client client;
+        unsigned short addr;
+        const char *name;
         struct class_device *class_dev;
         struct mutex lock;
         enum chips type;
@@ -298,9 +299,6 @@ struct w83627hf_data {
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
 
-        struct i2c_client *lm75;        /* for secondary I2C addresses */
-        /* pointer to array of 2 subclients */
-
         u8 in[9];               /* Register value */
         u8 in_max[9];           /* Register value */
         u8 in_min[9];           /* Register value */
@@ -327,22 +325,26 @@ struct w83627hf_data {
         u8 vrm_ovt;             /* Register value, 627THF/637HF/687THF only */
 };
 
+struct w83627hf_sio_data {
+        enum chips type;
+};
+
 
-static int w83627hf_detect(struct i2c_adapter *adapter);
-static int w83627hf_detach_client(struct i2c_client *client);
+static int w83627hf_probe(struct platform_device *pdev);
+static int w83627hf_remove(struct platform_device *pdev);
 
-static int w83627hf_read_value(struct i2c_client *client, u16 reg);
-static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value);
+static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);
+static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);
 static struct w83627hf_data *w83627hf_update_device(struct device *dev);
-static void w83627hf_init_client(struct i2c_client *client);
+static void w83627hf_init_device(struct platform_device *pdev);
 
-static struct i2c_driver w83627hf_driver = {
+static struct platform_driver w83627hf_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
-                .name   = "w83627hf",
+                .name   = DRVNAME,
         },
-        .attach_adapter = w83627hf_detect,
-        .detach_client  = w83627hf_detach_client,
+        .probe          = w83627hf_probe,
+        .remove         = __devexit_p(w83627hf_remove),
 };
 
 /* following are the sysfs callback functions */
@@ -360,15 +362,14 @@ show_in_reg(in_max)
 static ssize_t \
 store_in_##reg (struct device *dev, const char *buf, size_t count, int nr) \
 { \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct w83627hf_data *data = i2c_get_clientdata(client); \
+        struct w83627hf_data *data = dev_get_drvdata(dev); \
         u32 val; \
          \
         val = simple_strtoul(buf, NULL, 10); \
          \
         mutex_lock(&data->update_lock); \
         data->in_##reg[nr] = IN_TO_REG(val); \
-        w83627hf_write_value(client, W83781D_REG_IN_##REG(nr), \
+        w83627hf_write_value(data, W83781D_REG_IN_##REG(nr), \
                             data->in_##reg[nr]); \
          \
         mutex_unlock(&data->update_lock); \
@@ -452,8 +453,7 @@ static ssize_t show_regs_in_max0(struct device *dev, struct device_attribute *at
 static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -472,7 +472,7 @@ static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *a
                 /* use VRM8 (standard) calculation */
                 data->in_min[0] = IN_TO_REG(val);
 
-        w83627hf_write_value(client, W83781D_REG_IN_MIN(0), data->in_min[0]);
+        w83627hf_write_value(data, W83781D_REG_IN_MIN(0), data->in_min[0]);
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -480,8 +480,7 @@ static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *a
 static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -500,7 +499,7 @@ static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *a
                 /* use VRM8 (standard) calculation */
                 data->in_max[0] = IN_TO_REG(val);
 
-        w83627hf_write_value(client, W83781D_REG_IN_MAX(0), data->in_max[0]);
+        w83627hf_write_value(data, W83781D_REG_IN_MAX(0), data->in_max[0]);
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -525,8 +524,7 @@ show_fan_reg(fan_min);
 static ssize_t
 store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -534,7 +532,7 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
         mutex_lock(&data->update_lock);
         data->fan_min[nr - 1] =
             FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr - 1]));
-        w83627hf_write_value(client, W83781D_REG_FAN_MIN(nr),
+        w83627hf_write_value(data, W83781D_REG_FAN_MIN(nr),
                             data->fan_min[nr - 1]);
 
         mutex_unlock(&data->update_lock);
@@ -587,8 +585,7 @@ show_temp_reg(temp_max_hyst);
 static ssize_t \
 store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \
 { \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct w83627hf_data *data = i2c_get_clientdata(client); \
+        struct w83627hf_data *data = dev_get_drvdata(dev); \
         u32 val; \
          \
         val = simple_strtoul(buf, NULL, 10); \
@@ -597,11 +594,11 @@ store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \
          \
         if (nr >= 2) {  /* TEMP2 and TEMP3 */ \
                 data->temp_##reg##_add[nr-2] = LM75_TEMP_TO_REG(val); \
-                w83627hf_write_value(client, W83781D_REG_TEMP_##REG(nr), \
+                w83627hf_write_value(data, W83781D_REG_TEMP_##REG(nr), \
                                 data->temp_##reg##_add[nr-2]); \
         } else {        /* TEMP1 */ \
                 data->temp_##reg = TEMP_TO_REG(val); \
-                w83627hf_write_value(client, W83781D_REG_TEMP_##REG(nr), \
+                w83627hf_write_value(data, W83781D_REG_TEMP_##REG(nr), \
                         data->temp_##reg); \
         } \
          \
@@ -659,8 +656,7 @@ show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 static ssize_t
 store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -695,8 +691,7 @@ static ssize_t
 store_beep_reg(struct device *dev, const char *buf, size_t count,
                int update_mask)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val, val2;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -705,18 +700,18 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
 
         if (update_mask == BEEP_MASK) { /* We are storing beep_mask */
                 data->beep_mask = BEEP_MASK_TO_REG(val);
-                w83627hf_write_value(client, W83781D_REG_BEEP_INTS1,
+                w83627hf_write_value(data, W83781D_REG_BEEP_INTS1,
                                     data->beep_mask & 0xff);
-                w83627hf_write_value(client, W83781D_REG_BEEP_INTS3,
+                w83627hf_write_value(data, W83781D_REG_BEEP_INTS3,
                                     ((data->beep_mask) >> 16) & 0xff);
                 val2 = (data->beep_mask >> 8) & 0x7f;
         } else {                /* We are storing beep_enable */
                 val2 =
-                    w83627hf_read_value(client, W83781D_REG_BEEP_INTS2) & 0x7f;
+                    w83627hf_read_value(data, W83781D_REG_BEEP_INTS2) & 0x7f;
                 data->beep_enable = BEEP_ENABLE_TO_REG(val);
         }
 
-        w83627hf_write_value(client, W83781D_REG_BEEP_INTS2,
+        w83627hf_write_value(data, W83781D_REG_BEEP_INTS2,
                             val2 | data->beep_enable << 7);
 
         mutex_unlock(&data->update_lock);
@@ -754,8 +749,7 @@ show_fan_div_reg(struct device *dev, char *buf, int nr)
 static ssize_t
 store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         unsigned long min;
         u8 reg;
         unsigned long val = simple_strtoul(buf, NULL, 10);
@@ -768,19 +762,19 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         data->fan_div[nr] = DIV_TO_REG(val);
 
-        reg = (w83627hf_read_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV)
+        reg = (w83627hf_read_value(data, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV)
                & (nr==0 ? 0xcf : 0x3f))
             | ((data->fan_div[nr] & 0x03) << (nr==0 ? 4 : 6));
-        w83627hf_write_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg);
+        w83627hf_write_value(data, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg);
 
-        reg = (w83627hf_read_value(client, W83781D_REG_VBAT)
+        reg = (w83627hf_read_value(data, W83781D_REG_VBAT)
                & ~(1 << (5 + nr)))
             | ((data->fan_div[nr] & 0x04) << (3 + nr));
-        w83627hf_write_value(client, W83781D_REG_VBAT, reg);
+        w83627hf_write_value(data, W83781D_REG_VBAT, reg);
 
         /* Restore fan_min */
         data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
-        w83627hf_write_value(client, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]);
+        w83627hf_write_value(data, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]);
 
         mutex_unlock(&data->update_lock);
         return count;
@@ -814,8 +808,7 @@ show_pwm_reg(struct device *dev, char *buf, int nr)
 static ssize_t
 store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -825,14 +818,14 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
         if (data->type == w83627thf) {
                 /* bits 0-3 are reserved  in 627THF */
                 data->pwm[nr - 1] = PWM_TO_REG(val) & 0xf0;
-                w83627hf_write_value(client,
+                w83627hf_write_value(data,
                                      W836X7HF_REG_PWM(data->type, nr),
                                      data->pwm[nr - 1] |
-                                     (w83627hf_read_value(client,
+                                     (w83627hf_read_value(data,
                                      W836X7HF_REG_PWM(data->type, nr)) & 0x0f));
         } else {
                 data->pwm[nr - 1] = PWM_TO_REG(val);
-                w83627hf_write_value(client,
+                w83627hf_write_value(data,
                                      W836X7HF_REG_PWM(data->type, nr),
                                      data->pwm[nr - 1]);
         }
@@ -868,8 +861,7 @@ show_sensor_reg(struct device *dev, char *buf, int nr)
 static ssize_t
 store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         u32 val, tmp;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -878,31 +870,31 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         switch (val) {
         case 1:         /* PII/Celeron diode */
-                tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
-                w83627hf_write_value(client, W83781D_REG_SCFG1,
+                tmp = w83627hf_read_value(data, W83781D_REG_SCFG1);
+                w83627hf_write_value(data, W83781D_REG_SCFG1,
                                     tmp | BIT_SCFG1[nr - 1]);
-                tmp = w83627hf_read_value(client, W83781D_REG_SCFG2);
-                w83627hf_write_value(client, W83781D_REG_SCFG2,
+                tmp = w83627hf_read_value(data, W83781D_REG_SCFG2);
+                w83627hf_write_value(data, W83781D_REG_SCFG2,
                                     tmp | BIT_SCFG2[nr - 1]);
                 data->sens[nr - 1] = val;
                 break;
         case 2:         /* 3904 */
-                tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
-                w83627hf_write_value(client, W83781D_REG_SCFG1,
+                tmp = w83627hf_read_value(data, W83781D_REG_SCFG1);
+                w83627hf_write_value(data, W83781D_REG_SCFG1,
                                     tmp | BIT_SCFG1[nr - 1]);
-                tmp = w83627hf_read_value(client, W83781D_REG_SCFG2);
-                w83627hf_write_value(client, W83781D_REG_SCFG2,
+                tmp = w83627hf_read_value(data, W83781D_REG_SCFG2);
+                w83627hf_write_value(data, W83781D_REG_SCFG2,
                                     tmp & ~BIT_SCFG2[nr - 1]);
                 data->sens[nr - 1] = val;
                 break;
         case W83781D_DEFAULT_BETA:      /* thermistor */
-                tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
-                w83627hf_write_value(client, W83781D_REG_SCFG1,
+                tmp = w83627hf_read_value(data, W83781D_REG_SCFG1);
+                w83627hf_write_value(data, W83781D_REG_SCFG1,
                                     tmp & ~BIT_SCFG1[nr - 1]);
                 data->sens[nr - 1] = val;
                 break;
         default:
-                dev_err(&client->dev,
+                dev_err(dev,
                        "Invalid sensor type %ld; must be 1, 2, or %d\n",
                        (long) val, W83781D_DEFAULT_BETA);
                 break;
@@ -929,35 +921,85 @@ sysfs_sensor(1);
 sysfs_sensor(2);
 sysfs_sensor(3);
 
-static int __init w83627hf_find(int sioaddr, unsigned short *addr)
+static ssize_t show_name(struct device *dev, struct device_attribute
+                         *devattr, char *buf)
+{
+        struct w83627hf_data *data = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%s\n", data->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+
+static int __init w83627hf_find(int sioaddr, unsigned short *addr,
+                                struct w83627hf_sio_data *sio_data)
 {
+        int err = -ENODEV;
         u16 val;
 
+        static const __initdata char *names[] = {
+                "W83627HF",
+                "W83627THF",
+                "W83697HF",
+                "W83637HF",
+                "W83687THF",
+        };
+
         REG = sioaddr;
         VAL = sioaddr + 1;
 
         superio_enter();
         val= superio_inb(DEVID);
-        if(val != W627_DEVID &&
-           val != W627THF_DEVID &&
-           val != W697_DEVID &&
-           val != W637_DEVID &&
-           val != W687THF_DEVID) {
-                superio_exit();
-                return -ENODEV;
+        switch (val) {
+        case W627_DEVID:
+                sio_data->type = w83627hf;
+                break;
+        case W627THF_DEVID:
+                sio_data->type = w83627thf;
+                break;
+        case W697_DEVID:
+                sio_data->type = w83697hf;
+                break;
+        case W637_DEVID:
+                sio_data->type = w83637hf;
+                break;
+        case W687THF_DEVID:
+                sio_data->type = w83687thf;
+                break;
+        default:
+                pr_debug(DRVNAME ": Unsupported chip (DEVID=0x%x)\n", val);
+                goto exit;
         }
 
         superio_select(W83627HF_LD_HWM);
+        force_addr &= WINB_ALIGNMENT;
+        if (force_addr) {
+                printk(KERN_WARNING DRVNAME ": Forcing address 0x%x\n",
+                       force_addr);
+                superio_outb(WINB_BASE_REG, force_addr >> 8);
+                superio_outb(WINB_BASE_REG + 1, force_addr & 0xff);
+        }
         val = (superio_inb(WINB_BASE_REG) << 8) |
                superio_inb(WINB_BASE_REG + 1);
         *addr = val & WINB_ALIGNMENT;
-        if (*addr == 0 && force_addr == 0) {
-                superio_exit();
-                return -ENODEV;
+        if (*addr == 0) {
+                printk(KERN_WARNING DRVNAME ": Base address not set, "
+                       "skipping\n");
+                goto exit;
         }
 
+        val = superio_inb(WINB_ACT_REG);
+        if (!(val & 0x01)) {
+                printk(KERN_WARNING DRVNAME ": Enabling HWM logical device\n");
+                superio_outb(WINB_ACT_REG, val | 0x01);
+        }
+
+        err = 0;
+        pr_info(DRVNAME ": Found %s chip at %#x\n",
+                names[sio_data->type], *addr);
+
+ exit:
         superio_exit();
-        return 0;
+        return err;
 }
 
 static struct attribute *w83627hf_attributes[] = {
@@ -1003,6 +1045,7 @@ static struct attribute *w83627hf_attributes[] = {
         &dev_attr_pwm1.attr,
         &dev_attr_pwm2.attr,
 
+        &dev_attr_name.attr,
         NULL
 };
 
@@ -1039,161 +1082,92 @@ static const struct attribute_group w83627hf_group_opt = {
         .attrs = w83627hf_attributes_opt,
 };
 
-static int w83627hf_detect(struct i2c_adapter *adapter)
+static int __devinit w83627hf_probe(struct platform_device *pdev)
 {
-        int val, kind;
-        struct i2c_client *new_client;
+        struct device *dev = &pdev->dev;
+        struct w83627hf_sio_data *sio_data = dev->platform_data;
         struct w83627hf_data *data;
-        int err = 0;
-        const char *client_name = "";
-
-        if(force_addr)
-                address = force_addr & WINB_ALIGNMENT;
+        struct resource *res;
+        int err;
 
-        if (!request_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE,
-                            w83627hf_driver.driver.name)) {
+        static const char *names[] = {
+                "w83627hf",
+                "w83627thf",
+                "w83697hf",
+                "w83637hf",
+                "w83687thf",
+        };
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, WINB_REGION_SIZE, DRVNAME)) {
+                dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
+                        (unsigned long)res->start,
+                        (unsigned long)(res->start + WINB_REGION_SIZE - 1));
                 err = -EBUSY;
                 goto ERROR0;
         }
 
-        if(force_addr) {
-                printk("w83627hf.o: forcing ISA address 0x%04X\n", address);
-                superio_enter();
-                superio_select(W83627HF_LD_HWM);
-                superio_outb(WINB_BASE_REG, address >> 8);
-                superio_outb(WINB_BASE_REG+1, address & 0xff);
-                superio_exit();
-        }
-
-        superio_enter();
-        val= superio_inb(DEVID);
-        if(val == W627_DEVID)
-                kind = w83627hf;
-        else if(val == W697_DEVID)
-                kind = w83697hf;
-        else if(val == W627THF_DEVID)
-                kind = w83627thf;
-        else if(val == W637_DEVID)
-                kind = w83637hf;
-        else if (val == W687THF_DEVID)
-                kind = w83687thf;
-        else {
-                dev_info(&adapter->dev,
-                         "Unsupported chip (dev_id=0x%02X).\n", val);
-                goto ERROR1;
-        }
-
-        superio_select(W83627HF_LD_HWM);
-        if((val = 0x01 & superio_inb(WINB_ACT_REG)) == 0)
-                superio_outb(WINB_ACT_REG, 1);
-        superio_exit();
-
-        /* OK. For now, we presume we have a valid client. We now create the
-           client structure, even though we cannot fill it completely yet.
-           But it allows us to access w83627hf_{read,write}_value. */
-
         if (!(data = kzalloc(sizeof(struct w83627hf_data), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto ERROR1;
         }
-
-        new_client = &data->client;
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
+        data->addr = res->start;
+        data->type = sio_data->type;
+        data->name = names[sio_data->type];
         mutex_init(&data->lock);
-        new_client->adapter = adapter;
-        new_client->driver = &w83627hf_driver;
-        new_client->flags = 0;
-
-
-        if (kind == w83627hf) {
-                client_name = "w83627hf";
-        } else if (kind == w83627thf) {
-                client_name = "w83627thf";
-        } else if (kind == w83697hf) {
-                client_name = "w83697hf";
-        } else if (kind == w83637hf) {
-                client_name = "w83637hf";
-        } else if (kind == w83687thf) {
-                client_name = "w83687thf";
-        }
-
-        /* Fill in the remaining client fields and put into the global list */
-        strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
-        data->type = kind;
-        data->valid = 0;
         mutex_init(&data->update_lock);
-
-        /* Tell the I2C layer a new client has arrived */
-        if ((err = i2c_attach_client(new_client)))
-                goto ERROR2;
-
-        data->lm75 = NULL;
+        platform_set_drvdata(pdev, data);
 
         /* Initialize the chip */
-        w83627hf_init_client(new_client);
+        w83627hf_init_device(pdev);
 
         /* A few vars need to be filled upon startup */
-        data->fan_min[0] = w83627hf_read_value(new_client, W83781D_REG_FAN_MIN(1));
-        data->fan_min[1] = w83627hf_read_value(new_client, W83781D_REG_FAN_MIN(2));
-        data->fan_min[2] = w83627hf_read_value(new_client, W83781D_REG_FAN_MIN(3));
+        data->fan_min[0] = w83627hf_read_value(data, W83781D_REG_FAN_MIN(1));
+        data->fan_min[1] = w83627hf_read_value(data, W83781D_REG_FAN_MIN(2));
+        data->fan_min[2] = w83627hf_read_value(data, W83781D_REG_FAN_MIN(3));
 
         /* Register common device attributes */
-        if ((err = sysfs_create_group(&new_client->dev.kobj, &w83627hf_group)))
+        if ((err = sysfs_create_group(&dev->kobj, &w83627hf_group)))
                 goto ERROR3;
 
         /* Register chip-specific device attributes */
-        if (kind == w83627hf || kind == w83697hf)
-                if ((err = device_create_file(&new_client->dev,
-                                        &dev_attr_in5_input))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in5_min))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in5_max))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in6_input))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in6_min))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in6_max)))
+        if (data->type == w83627hf || data->type == w83697hf)
+                if ((err = device_create_file(dev, &dev_attr_in5_input))
+                 || (err = device_create_file(dev, &dev_attr_in5_min))
+                 || (err = device_create_file(dev, &dev_attr_in5_max))
+                 || (err = device_create_file(dev, &dev_attr_in6_input))
+                 || (err = device_create_file(dev, &dev_attr_in6_min))
+                 || (err = device_create_file(dev, &dev_attr_in6_max)))
                         goto ERROR4;
 
-        if (kind != w83697hf)
-                if ((err = device_create_file(&new_client->dev,
-                                        &dev_attr_in1_input))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in1_min))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_in1_max))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_fan3_input))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_fan3_min))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_fan3_div))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_temp3_input))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_temp3_max))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_temp3_max_hyst))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_temp3_type)))
+        if (data->type != w83697hf)
+                if ((err = device_create_file(dev, &dev_attr_in1_input))
+                 || (err = device_create_file(dev, &dev_attr_in1_min))
+                 || (err = device_create_file(dev, &dev_attr_in1_max))
+                 || (err = device_create_file(dev, &dev_attr_fan3_input))
+                 || (err = device_create_file(dev, &dev_attr_fan3_min))
+                 || (err = device_create_file(dev, &dev_attr_fan3_div))
+                 || (err = device_create_file(dev, &dev_attr_temp3_input))
+                 || (err = device_create_file(dev, &dev_attr_temp3_max))
+                 || (err = device_create_file(dev, &dev_attr_temp3_max_hyst))
+                 || (err = device_create_file(dev, &dev_attr_temp3_type)))
                         goto ERROR4;
 
-        if (kind != w83697hf && data->vid != 0xff)
-                if ((err = device_create_file(&new_client->dev,
-                                        &dev_attr_cpu0_vid))
-                 || (err = device_create_file(&new_client->dev,
-                                        &dev_attr_vrm)))
+        if (data->type != w83697hf && data->vid != 0xff) {
+                /* Convert VID to voltage based on VRM */
+                data->vrm = vid_which_vrm();
+
+                if ((err = device_create_file(dev, &dev_attr_cpu0_vid))
+                 || (err = device_create_file(dev, &dev_attr_vrm)))
                         goto ERROR4;
+        }
 
-        if (kind == w83627thf || kind == w83637hf || kind == w83687thf)
-                if ((err = device_create_file(&new_client->dev,
-                                        &dev_attr_pwm3)))
+        if (data->type == w83627thf || data->type == w83637hf
+         || data->type == w83687thf)
+                if ((err = device_create_file(dev, &dev_attr_pwm3)))
                         goto ERROR4;
 
-        data->class_dev = hwmon_device_register(&new_client->dev);
+        data->class_dev = hwmon_device_register(dev);
         if (IS_ERR(data->class_dev)) {
                 err = PTR_ERR(data->class_dev);
                 goto ERROR4;
@@ -1202,47 +1176,37 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
         return 0;
 
       ERROR4:
-        sysfs_remove_group(&new_client->dev.kobj, &w83627hf_group);
-        sysfs_remove_group(&new_client->dev.kobj, &w83627hf_group_opt);
+        sysfs_remove_group(&dev->kobj, &w83627hf_group);
+        sysfs_remove_group(&dev->kobj, &w83627hf_group_opt);
       ERROR3:
-        i2c_detach_client(new_client);
-      ERROR2:
         kfree(data);
       ERROR1:
-        release_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE);
+        release_region(res->start, WINB_REGION_SIZE);
       ERROR0:
         return err;
 }
 
-static int w83627hf_detach_client(struct i2c_client *client)
+static int __devexit w83627hf_remove(struct platform_device *pdev)
 {
-        struct w83627hf_data *data = i2c_get_clientdata(client);
-        int err;
+        struct w83627hf_data *data = platform_get_drvdata(pdev);
+        struct resource *res;
 
+        platform_set_drvdata(pdev, NULL);
         hwmon_device_unregister(data->class_dev);
 
-        sysfs_remove_group(&client->dev.kobj, &w83627hf_group);
-        sysfs_remove_group(&client->dev.kobj, &w83627hf_group_opt);
-
-        if ((err = i2c_detach_client(client)))
-                return err;
-
-        release_region(client->addr + WINB_REGION_OFFSET, WINB_REGION_SIZE);
+        sysfs_remove_group(&pdev->dev.kobj, &w83627hf_group);
+        sysfs_remove_group(&pdev->dev.kobj, &w83627hf_group_opt);
         kfree(data);
 
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(res->start, WINB_REGION_SIZE);
+
         return 0;
 }
 
 
-/*
-   ISA access must always be locked explicitly!
-   We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks,
-   would slow down the W83781D access and should not be necessary.
-   There are some ugly typecasts here, but the good news is - they should
-   nowhere else be necessary! */
-static int w83627hf_read_value(struct i2c_client *client, u16 reg)
+static int w83627hf_read_value(struct w83627hf_data *data, u16 reg)
 {
-        struct w83627hf_data *data = i2c_get_clientdata(client);
         int res, word_sized;
 
         mutex_lock(&data->lock);
@@ -1253,29 +1217,29 @@ static int w83627hf_read_value(struct i2c_client *client, u16 reg)
                    || ((reg & 0x00ff) == 0x55));
         if (reg & 0xff00) {
                 outb_p(W83781D_REG_BANK,
-                       client->addr + W83781D_ADDR_REG_OFFSET);
+                       data->addr + W83781D_ADDR_REG_OFFSET);
                 outb_p(reg >> 8,
-                       client->addr + W83781D_DATA_REG_OFFSET);
+                       data->addr + W83781D_DATA_REG_OFFSET);
         }
-        outb_p(reg & 0xff, client->addr + W83781D_ADDR_REG_OFFSET);
-        res = inb_p(client->addr + W83781D_DATA_REG_OFFSET);
+        outb_p(reg & 0xff, data->addr + W83781D_ADDR_REG_OFFSET);
+        res = inb_p(data->addr + W83781D_DATA_REG_OFFSET);
         if (word_sized) {
                 outb_p((reg & 0xff) + 1,
-                       client->addr + W83781D_ADDR_REG_OFFSET);
+                       data->addr + W83781D_ADDR_REG_OFFSET);
                 res =
-                    (res << 8) + inb_p(client->addr +
+                    (res << 8) + inb_p(data->addr +
                                        W83781D_DATA_REG_OFFSET);
         }
         if (reg & 0xff00) {
                 outb_p(W83781D_REG_BANK,
-                       client->addr + W83781D_ADDR_REG_OFFSET);
-                outb_p(0, client->addr + W83781D_DATA_REG_OFFSET);
+                       data->addr + W83781D_ADDR_REG_OFFSET);
+                outb_p(0, data->addr + W83781D_DATA_REG_OFFSET);
         }
         mutex_unlock(&data->lock);
         return res;
 }
 
-static int w83627thf_read_gpio5(struct i2c_client *client)
+static int __devinit w83627thf_read_gpio5(struct platform_device *pdev)
 {
         int res = 0xff, sel;
 
@@ -1284,7 +1248,7 @@ static int w83627thf_read_gpio5(struct i2c_client *client)
 
         /* Make sure these GPIO pins are enabled */
         if (!(superio_inb(W83627THF_GPIO5_EN) & (1<<3))) {
-                dev_dbg(&client->dev, "GPIO5 disabled, no VID function\n");
+                dev_dbg(&pdev->dev, "GPIO5 disabled, no VID function\n");
                 goto exit;
         }
 
@@ -1292,12 +1256,12 @@ static int w83627thf_read_gpio5(struct i2c_client *client)
            There must be at least five (VRM 9), and possibly 6 (VRM 10) */
         sel = superio_inb(W83627THF_GPIO5_IOSR) & 0x3f;
         if ((sel & 0x1f) != 0x1f) {
-                dev_dbg(&client->dev, "GPIO5 not configured for VID "
+                dev_dbg(&pdev->dev, "GPIO5 not configured for VID "
                         "function\n");
                 goto exit;
         }
 
-        dev_info(&client->dev, "Reading VID from GPIO5\n");
+        dev_info(&pdev->dev, "Reading VID from GPIO5\n");
         res = superio_inb(W83627THF_GPIO5_DR) & sel;
 
 exit:
@@ -1305,7 +1269,7 @@ exit:
         return res;
 }
 
-static int w83687thf_read_vid(struct i2c_client *client)
+static int __devinit w83687thf_read_vid(struct platform_device *pdev)
 {
         int res = 0xff;
 
@@ -1314,13 +1278,13 @@ static int w83687thf_read_vid(struct i2c_client *client)
 
         /* Make sure these GPIO pins are enabled */
         if (!(superio_inb(W83687THF_VID_EN) & (1 << 2))) {
-                dev_dbg(&client->dev, "VID disabled, no VID function\n");
+                dev_dbg(&pdev->dev, "VID disabled, no VID function\n");
                 goto exit;
         }
 
         /* Make sure the pins are configured for input */
         if (!(superio_inb(W83687THF_VID_CFG) & (1 << 4))) {
-                dev_dbg(&client->dev, "VID configured as output, "
+                dev_dbg(&pdev->dev, "VID configured as output, "
                         "no VID function\n");
                 goto exit;
         }
@@ -1332,9 +1296,8 @@ exit:
         return res;
 }
 
-static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value)
+static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value)
 {
-        struct w83627hf_data *data = i2c_get_clientdata(client);
         int word_sized;
 
         mutex_lock(&data->lock);
@@ -1344,33 +1307,33 @@ static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value)
                    || ((reg & 0x00ff) == 0x55));
         if (reg & 0xff00) {
                 outb_p(W83781D_REG_BANK,
-                       client->addr + W83781D_ADDR_REG_OFFSET);
+                       data->addr + W83781D_ADDR_REG_OFFSET);
                 outb_p(reg >> 8,
-                       client->addr + W83781D_DATA_REG_OFFSET);
+                       data->addr + W83781D_DATA_REG_OFFSET);
         }
-        outb_p(reg & 0xff, client->addr + W83781D_ADDR_REG_OFFSET);
+        outb_p(reg & 0xff, data->addr + W83781D_ADDR_REG_OFFSET);
         if (word_sized) {
                 outb_p(value >> 8,
-                       client->addr + W83781D_DATA_REG_OFFSET);
+                       data->addr + W83781D_DATA_REG_OFFSET);
                 outb_p((reg & 0xff) + 1,
-                       client->addr + W83781D_ADDR_REG_OFFSET);
+                       data->addr + W83781D_ADDR_REG_OFFSET);
         }
         outb_p(value & 0xff,
-               client->addr + W83781D_DATA_REG_OFFSET);
+               data->addr + W83781D_DATA_REG_OFFSET);
         if (reg & 0xff00) {
                 outb_p(W83781D_REG_BANK,
-                       client->addr + W83781D_ADDR_REG_OFFSET);
-                outb_p(0, client->addr + W83781D_DATA_REG_OFFSET);
+                       data->addr + W83781D_ADDR_REG_OFFSET);
+                outb_p(0, data->addr + W83781D_DATA_REG_OFFSET);
         }
         mutex_unlock(&data->lock);
         return 0;
 }
 
-static void w83627hf_init_client(struct i2c_client *client)
+static void __devinit w83627hf_init_device(struct platform_device *pdev)
 {
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = platform_get_drvdata(pdev);
         int i;
-        int type = data->type;
+        enum chips type = data->type;
         u8 tmp;
 
         if (reset) {
@@ -1379,57 +1342,53 @@ static void w83627hf_init_client(struct i2c_client *client)
                    speed...) so it is now optional. It might even go away if
                    nobody reports it as being useful, as I see very little
                    reason why this would be needed at all. */
-                dev_info(&client->dev, "If reset=1 solved a problem you were "
+                dev_info(&pdev->dev, "If reset=1 solved a problem you were "
                          "having, please report!\n");
 
                 /* save this register */
-                i = w83627hf_read_value(client, W83781D_REG_BEEP_CONFIG);
+                i = w83627hf_read_value(data, W83781D_REG_BEEP_CONFIG);
                 /* Reset all except Watchdog values and last conversion values
                    This sets fan-divs to 2, among others */
-                w83627hf_write_value(client, W83781D_REG_CONFIG, 0x80);
+                w83627hf_write_value(data, W83781D_REG_CONFIG, 0x80);
                 /* Restore the register and disable power-on abnormal beep.
                    This saves FAN 1/2/3 input/output values set by BIOS. */
-                w83627hf_write_value(client, W83781D_REG_BEEP_CONFIG, i | 0x80);
+                w83627hf_write_value(data, W83781D_REG_BEEP_CONFIG, i | 0x80);
                 /* Disable master beep-enable (reset turns it on).
                    Individual beeps should be reset to off but for some reason
                    disabling this bit helps some people not get beeped */
-                w83627hf_write_value(client, W83781D_REG_BEEP_INTS2, 0);
+                w83627hf_write_value(data, W83781D_REG_BEEP_INTS2, 0);
         }
 
         /* Minimize conflicts with other winbond i2c-only clients...  */
         /* disable i2c subclients... how to disable main i2c client?? */
         /* force i2c address to relatively uncommon address */
-        w83627hf_write_value(client, W83781D_REG_I2C_SUBADDR, 0x89);
-        w83627hf_write_value(client, W83781D_REG_I2C_ADDR, force_i2c);
+        w83627hf_write_value(data, W83781D_REG_I2C_SUBADDR, 0x89);
+        w83627hf_write_value(data, W83781D_REG_I2C_ADDR, force_i2c);
 
         /* Read VID only once */
-        if (w83627hf == data->type || w83637hf == data->type) {
-                int lo = w83627hf_read_value(client, W83781D_REG_VID_FANDIV);
-                int hi = w83627hf_read_value(client, W83781D_REG_CHIPID);
+        if (type == w83627hf || type == w83637hf) {
+                int lo = w83627hf_read_value(data, W83781D_REG_VID_FANDIV);
+                int hi = w83627hf_read_value(data, W83781D_REG_CHIPID);
                 data->vid = (lo & 0x0f) | ((hi & 0x01) << 4);
-        } else if (w83627thf == data->type) {
-                data->vid = w83627thf_read_gpio5(client);
-        } else if (w83687thf == data->type) {
-                data->vid = w83687thf_read_vid(client);
+        } else if (type == w83627thf) {
+                data->vid = w83627thf_read_gpio5(pdev);
+        } else if (type == w83687thf) {
+                data->vid = w83687thf_read_vid(pdev);
         }
 
         /* Read VRM & OVT Config only once */
-        if (w83627thf == data->type || w83637hf == data->type
-         || w83687thf == data->type) {
+        if (type == w83627thf || type == w83637hf || type == w83687thf) {
                 data->vrm_ovt = 
-                        w83627hf_read_value(client, W83627THF_REG_VRM_OVT_CFG);
+                        w83627hf_read_value(data, W83627THF_REG_VRM_OVT_CFG);
         }
 
-        /* Convert VID to voltage based on VRM */
-        data->vrm = vid_which_vrm();
-
-        tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
+        tmp = w83627hf_read_value(data, W83781D_REG_SCFG1);
         for (i = 1; i <= 3; i++) {
                 if (!(tmp & BIT_SCFG1[i - 1])) {
                         data->sens[i - 1] = W83781D_DEFAULT_BETA;
                 } else {
                         if (w83627hf_read_value
-                            (client,
+                            (data,
                              W83781D_REG_SCFG2) & BIT_SCFG2[i - 1])
                                 data->sens[i - 1] = 1;
                         else
@@ -1441,38 +1400,37 @@ static void w83627hf_init_client(struct i2c_client *client)
 
         if(init) {
                 /* Enable temp2 */
-                tmp = w83627hf_read_value(client, W83781D_REG_TEMP2_CONFIG);
+                tmp = w83627hf_read_value(data, W83781D_REG_TEMP2_CONFIG);
                 if (tmp & 0x01) {
-                        dev_warn(&client->dev, "Enabling temp2, readings "
+                        dev_warn(&pdev->dev, "Enabling temp2, readings "
                                  "might not make sense\n");
-                        w83627hf_write_value(client, W83781D_REG_TEMP2_CONFIG,
+                        w83627hf_write_value(data, W83781D_REG_TEMP2_CONFIG,
                                 tmp & 0xfe);
                 }
 
                 /* Enable temp3 */
                 if (type != w83697hf) {
-                        tmp = w83627hf_read_value(client,
+                        tmp = w83627hf_read_value(data,
                                 W83781D_REG_TEMP3_CONFIG);
                         if (tmp & 0x01) {
-                                dev_warn(&client->dev, "Enabling temp3, "
+                                dev_warn(&pdev->dev, "Enabling temp3, "
                                          "readings might not make sense\n");
-                                w83627hf_write_value(client,
+                                w83627hf_write_value(data,
                                         W83781D_REG_TEMP3_CONFIG, tmp & 0xfe);
                         }
                 }
         }
 
         /* Start monitoring */
-        w83627hf_write_value(client, W83781D_REG_CONFIG,
-                            (w83627hf_read_value(client,
+        w83627hf_write_value(data, W83781D_REG_CONFIG,
+                            (w83627hf_read_value(data,
                                                 W83781D_REG_CONFIG) & 0xf7)
                             | 0x01);
 }
 
 static struct w83627hf_data *w83627hf_update_device(struct device *dev)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83627hf_data *data = i2c_get_clientdata(client);
+        struct w83627hf_data *data = dev_get_drvdata(dev);
         int i;
 
         mutex_lock(&data->update_lock);
@@ -1486,23 +1444,23 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
                             && (i == 5 || i == 6)))
                                 continue;
                         data->in[i] =
-                            w83627hf_read_value(client, W83781D_REG_IN(i));
+                            w83627hf_read_value(data, W83781D_REG_IN(i));
                         data->in_min[i] =
-                            w83627hf_read_value(client,
+                            w83627hf_read_value(data,
                                                W83781D_REG_IN_MIN(i));
                         data->in_max[i] =
-                            w83627hf_read_value(client,
+                            w83627hf_read_value(data,
                                                W83781D_REG_IN_MAX(i));
                 }
                 for (i = 1; i <= 3; i++) {
                         data->fan[i - 1] =
-                            w83627hf_read_value(client, W83781D_REG_FAN(i));
+                            w83627hf_read_value(data, W83781D_REG_FAN(i));
                         data->fan_min[i - 1] =
-                            w83627hf_read_value(client,
+                            w83627hf_read_value(data,
                                                W83781D_REG_FAN_MIN(i));
                 }
                 for (i = 1; i <= 3; i++) {
-                        u8 tmp = w83627hf_read_value(client,
+                        u8 tmp = w83627hf_read_value(data,
                                 W836X7HF_REG_PWM(data->type, i));
                         /* bits 0-3 are reserved  in 627THF */
                         if (data->type == w83627thf)
@@ -1513,47 +1471,47 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
                                 break;
                 }
 
-                data->temp = w83627hf_read_value(client, W83781D_REG_TEMP(1));
+                data->temp = w83627hf_read_value(data, W83781D_REG_TEMP(1));
                 data->temp_max =
-                    w83627hf_read_value(client, W83781D_REG_TEMP_OVER(1));
+                    w83627hf_read_value(data, W83781D_REG_TEMP_OVER(1));
                 data->temp_max_hyst =
-                    w83627hf_read_value(client, W83781D_REG_TEMP_HYST(1));
+                    w83627hf_read_value(data, W83781D_REG_TEMP_HYST(1));
                 data->temp_add[0] =
-                    w83627hf_read_value(client, W83781D_REG_TEMP(2));
+                    w83627hf_read_value(data, W83781D_REG_TEMP(2));
                 data->temp_max_add[0] =
-                    w83627hf_read_value(client, W83781D_REG_TEMP_OVER(2));
+                    w83627hf_read_value(data, W83781D_REG_TEMP_OVER(2));
                 data->temp_max_hyst_add[0] =
-                    w83627hf_read_value(client, W83781D_REG_TEMP_HYST(2));
+                    w83627hf_read_value(data, W83781D_REG_TEMP_HYST(2));
                 if (data->type != w83697hf) {
                         data->temp_add[1] =
-                          w83627hf_read_value(client, W83781D_REG_TEMP(3));
+                          w83627hf_read_value(data, W83781D_REG_TEMP(3));
                         data->temp_max_add[1] =
-                          w83627hf_read_value(client, W83781D_REG_TEMP_OVER(3));
+                          w83627hf_read_value(data, W83781D_REG_TEMP_OVER(3));
                         data->temp_max_hyst_add[1] =
-                          w83627hf_read_value(client, W83781D_REG_TEMP_HYST(3));
+                          w83627hf_read_value(data, W83781D_REG_TEMP_HYST(3));
                 }
 
-                i = w83627hf_read_value(client, W83781D_REG_VID_FANDIV);
+                i = w83627hf_read_value(data, W83781D_REG_VID_FANDIV);
                 data->fan_div[0] = (i >> 4) & 0x03;
                 data->fan_div[1] = (i >> 6) & 0x03;
                 if (data->type != w83697hf) {
-                        data->fan_div[2] = (w83627hf_read_value(client,
+                        data->fan_div[2] = (w83627hf_read_value(data,
                                                W83781D_REG_PIN) >> 6) & 0x03;
                 }
-                i = w83627hf_read_value(client, W83781D_REG_VBAT);
+                i = w83627hf_read_value(data, W83781D_REG_VBAT);
                 data->fan_div[0] |= (i >> 3) & 0x04;
                 data->fan_div[1] |= (i >> 4) & 0x04;
                 if (data->type != w83697hf)
                         data->fan_div[2] |= (i >> 5) & 0x04;
                 data->alarms =
-                    w83627hf_read_value(client, W83781D_REG_ALARM1) |
-                    (w83627hf_read_value(client, W83781D_REG_ALARM2) << 8) |
-                    (w83627hf_read_value(client, W83781D_REG_ALARM3) << 16);
-                i = w83627hf_read_value(client, W83781D_REG_BEEP_INTS2);
+                    w83627hf_read_value(data, W83781D_REG_ALARM1) |
+                    (w83627hf_read_value(data, W83781D_REG_ALARM2) << 8) |
+                    (w83627hf_read_value(data, W83781D_REG_ALARM3) << 16);
+                i = w83627hf_read_value(data, W83781D_REG_BEEP_INTS2);
                 data->beep_enable = i >> 7;
                 data->beep_mask = ((i & 0x7f) << 8) |
-                    w83627hf_read_value(client, W83781D_REG_BEEP_INTS1) |
-                    w83627hf_read_value(client, W83781D_REG_BEEP_INTS3) << 16;
+                    w83627hf_read_value(data, W83781D_REG_BEEP_INTS1) |
+                    w83627hf_read_value(data, W83781D_REG_BEEP_INTS3) << 16;
                 data->last_updated = jiffies;
                 data->valid = 1;
         }
@@ -1563,19 +1521,87 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
         return data;
 }
 
+static int __init w83627hf_device_add(unsigned short address,
+                                      const struct w83627hf_sio_data *sio_data)
+{
+        struct resource res = {
+                .start  = address + WINB_REGION_OFFSET,
+                .end    = address + WINB_REGION_OFFSET + WINB_REGION_SIZE - 1,
+                .name   = DRVNAME,
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc(DRVNAME, address);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        pdev->dev.platform_data = kmalloc(sizeof(struct w83627hf_sio_data),
+                                          GFP_KERNEL);
+        if (!pdev->dev.platform_data) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
+                goto exit_device_put;
+        }
+        memcpy(pdev->dev.platform_data, sio_data,
+               sizeof(struct w83627hf_sio_data));
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+exit_device_put:
+        platform_device_put(pdev);
+exit:
+        return err;
+}
+
 static int __init sensors_w83627hf_init(void)
 {
-        if (w83627hf_find(0x2e, &address)
-         && w83627hf_find(0x4e, &address)) {
+        int err;
+        unsigned short address;
+        struct w83627hf_sio_data sio_data;
+
+        if (w83627hf_find(0x2e, &address, &sio_data)
+         && w83627hf_find(0x4e, &address, &sio_data))
                 return -ENODEV;
-        }
 
-        return i2c_isa_add_driver(&w83627hf_driver);
+        err = platform_driver_register(&w83627hf_driver);
+        if (err)
+                goto exit;
+
+        /* Sets global pdev as a side effect */
+        err = w83627hf_device_add(address, &sio_data);
+        if (err)
+                goto exit_driver;
+
+        return 0;
+
+exit_driver:
+        platform_driver_unregister(&w83627hf_driver);
+exit:
+        return err;
 }
 
 static void __exit sensors_w83627hf_exit(void)
 {
-        i2c_isa_del_driver(&w83627hf_driver);
+        platform_device_unregister(pdev);
+        platform_driver_unregister(&w83627hf_driver);
 }
 
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index a47da3ec5472..f85b48fea1c4 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -2,8 +2,9 @@
     w83781d.c - Part of lm_sensors, Linux kernel modules for hardware
                 monitoring
     Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>,
-    Philip Edelbrock <phil@netroedge.com>,
-    and Mark Studebaker <mdsxyz123@yahoo.com>
+                               Philip Edelbrock <phil@netroedge.com>,
+                               and Mark Studebaker <mdsxyz123@yahoo.com>
+    Copyright (c) 2007         Jean Delvare <khali@linux-fr.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
@@ -38,15 +39,20 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
+#include <linux/ioport.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-vid.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <asm/io.h>
 #include "lm75.h"
 
+/* ISA device, if found */
+static struct platform_device *pdev;
+
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
                                         0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
@@ -75,8 +81,8 @@ MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
 #define W83781D_ADDR_REG_OFFSET         5
 #define W83781D_DATA_REG_OFFSET         6
 
-/* The W83781D registers */
-/* The W83782D registers for nr=7,8 are in bank 5 */
+/* The device registers */
+/* in nr from 0 to 8 */
 #define W83781D_REG_IN_MAX(nr)          ((nr < 7) ? (0x2b + (nr) * 2) : \
                                                     (0x554 + (((nr) - 7) * 2)))
 #define W83781D_REG_IN_MIN(nr)          ((nr < 7) ? (0x2c + (nr) * 2) : \
@@ -84,12 +90,14 @@ MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
 #define W83781D_REG_IN(nr)              ((nr < 7) ? (0x20 + (nr)) : \
                                                     (0x550 + (nr) - 7))
 
-#define W83781D_REG_FAN_MIN(nr)         (0x3a + (nr))
-#define W83781D_REG_FAN(nr)             (0x27 + (nr))
+/* fan nr from 0 to 2 */
+#define W83781D_REG_FAN_MIN(nr)         (0x3b + (nr))
+#define W83781D_REG_FAN(nr)             (0x28 + (nr))
 
 #define W83781D_REG_BANK                0x4E
 #define W83781D_REG_TEMP2_CONFIG        0x152
 #define W83781D_REG_TEMP3_CONFIG        0x252
+/* temp nr from 1 to 3 */
 #define W83781D_REG_TEMP(nr)            ((nr == 3) ? (0x0250) : \
                                         ((nr == 2) ? (0x0150) : \
                                                      (0x27)))
@@ -127,19 +135,9 @@ MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
 #define W83781D_REG_VBAT                0x5D
 
 /* PWM 782D (1-4) and 783S (1-2) only */
-#define W83781D_REG_PWM1                0x5B    /* 782d and 783s/627hf datasheets disagree */
-                                                /* on which is which; */
-#define W83781D_REG_PWM2                0x5A    /* We follow the 782d convention here, */
-                                                /* However 782d is probably wrong. */
-#define W83781D_REG_PWM3                0x5E
-#define W83781D_REG_PWM4                0x5F
+static const u8 W83781D_REG_PWM[] = { 0x5B, 0x5A, 0x5E, 0x5F };
 #define W83781D_REG_PWMCLK12            0x5C
 #define W83781D_REG_PWMCLK34            0x45C
-static const u8 regpwm[] = { W83781D_REG_PWM1, W83781D_REG_PWM2,
-        W83781D_REG_PWM3, W83781D_REG_PWM4
-};
-
-#define W83781D_REG_PWM(nr)             (regpwm[(nr) - 1])
 
 #define W83781D_REG_I2C_ADDR            0x48
 #define W83781D_REG_I2C_SUBADDR         0x4A
@@ -159,12 +157,9 @@ static const u8 BIT_SCFG2[] = { 0x10, 0x20, 0x40 };
 #define W83781D_REG_RT_IDX              0x50
 #define W83781D_REG_RT_VAL              0x51
 
-/* Conversions. Rounding and limit checking is only done on the TO_REG
-   variants. Note that you should be a bit careful with which arguments
-   these macros are called: arguments may be evaluated more than once.
-   Fixing this is just not worth it. */
-#define IN_TO_REG(val)                  (SENSORS_LIMIT((((val) * 10 + 8)/16),0,255))
-#define IN_FROM_REG(val)                (((val) * 16) / 10)
+/* Conversions */
+#define IN_TO_REG(val)                  SENSORS_LIMIT(((val) + 8) / 16, 0, 255)
+#define IN_FROM_REG(val)                ((val) * 16)
 
 static inline u8
 FAN_TO_REG(long rpm, int div)
@@ -175,24 +170,24 @@ FAN_TO_REG(long rpm, int div)
         return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
 }
 
-#define FAN_FROM_REG(val,div)           ((val) == 0   ? -1 : \
-                                        ((val) == 255 ? 0 : \
-                                                        1350000 / ((val) * (div))))
+static inline long
+FAN_FROM_REG(u8 val, int div)
+{
+        if (val == 0)
+                return -1;
+        if (val == 255)
+                return 0;
+        return 1350000 / (val * div);
+}
 
-#define TEMP_TO_REG(val)                (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
-                                                : (val)) / 1000, 0, 0xff))
-#define TEMP_FROM_REG(val)              (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
+#define TEMP_TO_REG(val)                SENSORS_LIMIT((val) / 1000, -127, 128)
+#define TEMP_FROM_REG(val)              ((val) * 1000)
 
-#define PWM_FROM_REG(val)               (val)
-#define PWM_TO_REG(val)                 (SENSORS_LIMIT((val),0,255))
 #define BEEP_MASK_FROM_REG(val,type)    ((type) == as99127f ? \
                                          (val) ^ 0x7fff : (val))
 #define BEEP_MASK_TO_REG(val,type)      ((type) == as99127f ? \
                                          (~(val)) & 0x7fff : (val) & 0xffffff)
 
-#define BEEP_ENABLE_TO_REG(val)         ((val) ? 1 : 0)
-#define BEEP_ENABLE_FROM_REG(val)       ((val) ? 1 : 0)
-
 #define DIV_FROM_REG(val)               (1 << (val))
 
 static inline u8
@@ -207,7 +202,7 @@ DIV_TO_REG(long val, enum chips type)
                         break;
                 val >>= 1;
         }
-        return ((u8) i);
+        return i;
 }
 
 /* There are some complications in a module like this. First off, W83781D chips
@@ -221,8 +216,8 @@ DIV_TO_REG(long val, enum chips type)
    a bit - except if there could be more than one SMBus. Groan. No solution
    for this yet. */
 
-/* For each registered chip, we need to keep some data in memory.
-   The structure is dynamically allocated. */
+/* For ISA chips, we abuse the i2c_client addr and name fields. We also use
+   the driver field to differentiate between I2C and ISA chips. */
 struct w83781d_data {
         struct i2c_client client;
         struct class_device *class_dev;
@@ -241,9 +236,9 @@ struct w83781d_data {
         u8 in_min[9];           /* Register value - 8 & 9 for 782D only */
         u8 fan[3];              /* Register value */
         u8 fan_min[3];          /* Register value */
-        u8 temp;
-        u8 temp_max;            /* Register value */
-        u8 temp_max_hyst;       /* Register value */
+        s8 temp;                /* Register value */
+        s8 temp_max;            /* Register value */
+        s8 temp_max_hyst;       /* Register value */
         u16 temp_add[2];        /* Register value */
         u16 temp_max_add[2];    /* Register value */
         u16 temp_max_hyst_add[2];       /* Register value */
@@ -253,7 +248,7 @@ struct w83781d_data {
         u32 beep_mask;          /* Register encoding, combined */
         u8 beep_enable;         /* Boolean */
         u8 pwm[4];              /* Register value */
-        u8 pwmenable[4];        /* Boolean */
+        u8 pwm2_enable;         /* Boolean */
         u16 sens[3];            /* 782D/783S only.
                                    1 = pentium diode; 2 = 3904 diode;
                                    3000-5000 = thermistor beta.
@@ -263,14 +258,16 @@ struct w83781d_data {
 };
 
 static int w83781d_attach_adapter(struct i2c_adapter *adapter);
-static int w83781d_isa_attach_adapter(struct i2c_adapter *adapter);
 static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83781d_detach_client(struct i2c_client *client);
 
-static int w83781d_read_value(struct i2c_client *client, u16 reg);
-static int w83781d_write_value(struct i2c_client *client, u16 reg, u16 value);
+static int __devinit w83781d_isa_probe(struct platform_device *pdev);
+static int __devexit w83781d_isa_remove(struct platform_device *pdev);
+
+static int w83781d_read_value(struct w83781d_data *data, u16 reg);
+static int w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value);
 static struct w83781d_data *w83781d_update_device(struct device *dev);
-static void w83781d_init_client(struct i2c_client *client);
+static void w83781d_init_device(struct device *dev);
 
 static struct i2c_driver w83781d_driver = {
         .driver = {
@@ -281,39 +278,44 @@ static struct i2c_driver w83781d_driver = {
         .detach_client = w83781d_detach_client,
 };
 
-static struct i2c_driver w83781d_isa_driver = {
+static struct platform_driver w83781d_isa_driver = {
         .driver = {
                 .owner = THIS_MODULE,
-                .name = "w83781d-isa",
+                .name = "w83781d",
         },
-        .attach_adapter = w83781d_isa_attach_adapter,
-        .detach_client = w83781d_detach_client,
+        .probe = w83781d_isa_probe,
+        .remove = w83781d_isa_remove,
 };
 
 
 /* following are the sysfs callback functions */
 #define show_in_reg(reg) \
-static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
+static ssize_t show_##reg (struct device *dev, struct device_attribute *da, \
+                char *buf) \
 { \
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da); \
         struct w83781d_data *data = w83781d_update_device(dev); \
-        return sprintf(buf,"%ld\n", (long)IN_FROM_REG(data->reg[nr] * 10)); \
+        return sprintf(buf, "%ld\n", \
+                       (long)IN_FROM_REG(data->reg[attr->index])); \
 }
 show_in_reg(in);
 show_in_reg(in_min);
 show_in_reg(in_max);
 
 #define store_in_reg(REG, reg) \
-static ssize_t store_in_##reg (struct device *dev, const char *buf, size_t count, int nr) \
+static ssize_t store_in_##reg (struct device *dev, struct device_attribute \
+                *da, const char *buf, size_t count) \
 { \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct w83781d_data *data = i2c_get_clientdata(client); \
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da); \
+        struct w83781d_data *data = dev_get_drvdata(dev); \
+        int nr = attr->index; \
         u32 val; \
          \
-        val = simple_strtoul(buf, NULL, 10) / 10; \
+        val = simple_strtoul(buf, NULL, 10); \
          \
         mutex_lock(&data->update_lock); \
         data->in_##reg[nr] = IN_TO_REG(val); \
-        w83781d_write_value(client, W83781D_REG_IN_##REG(nr), data->in_##reg[nr]); \
+        w83781d_write_value(data, W83781D_REG_IN_##REG(nr), data->in_##reg[nr]); \
          \
         mutex_unlock(&data->update_lock); \
         return count; \
@@ -321,29 +323,13 @@ static ssize_t store_in_##reg (struct device *dev, const char *buf, size_t count
 store_in_reg(MIN, min);
 store_in_reg(MAX, max);
 
-#define sysfs_in_offset(offset) \
-static ssize_t \
-show_regs_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_in(dev, buf, offset); \
-} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);
-
-#define sysfs_in_reg_offset(reg, offset) \
-static ssize_t show_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_in_##reg (dev, buf, offset); \
-} \
-static ssize_t store_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        return store_in_##reg (dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_in_##reg##offset, store_regs_in_##reg##offset);
-
 #define sysfs_in_offsets(offset) \
-sysfs_in_offset(offset); \
-sysfs_in_reg_offset(min, offset); \
-sysfs_in_reg_offset(max, offset);
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \
+                show_in, NULL, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
+                show_in_min, store_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
+                show_in_max, store_in_max, offset)
 
 sysfs_in_offsets(0);
 sysfs_in_offsets(1);
@@ -356,63 +342,56 @@ sysfs_in_offsets(7);
 sysfs_in_offsets(8);
 
 #define show_fan_reg(reg) \
-static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
+static ssize_t show_##reg (struct device *dev, struct device_attribute *da, \
+                char *buf) \
 { \
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da); \
         struct w83781d_data *data = w83781d_update_device(dev); \
         return sprintf(buf,"%ld\n", \
-                FAN_FROM_REG(data->reg[nr-1], (long)DIV_FROM_REG(data->fan_div[nr-1]))); \
+                FAN_FROM_REG(data->reg[attr->index], \
+                        DIV_FROM_REG(data->fan_div[attr->index]))); \
 }
 show_fan_reg(fan);
 show_fan_reg(fan_min);
 
 static ssize_t
-store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
+store_fan_min(struct device *dev, struct device_attribute *da,
+                const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->fan_min[nr - 1] =
-            FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr - 1]));
-        w83781d_write_value(client, W83781D_REG_FAN_MIN(nr),
-                            data->fan_min[nr - 1]);
+        data->fan_min[nr] =
+            FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
+        w83781d_write_value(data, W83781D_REG_FAN_MIN(nr),
+                            data->fan_min[nr]);
 
         mutex_unlock(&data->update_lock);
         return count;
 }
 
-#define sysfs_fan_offset(offset) \
-static ssize_t show_regs_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan(dev, buf, offset); \
-} \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);
-
-#define sysfs_fan_min_offset(offset) \
-static ssize_t show_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan_min(dev, buf, offset); \
-} \
-static ssize_t store_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        return store_fan_min(dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, show_regs_fan_min##offset, store_regs_fan_min##offset);
-
-sysfs_fan_offset(1);
-sysfs_fan_min_offset(1);
-sysfs_fan_offset(2);
-sysfs_fan_min_offset(2);
-sysfs_fan_offset(3);
-sysfs_fan_min_offset(3);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO | S_IWUSR,
+                show_fan_min, store_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO | S_IWUSR,
+                show_fan_min, store_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan3_min, S_IRUGO | S_IWUSR,
+                show_fan_min, store_fan_min, 2);
 
 #define show_temp_reg(reg) \
-static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
+static ssize_t show_##reg (struct device *dev, struct device_attribute *da, \
+                char *buf) \
 { \
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da); \
         struct w83781d_data *data = w83781d_update_device(dev); \
+        int nr = attr->index; \
         if (nr >= 2) {  /* TEMP2 and TEMP3 */ \
                 return sprintf(buf,"%d\n", \
                         LM75_TEMP_FROM_REG(data->reg##_add[nr-2])); \
@@ -425,10 +404,12 @@ show_temp_reg(temp_max);
 show_temp_reg(temp_max_hyst);
 
 #define store_temp_reg(REG, reg) \
-static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \
+static ssize_t store_temp_##reg (struct device *dev, \
+                struct device_attribute *da, const char *buf, size_t count) \
 { \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct w83781d_data *data = i2c_get_clientdata(client); \
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da); \
+        struct w83781d_data *data = dev_get_drvdata(dev); \
+        int nr = attr->index; \
         s32 val; \
          \
         val = simple_strtol(buf, NULL, 10); \
@@ -437,11 +418,11 @@ static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t cou
          \
         if (nr >= 2) {  /* TEMP2 and TEMP3 */ \
                 data->temp_##reg##_add[nr-2] = LM75_TEMP_TO_REG(val); \
-                w83781d_write_value(client, W83781D_REG_TEMP_##REG(nr), \
+                w83781d_write_value(data, W83781D_REG_TEMP_##REG(nr), \
                                 data->temp_##reg##_add[nr-2]); \
         } else {        /* TEMP1 */ \
                 data->temp_##reg = TEMP_TO_REG(val); \
-                w83781d_write_value(client, W83781D_REG_TEMP_##REG(nr), \
+                w83781d_write_value(data, W83781D_REG_TEMP_##REG(nr), \
                         data->temp_##reg); \
         } \
          \
@@ -451,29 +432,13 @@ static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t cou
 store_temp_reg(OVER, max);
 store_temp_reg(HYST, max_hyst);
 
-#define sysfs_temp_offset(offset) \
-static ssize_t \
-show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_temp(dev, buf, offset); \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);
-
-#define sysfs_temp_reg_offset(reg, offset) \
-static ssize_t show_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_temp_##reg (dev, buf, offset); \
-} \
-static ssize_t store_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        return store_temp_##reg (dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_temp_##reg##offset, store_regs_temp_##reg##offset);
-
 #define sysfs_temp_offsets(offset) \
-sysfs_temp_offset(offset); \
-sysfs_temp_reg_offset(max, offset); \
-sysfs_temp_reg_offset(max_hyst, offset);
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+                show_temp, NULL, offset); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \
+                show_temp_max, store_temp_max, offset); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR, \
+                show_temp_max_hyst, store_temp_max_hyst, offset);
 
 sysfs_temp_offsets(1);
 sysfs_temp_offsets(2);
@@ -498,8 +463,7 @@ show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 static ssize_t
 store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct w83781d_data *data = dev_get_drvdata(dev);
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -528,68 +492,67 @@ static ssize_t show_beep_mask (struct device *dev, struct device_attribute *attr
 static ssize_t show_beep_enable (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
-        return sprintf(buf, "%ld\n",
-                       (long)BEEP_ENABLE_FROM_REG(data->beep_enable));
+        return sprintf(buf, "%ld\n", (long)data->beep_enable);
 }
 
-#define BEEP_ENABLE                     0       /* Store beep_enable */
-#define BEEP_MASK                       1       /* Store beep_mask */
-
 static ssize_t
-store_beep_reg(struct device *dev, const char *buf, size_t count,
-               int update_mask)
+store_beep_mask(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
-        u32 val, val2;
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
+        data->beep_mask = BEEP_MASK_TO_REG(val, data->type);
+        w83781d_write_value(data, W83781D_REG_BEEP_INTS1,
+                            data->beep_mask & 0xff);
+        w83781d_write_value(data, W83781D_REG_BEEP_INTS2,
+                            ((data->beep_mask >> 8) & 0x7f)
+                            | data->beep_enable << 7);
+        if (data->type != w83781d && data->type != as99127f) {
+                w83781d_write_value(data, W83781D_REG_BEEP_INTS3,
+                                    ((data->beep_mask) >> 16) & 0xff);
+        }
+        mutex_unlock(&data->update_lock);
 
-        if (update_mask == BEEP_MASK) { /* We are storing beep_mask */
-                data->beep_mask = BEEP_MASK_TO_REG(val, data->type);
-                w83781d_write_value(client, W83781D_REG_BEEP_INTS1,
-                                    data->beep_mask & 0xff);
-
-                if ((data->type != w83781d) && (data->type != as99127f)) {
-                        w83781d_write_value(client, W83781D_REG_BEEP_INTS3,
-                                            ((data->beep_mask) >> 16) & 0xff);
-                }
+        return count;
+}
 
-                val2 = (data->beep_mask >> 8) & 0x7f;
-        } else {                /* We are storing beep_enable */
-                val2 = w83781d_read_value(client, W83781D_REG_BEEP_INTS2) & 0x7f;
-                data->beep_enable = BEEP_ENABLE_TO_REG(val);
-        }
+static ssize_t
+store_beep_enable(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        u32 val;
 
-        w83781d_write_value(client, W83781D_REG_BEEP_INTS2,
-                            val2 | data->beep_enable << 7);
+        val = simple_strtoul(buf, NULL, 10);
+        if (val != 0 && val != 1)
+                return -EINVAL;
 
+        mutex_lock(&data->update_lock);
+        data->beep_enable = val;
+        val = w83781d_read_value(data, W83781D_REG_BEEP_INTS2) & 0x7f;
+        val |= data->beep_enable << 7;
+        w83781d_write_value(data, W83781D_REG_BEEP_INTS2, val);
         mutex_unlock(&data->update_lock);
+
         return count;
 }
 
-#define sysfs_beep(REG, reg) \
-static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_beep_##reg(dev, attr, buf); \
-} \
-static ssize_t store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        return store_beep_reg(dev, buf, count, BEEP_##REG); \
-} \
-static DEVICE_ATTR(beep_##reg, S_IRUGO | S_IWUSR, show_regs_beep_##reg, store_regs_beep_##reg);
-
-sysfs_beep(ENABLE, enable);
-sysfs_beep(MASK, mask);
+static DEVICE_ATTR(beep_mask, S_IRUGO | S_IWUSR,
+                show_beep_mask, store_beep_mask);
+static DEVICE_ATTR(beep_enable, S_IRUGO | S_IWUSR,
+                show_beep_enable, store_beep_enable);
 
 static ssize_t
-show_fan_div_reg(struct device *dev, char *buf, int nr)
+show_fan_div(struct device *dev, struct device_attribute *da, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n",
-                       (long) DIV_FROM_REG(data->fan_div[nr - 1]));
+                       (long) DIV_FROM_REG(data->fan_div[attr->index]));
 }
 
 /* Note: we save and restore the fan minimum here, because its value is
@@ -597,11 +560,13 @@ show_fan_div_reg(struct device *dev, char *buf, int nr)
    least surprise; the user doesn't expect the fan minimum to change just
    because the divisor changed. */
 static ssize_t
-store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
+store_fan_div(struct device *dev, struct device_attribute *da,
+                const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct w83781d_data *data = dev_get_drvdata(dev);
         unsigned long min;
+        int nr = attr->index;
         u8 reg;
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
@@ -613,77 +578,72 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         data->fan_div[nr] = DIV_TO_REG(val, data->type);
 
-        reg = (w83781d_read_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV)
+        reg = (w83781d_read_value(data, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV)
                & (nr==0 ? 0xcf : 0x3f))
             | ((data->fan_div[nr] & 0x03) << (nr==0 ? 4 : 6));
-        w83781d_write_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg);
+        w83781d_write_value(data, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg);
 
         /* w83781d and as99127f don't have extended divisor bits */
         if (data->type != w83781d && data->type != as99127f) {
-                reg = (w83781d_read_value(client, W83781D_REG_VBAT)
+                reg = (w83781d_read_value(data, W83781D_REG_VBAT)
                        & ~(1 << (5 + nr)))
                     | ((data->fan_div[nr] & 0x04) << (3 + nr));
-                w83781d_write_value(client, W83781D_REG_VBAT, reg);
+                w83781d_write_value(data, W83781D_REG_VBAT, reg);
         }
 
         /* Restore fan_min */
         data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
-        w83781d_write_value(client, W83781D_REG_FAN_MIN(nr+1), data->fan_min[nr]);
+        w83781d_write_value(data, W83781D_REG_FAN_MIN(nr), data->fan_min[nr]);
 
         mutex_unlock(&data->update_lock);
         return count;
 }
 
-#define sysfs_fan_div(offset) \
-static ssize_t show_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan_div_reg(dev, buf, offset); \
-} \
-static ssize_t store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        return store_fan_div_reg(dev, buf, count, offset - 1); \
-} \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, show_regs_fan_div_##offset, store_regs_fan_div_##offset);
-
-sysfs_fan_div(1);
-sysfs_fan_div(2);
-sysfs_fan_div(3);
+static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR,
+                show_fan_div, store_fan_div, 0);
+static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
+                show_fan_div, store_fan_div, 1);
+static SENSOR_DEVICE_ATTR(fan3_div, S_IRUGO | S_IWUSR,
+                show_fan_div, store_fan_div, 2);
 
 static ssize_t
-show_pwm_reg(struct device *dev, char *buf, int nr)
+show_pwm(struct device *dev, struct device_attribute *da, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct w83781d_data *data = w83781d_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) PWM_FROM_REG(data->pwm[nr - 1]));
+        return sprintf(buf, "%d\n", (int)data->pwm[attr->index]);
 }
 
 static ssize_t
-show_pwmenable_reg(struct device *dev, char *buf, int nr)
+show_pwm2_enable(struct device *dev, struct device_attribute *da, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) data->pwmenable[nr - 1]);
+        return sprintf(buf, "%d\n", (int)data->pwm2_enable);
 }
 
 static ssize_t
-store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
+store_pwm(struct device *dev, struct device_attribute *da, const char *buf,
+                size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         u32 val;
 
         val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->pwm[nr - 1] = PWM_TO_REG(val);
-        w83781d_write_value(client, W83781D_REG_PWM(nr), data->pwm[nr - 1]);
+        data->pwm[nr] = SENSORS_LIMIT(val, 0, 255);
+        w83781d_write_value(data, W83781D_REG_PWM[nr], data->pwm[nr]);
         mutex_unlock(&data->update_lock);
         return count;
 }
 
 static ssize_t
-store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
+store_pwm2_enable(struct device *dev, struct device_attribute *da,
+                const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct w83781d_data *data = dev_get_drvdata(dev);
         u32 val, reg;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -693,15 +653,15 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
         switch (val) {
         case 0:
         case 1:
-                reg = w83781d_read_value(client, W83781D_REG_PWMCLK12);
-                w83781d_write_value(client, W83781D_REG_PWMCLK12,
+                reg = w83781d_read_value(data, W83781D_REG_PWMCLK12);
+                w83781d_write_value(data, W83781D_REG_PWMCLK12,
                                     (reg & 0xf7) | (val << 3));
 
-                reg = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG);
-                w83781d_write_value(client, W83781D_REG_BEEP_CONFIG,
+                reg = w83781d_read_value(data, W83781D_REG_BEEP_CONFIG);
+                w83781d_write_value(data, W83781D_REG_BEEP_CONFIG,
                                     (reg & 0xef) | (!val << 4));
 
-                data->pwmenable[nr - 1] = val;
+                data->pwm2_enable = val;
                 break;
 
         default:
@@ -713,50 +673,29 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
         return count;
 }
 
-#define sysfs_pwm(offset) \
-static ssize_t show_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_pwm_reg(dev, buf, offset); \
-} \
-static ssize_t store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, \
-                const char *buf, size_t count) \
-{ \
-        return store_pwm_reg(dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
-                show_regs_pwm_##offset, store_regs_pwm_##offset);
-
-#define sysfs_pwmenable(offset) \
-static ssize_t show_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_pwmenable_reg(dev, buf, offset); \
-} \
-static ssize_t store_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, \
-                const char *buf, size_t count) \
-{ \
-        return store_pwmenable_reg(dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
-                show_regs_pwmenable_##offset, store_regs_pwmenable_##offset);
-
-sysfs_pwm(1);
-sysfs_pwm(2);
-sysfs_pwmenable(2);             /* only PWM2 can be enabled/disabled */
-sysfs_pwm(3);
-sysfs_pwm(4);
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 2);
+static SENSOR_DEVICE_ATTR(pwm4, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 3);
+/* only PWM2 can be enabled/disabled */
+static DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR,
+                show_pwm2_enable, store_pwm2_enable);
 
 static ssize_t
-show_sensor_reg(struct device *dev, char *buf, int nr)
+show_sensor(struct device *dev, struct device_attribute *da, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct w83781d_data *data = w83781d_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) data->sens[nr - 1]);
+        return sprintf(buf, "%d\n", (int)data->sens[attr->index]);
 }
 
 static ssize_t
-store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
+store_sensor(struct device *dev, struct device_attribute *da,
+                const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        int nr = attr->index;
         u32 val, tmp;
 
         val = simple_strtoul(buf, NULL, 10);
@@ -765,28 +704,28 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 
         switch (val) {
         case 1:         /* PII/Celeron diode */
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
-                w83781d_write_value(client, W83781D_REG_SCFG1,
-                                    tmp | BIT_SCFG1[nr - 1]);
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG2);
-                w83781d_write_value(client, W83781D_REG_SCFG2,
-                                    tmp | BIT_SCFG2[nr - 1]);
-                data->sens[nr - 1] = val;
+                tmp = w83781d_read_value(data, W83781D_REG_SCFG1);
+                w83781d_write_value(data, W83781D_REG_SCFG1,
+                                    tmp | BIT_SCFG1[nr]);
+                tmp = w83781d_read_value(data, W83781D_REG_SCFG2);
+                w83781d_write_value(data, W83781D_REG_SCFG2,
+                                    tmp | BIT_SCFG2[nr]);
+                data->sens[nr] = val;
                 break;
         case 2:         /* 3904 */
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
-                w83781d_write_value(client, W83781D_REG_SCFG1,
-                                    tmp | BIT_SCFG1[nr - 1]);
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG2);
-                w83781d_write_value(client, W83781D_REG_SCFG2,
-                                    tmp & ~BIT_SCFG2[nr - 1]);
-                data->sens[nr - 1] = val;
+                tmp = w83781d_read_value(data, W83781D_REG_SCFG1);
+                w83781d_write_value(data, W83781D_REG_SCFG1,
+                                    tmp | BIT_SCFG1[nr]);
+                tmp = w83781d_read_value(data, W83781D_REG_SCFG2);
+                w83781d_write_value(data, W83781D_REG_SCFG2,
+                                    tmp & ~BIT_SCFG2[nr]);
+                data->sens[nr] = val;
                 break;
         case W83781D_DEFAULT_BETA:      /* thermistor */
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
-                w83781d_write_value(client, W83781D_REG_SCFG1,
-                                    tmp & ~BIT_SCFG1[nr - 1]);
-                data->sens[nr - 1] = val;
+                tmp = w83781d_read_value(data, W83781D_REG_SCFG1);
+                w83781d_write_value(data, W83781D_REG_SCFG1,
+                                    tmp & ~BIT_SCFG1[nr]);
+                data->sens[nr] = val;
                 break;
         default:
                 dev_err(dev, "Invalid sensor type %ld; must be 1, 2, or %d\n",
@@ -798,20 +737,22 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
         return count;
 }
 
-#define sysfs_sensor(offset) \
-static ssize_t show_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-    return show_sensor_reg(dev, buf, offset); \
-} \
-static ssize_t store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-    return store_sensor_reg(dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR, show_regs_sensor_##offset, store_regs_sensor_##offset);
+static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR,
+        show_sensor, store_sensor, 0);
+static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR,
+        show_sensor, store_sensor, 0);
+static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR,
+        show_sensor, store_sensor, 0);
 
-sysfs_sensor(1);
-sysfs_sensor(2);
-sysfs_sensor(3);
+/* I2C devices get this name attribute automatically, but for ISA devices
+   we must create it by ourselves. */
+static ssize_t
+show_name(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        return sprintf(buf, "%s\n", data->client.name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
 /* This function is called when:
      * w83781d_driver is inserted (when this module is loaded), for each
@@ -825,12 +766,6 @@ w83781d_attach_adapter(struct i2c_adapter *adapter)
         return i2c_probe(adapter, &addr_data, w83781d_detect);
 }
 
-static int
-w83781d_isa_attach_adapter(struct i2c_adapter *adapter)
-{
-        return w83781d_detect(adapter, isa_address, -1);
-}
-
 /* Assumes that adapter is of I2C, not ISA variety.
  * OTHERWISE DON'T CALL THIS
  */
@@ -862,12 +797,12 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
                                 goto ERROR_SC_1;
                         }
                 }
-                w83781d_write_value(new_client, W83781D_REG_I2C_SUBADDR,
+                w83781d_write_value(data, W83781D_REG_I2C_SUBADDR,
                                 (force_subclients[2] & 0x07) |
                                 ((force_subclients[3] & 0x07) << 4));
                 data->lm75[0]->addr = force_subclients[2];
         } else {
-                val1 = w83781d_read_value(new_client, W83781D_REG_I2C_SUBADDR);
+                val1 = w83781d_read_value(data, W83781D_REG_I2C_SUBADDR);
                 data->lm75[0]->addr = 0x48 + (val1 & 0x07);
         }
 
@@ -937,20 +872,20 @@ ERROR_SC_0:
         return err;
 }
 
-#define IN_UNIT_ATTRS(X)                        \
-        &dev_attr_in##X##_input.attr,           \
-        &dev_attr_in##X##_min.attr,             \
-        &dev_attr_in##X##_max.attr
+#define IN_UNIT_ATTRS(X)                                        \
+        &sensor_dev_attr_in##X##_input.dev_attr.attr,           \
+        &sensor_dev_attr_in##X##_min.dev_attr.attr,             \
+        &sensor_dev_attr_in##X##_max.dev_attr.attr
 
-#define FAN_UNIT_ATTRS(X)                       \
-        &dev_attr_fan##X##_input.attr,          \
-        &dev_attr_fan##X##_min.attr,            \
-        &dev_attr_fan##X##_div.attr
+#define FAN_UNIT_ATTRS(X)                                       \
+        &sensor_dev_attr_fan##X##_input.dev_attr.attr,          \
+        &sensor_dev_attr_fan##X##_min.dev_attr.attr,            \
+        &sensor_dev_attr_fan##X##_div.dev_attr.attr
 
-#define TEMP_UNIT_ATTRS(X)                      \
-        &dev_attr_temp##X##_input.attr,         \
-        &dev_attr_temp##X##_max.attr,           \
-        &dev_attr_temp##X##_max_hyst.attr
+#define TEMP_UNIT_ATTRS(X)                                      \
+        &sensor_dev_attr_temp##X##_input.dev_attr.attr,         \
+        &sensor_dev_attr_temp##X##_max.dev_attr.attr,           \
+        &sensor_dev_attr_temp##X##_max_hyst.dev_attr.attr
 
 static struct attribute* w83781d_attributes[] = {
         IN_UNIT_ATTRS(0),
@@ -980,91 +915,115 @@ static struct attribute *w83781d_attributes_opt[] = {
         IN_UNIT_ATTRS(7),
         IN_UNIT_ATTRS(8),
         TEMP_UNIT_ATTRS(3),
-        &dev_attr_pwm1.attr,
-        &dev_attr_pwm2.attr,
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
+        &sensor_dev_attr_pwm4.dev_attr.attr,
         &dev_attr_pwm2_enable.attr,
-        &dev_attr_pwm3.attr,
-        &dev_attr_pwm4.attr,
-        &dev_attr_temp1_type.attr,
-        &dev_attr_temp2_type.attr,
-        &dev_attr_temp3_type.attr,
+        &sensor_dev_attr_temp1_type.dev_attr.attr,
+        &sensor_dev_attr_temp2_type.dev_attr.attr,
+        &sensor_dev_attr_temp3_type.dev_attr.attr,
         NULL
 };
 static const struct attribute_group w83781d_group_opt = {
         .attrs = w83781d_attributes_opt,
 };
 
+/* No clean up is done on error, it's up to the caller */
 static int
-w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
+w83781d_create_files(struct device *dev, int kind, int is_isa)
 {
-        int i = 0, val1 = 0, val2;
-        struct i2c_client *client;
-        struct device *dev;
-        struct w83781d_data *data;
         int err;
-        const char *client_name = "";
-        int is_isa = i2c_is_isa_adapter(adapter);
-        enum vendor { winbond, asus } vendid;
 
-        if (!is_isa
-            && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
-                err = -EINVAL;
-                goto ERROR0;
+        if ((err = sysfs_create_group(&dev->kobj, &w83781d_group)))
+                return err;
+
+        if (kind != w83783s) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_in1_input.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in1_min.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in1_max.dev_attr)))
+                        return err;
+        }
+        if (kind != as99127f && kind != w83781d && kind != w83783s) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_in7_input.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in7_min.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in7_max.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in8_input.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in8_min.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_in8_max.dev_attr)))
+                        return err;
+        }
+        if (kind != w83783s) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_temp3_input.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_temp3_max.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_temp3_max_hyst.dev_attr)))
+                        return err;
         }
 
-        /* Prevent users from forcing a kind for a bus it isn't supposed
-           to possibly be on */
-        if (is_isa && (kind == as99127f || kind == w83783s)) {
-                dev_err(&adapter->dev,
-                        "Cannot force I2C-only chip for ISA address 0x%02x.\n",
-                        address);
-                err = -EINVAL;
-                goto ERROR0;
+        if (kind != w83781d && kind != as99127f) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_pwm1.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_pwm2.dev_attr))
+                    || (err = device_create_file(dev, &dev_attr_pwm2_enable)))
+                        return err;
         }
-        
-        if (is_isa)
-                if (!request_region(address, W83781D_EXTENT,
-                                    w83781d_isa_driver.driver.name)) {
-                        dev_dbg(&adapter->dev, "Request of region "
-                                "0x%x-0x%x for w83781d failed\n", address,
-                                address + W83781D_EXTENT - 1);
-                        err = -EBUSY;
-                        goto ERROR0;
+        if (kind == w83782d && !is_isa) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_pwm3.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_pwm4.dev_attr)))
+                        return err;
+        }
+
+        if (kind != as99127f && kind != w83781d) {
+                if ((err = device_create_file(dev,
+                                &sensor_dev_attr_temp1_type.dev_attr))
+                    || (err = device_create_file(dev,
+                                &sensor_dev_attr_temp2_type.dev_attr)))
+                        return err;
+                if (kind != w83783s) {
+                        if ((err = device_create_file(dev,
+                                        &sensor_dev_attr_temp3_type.dev_attr)))
+                                return err;
                 }
+        }
 
-        /* Probe whether there is anything available on this address. Already
-           done for SMBus clients */
-        if (kind < 0) {
-                if (is_isa) {
+        if (is_isa) {
+                err = device_create_file(&pdev->dev, &dev_attr_name);
+                if (err)
+                        return err;
+        }
 
-#define REALLY_SLOW_IO
-                        /* We need the timeouts for at least some LM78-like
-                           chips. But only if we read 'undefined' registers. */
-                        i = inb_p(address + 1);
-                        if (inb_p(address + 2) != i
-                         || inb_p(address + 3) != i
-                         || inb_p(address + 7) != i) {
-                                dev_dbg(&adapter->dev, "Detection of w83781d "
-                                        "chip failed at step 1\n");
-                                err = -ENODEV;
-                                goto ERROR1;
-                        }
-#undef REALLY_SLOW_IO
+        return 0;
+}
 
-                        /* Let's just hope nothing breaks here */
-                        i = inb_p(address + 5) & 0x7f;
-                        outb_p(~i & 0x7f, address + 5);
-                        val2 = inb_p(address + 5) & 0x7f;
-                        if (val2 != (~i & 0x7f)) {
-                                outb_p(i, address + 5);
-                                dev_dbg(&adapter->dev, "Detection of w83781d "
-                                        "chip failed at step 2 (0x%x != "
-                                        "0x%x at 0x%x)\n", val2, ~i & 0x7f,
-                                        address + 5);
-                                err = -ENODEV;
-                                goto ERROR1;
-                        }
-                }
+static int
+w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        int val1 = 0, val2;
+        struct i2c_client *client;
+        struct device *dev;
+        struct w83781d_data *data;
+        int err;
+        const char *client_name = "";
+        enum vendor { winbond, asus } vendid;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                err = -EINVAL;
+                goto ERROR1;
         }
 
         /* OK. For now, we presume we have a valid client. We now create the
@@ -1081,8 +1040,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         client->addr = address;
         mutex_init(&data->lock);
         client->adapter = adapter;
-        client->driver = is_isa ? &w83781d_isa_driver : &w83781d_driver;
-        client->flags = 0;
+        client->driver = &w83781d_driver;
         dev = &client->dev;
 
         /* Now, we do the remaining detection. */
@@ -1092,14 +1050,14 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
            force_*=... parameter, and the Winbond will be reset to the right
            bank. */
         if (kind < 0) {
-                if (w83781d_read_value(client, W83781D_REG_CONFIG) & 0x80) {
+                if (w83781d_read_value(data, W83781D_REG_CONFIG) & 0x80) {
                         dev_dbg(&adapter->dev, "Detection of w83781d chip "
                                 "failed at step 3\n");
                         err = -ENODEV;
                         goto ERROR2;
                 }
-                val1 = w83781d_read_value(client, W83781D_REG_BANK);
-                val2 = w83781d_read_value(client, W83781D_REG_CHIPMAN);
+                val1 = w83781d_read_value(data, W83781D_REG_BANK);
+                val2 = w83781d_read_value(data, W83781D_REG_CHIPMAN);
                 /* Check for Winbond or Asus ID if in bank 0 */
                 if ((!(val1 & 0x07)) &&
                     (((!(val1 & 0x80)) && (val2 != 0xa3) && (val2 != 0xc3))
@@ -1111,10 +1069,10 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 }
                 /* If Winbond SMBus, check address at 0x48.
                    Asus doesn't support, except for as99127f rev.2 */
-                if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) ||
-                                  ((val1 & 0x80) && (val2 == 0x5c)))) {
+                if ((!(val1 & 0x80) && (val2 == 0xa3)) ||
+                    ((val1 & 0x80) && (val2 == 0x5c))) {
                         if (w83781d_read_value
-                            (client, W83781D_REG_I2C_ADDR) != address) {
+                            (data, W83781D_REG_I2C_ADDR) != address) {
                                 dev_dbg(&adapter->dev, "Detection of w83781d "
                                         "chip failed at step 5\n");
                                 err = -ENODEV;
@@ -1125,14 +1083,14 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* We have either had a force parameter, or we have already detected the
            Winbond. Put it now into bank 0 and Vendor ID High Byte */
-        w83781d_write_value(client, W83781D_REG_BANK,
-                            (w83781d_read_value(client, W83781D_REG_BANK)
+        w83781d_write_value(data, W83781D_REG_BANK,
+                            (w83781d_read_value(data, W83781D_REG_BANK)
                              & 0x78) | 0x80);
 
         /* Determine the chip type. */
         if (kind <= 0) {
                 /* get vendor ID */
-                val2 = w83781d_read_value(client, W83781D_REG_CHIPMAN);
+                val2 = w83781d_read_value(data, W83781D_REG_CHIPMAN);
                 if (val2 == 0x5c)
                         vendid = winbond;
                 else if (val2 == 0x12)
@@ -1144,17 +1102,16 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                         goto ERROR2;
                 }
 
-                val1 = w83781d_read_value(client, W83781D_REG_WCHIPID);
+                val1 = w83781d_read_value(data, W83781D_REG_WCHIPID);
                 if ((val1 == 0x10 || val1 == 0x11) && vendid == winbond)
                         kind = w83781d;
                 else if (val1 == 0x30 && vendid == winbond)
                         kind = w83782d;
-                else if (val1 == 0x40 && vendid == winbond && !is_isa
-                                && address == 0x2d)
+                else if (val1 == 0x40 && vendid == winbond && address == 0x2d)
                         kind = w83783s;
                 else if (val1 == 0x21 && vendid == winbond)
                         kind = w83627hf;
-                else if (val1 == 0x31 && !is_isa && address >= 0x28)
+                else if (val1 == 0x31 && address >= 0x28)
                         kind = as99127f;
                 else {
                         if (kind == 0)
@@ -1182,86 +1139,23 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         strlcpy(client->name, client_name, I2C_NAME_SIZE);
         data->type = kind;
 
-        data->valid = 0;
-        mutex_init(&data->update_lock);
-
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(client)))
                 goto ERROR2;
 
         /* attach secondary i2c lm75-like clients */
-        if (!is_isa) {
-                if ((err = w83781d_detect_subclients(adapter, address,
-                                kind, client)))
-                        goto ERROR3;
-        } else {
-                data->lm75[0] = NULL;
-                data->lm75[1] = NULL;
-        }
+        if ((err = w83781d_detect_subclients(adapter, address,
+                        kind, client)))
+                goto ERROR3;
 
         /* Initialize the chip */
-        w83781d_init_client(client);
-
-        /* A few vars need to be filled upon startup */
-        for (i = 1; i <= 3; i++) {
-                data->fan_min[i - 1] = w83781d_read_value(client,
-                                        W83781D_REG_FAN_MIN(i));
-        }
-        if (kind != w83781d && kind != as99127f)
-                for (i = 0; i < 4; i++)
-                        data->pwmenable[i] = 1;
+        w83781d_init_device(dev);
 
         /* Register sysfs hooks */
-        if ((err = sysfs_create_group(&dev->kobj, &w83781d_group)))
+        err = w83781d_create_files(dev, kind, 0);
+        if (err)
                 goto ERROR4;
 
-        if (kind != w83783s) {
-                if ((err = device_create_file(dev, &dev_attr_in1_input))
-                    || (err = device_create_file(dev, &dev_attr_in1_min))
-                    || (err = device_create_file(dev, &dev_attr_in1_max)))
-                        goto ERROR4;
-        }
-        if (kind != as99127f && kind != w83781d && kind != w83783s) {
-                if ((err = device_create_file(dev, &dev_attr_in7_input))
-                    || (err = device_create_file(dev, &dev_attr_in7_min))
-                    || (err = device_create_file(dev, &dev_attr_in7_max))
-                    || (err = device_create_file(dev, &dev_attr_in8_input))
-                    || (err = device_create_file(dev, &dev_attr_in8_min))
-                    || (err = device_create_file(dev, &dev_attr_in8_max)))
-                        goto ERROR4;
-        }
-        if (kind != w83783s) {
-                if ((err = device_create_file(dev, &dev_attr_temp3_input))
-                    || (err = device_create_file(dev, &dev_attr_temp3_max))
-                    || (err = device_create_file(dev,
-                                                 &dev_attr_temp3_max_hyst)))
-                        goto ERROR4;
-        }
-
-        if (kind != w83781d && kind != as99127f) {
-                if ((err = device_create_file(dev, &dev_attr_pwm1))
-                    || (err = device_create_file(dev, &dev_attr_pwm2))
-                    || (err = device_create_file(dev, &dev_attr_pwm2_enable)))
-                        goto ERROR4;
-        }
-        if (kind == w83782d && !is_isa) {
-                if ((err = device_create_file(dev, &dev_attr_pwm3))
-                    || (err = device_create_file(dev, &dev_attr_pwm4)))
-                        goto ERROR4;
-        }
-
-        if (kind != as99127f && kind != w83781d) {
-                if ((err = device_create_file(dev, &dev_attr_temp1_type))
-                    || (err = device_create_file(dev,
-                                                 &dev_attr_temp2_type)))
-                        goto ERROR4;
-                if (kind != w83783s) {
-                        if ((err = device_create_file(dev,
-                                                      &dev_attr_temp3_type)))
-                                goto ERROR4;
-                }
-        }
-
         data->class_dev = hwmon_device_register(dev);
         if (IS_ERR(data->class_dev)) {
                 err = PTR_ERR(data->class_dev);
@@ -1287,9 +1181,6 @@ ERROR3:
 ERROR2:
         kfree(data);
 ERROR1:
-        if (is_isa)
-                release_region(address, W83781D_EXTENT);
-ERROR0:
         return err;
 }
 
@@ -1305,8 +1196,6 @@ w83781d_detach_client(struct i2c_client *client)
                 sysfs_remove_group(&client->dev.kobj, &w83781d_group);
                 sysfs_remove_group(&client->dev.kobj, &w83781d_group_opt);
         }
-        if (i2c_is_isa_client(client))
-                release_region(client->addr, W83781D_EXTENT);
 
         if ((err = i2c_detach_client(client)))
                 return err;
@@ -1322,6 +1211,88 @@ w83781d_detach_client(struct i2c_client *client)
         return 0;
 }
 
+static int __devinit
+w83781d_isa_probe(struct platform_device *pdev)
+{
+        int err, reg;
+        struct w83781d_data *data;
+        struct resource *res;
+        const char *name;
+
+        /* Reserve the ISA region */
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!request_region(res->start, W83781D_EXTENT, "w83781d")) {
+                err = -EBUSY;
+                goto exit;
+        }
+
+        if (!(data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_release_region;
+        }
+        mutex_init(&data->lock);
+        data->client.addr = res->start;
+        i2c_set_clientdata(&data->client, data);
+        platform_set_drvdata(pdev, data);
+
+        reg = w83781d_read_value(data, W83781D_REG_WCHIPID);
+        switch (reg) {
+        case 0x21:
+                data->type = w83627hf;
+                name = "w83627hf";
+                break;
+        case 0x30:
+                data->type = w83782d;
+                name = "w83782d";
+                break;
+        default:
+                data->type = w83781d;
+                name = "w83781d";
+        }
+        strlcpy(data->client.name, name, I2C_NAME_SIZE);
+
+        /* Initialize the W83781D chip */
+        w83781d_init_device(&pdev->dev);
+
+        /* Register sysfs hooks */
+        err = w83781d_create_files(&pdev->dev, data->type, 1);
+        if (err)
+                goto exit_remove_files;
+
+        data->class_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove_files;
+        }
+
+        return 0;
+
+ exit_remove_files:
+        sysfs_remove_group(&pdev->dev.kobj, &w83781d_group);
+        sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        kfree(data);
+ exit_release_region:
+        release_region(res->start, W83781D_EXTENT);
+ exit:
+        return err;
+}
+
+static int __devexit
+w83781d_isa_remove(struct platform_device *pdev)
+{
+        struct w83781d_data *data = platform_get_drvdata(pdev);
+
+        hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&pdev->dev.kobj, &w83781d_group);
+        sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        release_region(data->client.addr, W83781D_EXTENT);
+        kfree(data);
+
+        return 0;
+}
+
 /* The SMBus locks itself, usually, but nothing may access the Winbond between
    bank switches. ISA access must always be locked explicitly! 
    We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks,
@@ -1329,14 +1300,14 @@ w83781d_detach_client(struct i2c_client *client)
    There are some ugly typecasts here, but the good news is - they should
    nowhere else be necessary! */
 static int
-w83781d_read_value(struct i2c_client *client, u16 reg)
+w83781d_read_value(struct w83781d_data *data, u16 reg)
 {
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct i2c_client *client = &data->client;
         int res, word_sized, bank;
         struct i2c_client *cl;
 
         mutex_lock(&data->lock);
-        if (i2c_is_isa_client(client)) {
+        if (!client->driver) { /* ISA device */
                 word_sized = (((reg & 0xff00) == 0x100)
                               || ((reg & 0xff00) == 0x200))
                     && (((reg & 0x00ff) == 0x50)
@@ -1398,14 +1369,14 @@ w83781d_read_value(struct i2c_client *client, u16 reg)
 }
 
 static int
-w83781d_write_value(struct i2c_client *client, u16 reg, u16 value)
+w83781d_write_value(struct w83781d_data *data, u16 reg, u16 value)
 {
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct i2c_client *client = &data->client;
         int word_sized, bank;
         struct i2c_client *cl;
 
         mutex_lock(&data->lock);
-        if (i2c_is_isa_client(client)) {
+        if (!client->driver) { /* ISA device */
                 word_sized = (((reg & 0xff00) == 0x100)
                               || ((reg & 0xff00) == 0x200))
                     && (((reg & 0x00ff) == 0x53)
@@ -1462,13 +1433,18 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value)
 }
 
 static void
-w83781d_init_client(struct i2c_client *client)
+w83781d_init_device(struct device *dev)
 {
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct w83781d_data *data = dev_get_drvdata(dev);
         int i, p;
         int type = data->type;
         u8 tmp;
 
+        if (type == w83627hf)
+                dev_info(dev, "The W83627HF chip is better supported by the "
+                         "w83627hf driver, support will be dropped from the "
+                         "w83781d driver soon\n");
+
         if (reset && type != as99127f) { /* this resets registers we don't have
                                            documentation for on the as99127f */
                 /* Resetting the chip has been the default for a long time,
@@ -1477,42 +1453,42 @@ w83781d_init_client(struct i2c_client *client)
                    It might even go away if nobody reports it as being useful,
                    as I see very little reason why this would be needed at
                    all. */
-                dev_info(&client->dev, "If reset=1 solved a problem you were "
+                dev_info(dev, "If reset=1 solved a problem you were "
                          "having, please report!\n");
 
                 /* save these registers */
-                i = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG);
-                p = w83781d_read_value(client, W83781D_REG_PWMCLK12);
+                i = w83781d_read_value(data, W83781D_REG_BEEP_CONFIG);
+                p = w83781d_read_value(data, W83781D_REG_PWMCLK12);
                 /* Reset all except Watchdog values and last conversion values
                    This sets fan-divs to 2, among others */
-                w83781d_write_value(client, W83781D_REG_CONFIG, 0x80);
+                w83781d_write_value(data, W83781D_REG_CONFIG, 0x80);
                 /* Restore the registers and disable power-on abnormal beep.
                    This saves FAN 1/2/3 input/output values set by BIOS. */
-                w83781d_write_value(client, W83781D_REG_BEEP_CONFIG, i | 0x80);
-                w83781d_write_value(client, W83781D_REG_PWMCLK12, p);
+                w83781d_write_value(data, W83781D_REG_BEEP_CONFIG, i | 0x80);
+                w83781d_write_value(data, W83781D_REG_PWMCLK12, p);
                 /* Disable master beep-enable (reset turns it on).
                    Individual beep_mask should be reset to off but for some reason
                    disabling this bit helps some people not get beeped */
-                w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
+                w83781d_write_value(data, W83781D_REG_BEEP_INTS2, 0);
         }
 
         /* Disable power-on abnormal beep, as advised by the datasheet.
            Already done if reset=1. */
         if (init && !reset && type != as99127f) {
-                i = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG);
-                w83781d_write_value(client, W83781D_REG_BEEP_CONFIG, i | 0x80);
+                i = w83781d_read_value(data, W83781D_REG_BEEP_CONFIG);
+                w83781d_write_value(data, W83781D_REG_BEEP_CONFIG, i | 0x80);
         }
 
         data->vrm = vid_which_vrm();
 
         if ((type != w83781d) && (type != as99127f)) {
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
+                tmp = w83781d_read_value(data, W83781D_REG_SCFG1);
                 for (i = 1; i <= 3; i++) {
                         if (!(tmp & BIT_SCFG1[i - 1])) {
                                 data->sens[i - 1] = W83781D_DEFAULT_BETA;
                         } else {
                                 if (w83781d_read_value
-                                    (client,
+                                    (data,
                                      W83781D_REG_SCFG2) & BIT_SCFG2[i - 1])
                                         data->sens[i - 1] = 1;
                                 else
@@ -1525,38 +1501,46 @@ w83781d_init_client(struct i2c_client *client)
 
         if (init && type != as99127f) {
                 /* Enable temp2 */
-                tmp = w83781d_read_value(client, W83781D_REG_TEMP2_CONFIG);
+                tmp = w83781d_read_value(data, W83781D_REG_TEMP2_CONFIG);
                 if (tmp & 0x01) {
-                        dev_warn(&client->dev, "Enabling temp2, readings "
+                        dev_warn(dev, "Enabling temp2, readings "
                                  "might not make sense\n");
-                        w83781d_write_value(client, W83781D_REG_TEMP2_CONFIG,
+                        w83781d_write_value(data, W83781D_REG_TEMP2_CONFIG,
                                 tmp & 0xfe);
                 }
 
                 /* Enable temp3 */
                 if (type != w83783s) {
-                        tmp = w83781d_read_value(client,
+                        tmp = w83781d_read_value(data,
                                 W83781D_REG_TEMP3_CONFIG);
                         if (tmp & 0x01) {
-                                dev_warn(&client->dev, "Enabling temp3, "
+                                dev_warn(dev, "Enabling temp3, "
                                          "readings might not make sense\n");
-                                w83781d_write_value(client,
+                                w83781d_write_value(data,
                                         W83781D_REG_TEMP3_CONFIG, tmp & 0xfe);
                         }
                 }
         }
 
         /* Start monitoring */
-        w83781d_write_value(client, W83781D_REG_CONFIG,
-                            (w83781d_read_value(client,
+        w83781d_write_value(data, W83781D_REG_CONFIG,
+                            (w83781d_read_value(data,
                                                 W83781D_REG_CONFIG) & 0xf7)
                             | 0x01);
+
+        /* A few vars need to be filled upon startup */
+        for (i = 0; i < 3; i++) {
+                data->fan_min[i] = w83781d_read_value(data,
+                                        W83781D_REG_FAN_MIN(i));
+        }
+
+        mutex_init(&data->update_lock);
 }
 
 static struct w83781d_data *w83781d_update_device(struct device *dev)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct w83781d_data *data = i2c_get_clientdata(client);
+        struct w83781d_data *data = dev_get_drvdata(dev);
+        struct i2c_client *client = &data->client;
         int i;
 
         mutex_lock(&data->update_lock);
@@ -1569,98 +1553,97 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                         if (data->type == w83783s && i == 1)
                                 continue;       /* 783S has no in1 */
                         data->in[i] =
-                            w83781d_read_value(client, W83781D_REG_IN(i));
+                            w83781d_read_value(data, W83781D_REG_IN(i));
                         data->in_min[i] =
-                            w83781d_read_value(client, W83781D_REG_IN_MIN(i));
+                            w83781d_read_value(data, W83781D_REG_IN_MIN(i));
                         data->in_max[i] =
-                            w83781d_read_value(client, W83781D_REG_IN_MAX(i));
+                            w83781d_read_value(data, W83781D_REG_IN_MAX(i));
                         if ((data->type != w83782d)
                             && (data->type != w83627hf) && (i == 6))
                                 break;
                 }
-                for (i = 1; i <= 3; i++) {
-                        data->fan[i - 1] =
-                            w83781d_read_value(client, W83781D_REG_FAN(i));
-                        data->fan_min[i - 1] =
-                            w83781d_read_value(client, W83781D_REG_FAN_MIN(i));
+                for (i = 0; i < 3; i++) {
+                        data->fan[i] =
+                            w83781d_read_value(data, W83781D_REG_FAN(i));
+                        data->fan_min[i] =
+                            w83781d_read_value(data, W83781D_REG_FAN_MIN(i));
                 }
                 if (data->type != w83781d && data->type != as99127f) {
-                        for (i = 1; i <= 4; i++) {
-                                data->pwm[i - 1] =
-                                    w83781d_read_value(client,
-                                                       W83781D_REG_PWM(i));
-                                if ((data->type != w83782d
-                                     || i2c_is_isa_client(client))
-                                    && i == 2)
+                        for (i = 0; i < 4; i++) {
+                                data->pwm[i] =
+                                    w83781d_read_value(data,
+                                                       W83781D_REG_PWM[i]);
+                                if ((data->type != w83782d || !client->driver)
+                                    && i == 1)
                                         break;
                         }
                         /* Only PWM2 can be disabled */
-                        data->pwmenable[1] = (w83781d_read_value(client,
+                        data->pwm2_enable = (w83781d_read_value(data,
                                               W83781D_REG_PWMCLK12) & 0x08) >> 3;
                 }
 
-                data->temp = w83781d_read_value(client, W83781D_REG_TEMP(1));
+                data->temp = w83781d_read_value(data, W83781D_REG_TEMP(1));
                 data->temp_max =
-                    w83781d_read_value(client, W83781D_REG_TEMP_OVER(1));
+                    w83781d_read_value(data, W83781D_REG_TEMP_OVER(1));
                 data->temp_max_hyst =
-                    w83781d_read_value(client, W83781D_REG_TEMP_HYST(1));
+                    w83781d_read_value(data, W83781D_REG_TEMP_HYST(1));
                 data->temp_add[0] =
-                    w83781d_read_value(client, W83781D_REG_TEMP(2));
+                    w83781d_read_value(data, W83781D_REG_TEMP(2));
                 data->temp_max_add[0] =
-                    w83781d_read_value(client, W83781D_REG_TEMP_OVER(2));
+                    w83781d_read_value(data, W83781D_REG_TEMP_OVER(2));
                 data->temp_max_hyst_add[0] =
-                    w83781d_read_value(client, W83781D_REG_TEMP_HYST(2));
+                    w83781d_read_value(data, W83781D_REG_TEMP_HYST(2));
                 if (data->type != w83783s) {
                         data->temp_add[1] =
-                            w83781d_read_value(client, W83781D_REG_TEMP(3));
+                            w83781d_read_value(data, W83781D_REG_TEMP(3));
                         data->temp_max_add[1] =
-                            w83781d_read_value(client,
+                            w83781d_read_value(data,
                                                W83781D_REG_TEMP_OVER(3));
                         data->temp_max_hyst_add[1] =
-                            w83781d_read_value(client,
+                            w83781d_read_value(data,
                                                W83781D_REG_TEMP_HYST(3));
                 }
-                i = w83781d_read_value(client, W83781D_REG_VID_FANDIV);
+                i = w83781d_read_value(data, W83781D_REG_VID_FANDIV);
                 data->vid = i & 0x0f;
-                data->vid |= (w83781d_read_value(client,
+                data->vid |= (w83781d_read_value(data,
                                         W83781D_REG_CHIPID) & 0x01) << 4;
                 data->fan_div[0] = (i >> 4) & 0x03;
                 data->fan_div[1] = (i >> 6) & 0x03;
-                data->fan_div[2] = (w83781d_read_value(client,
+                data->fan_div[2] = (w83781d_read_value(data,
                                         W83781D_REG_PIN) >> 6) & 0x03;
                 if ((data->type != w83781d) && (data->type != as99127f)) {
-                        i = w83781d_read_value(client, W83781D_REG_VBAT);
+                        i = w83781d_read_value(data, W83781D_REG_VBAT);
                         data->fan_div[0] |= (i >> 3) & 0x04;
                         data->fan_div[1] |= (i >> 4) & 0x04;
                         data->fan_div[2] |= (i >> 5) & 0x04;
                 }
                 if ((data->type == w83782d) || (data->type == w83627hf)) {
-                        data->alarms = w83781d_read_value(client,
+                        data->alarms = w83781d_read_value(data,
                                                 W83782D_REG_ALARM1)
-                                     | (w83781d_read_value(client,
+                                     | (w83781d_read_value(data,
                                                 W83782D_REG_ALARM2) << 8)
-                                     | (w83781d_read_value(client,
+                                     | (w83781d_read_value(data,
                                                 W83782D_REG_ALARM3) << 16);
                 } else if (data->type == w83783s) {
-                        data->alarms = w83781d_read_value(client,
+                        data->alarms = w83781d_read_value(data,
                                                 W83782D_REG_ALARM1)
-                                     | (w83781d_read_value(client,
+                                     | (w83781d_read_value(data,
                                                 W83782D_REG_ALARM2) << 8);
                 } else {
                         /* No real-time status registers, fall back to
                            interrupt status registers */
-                        data->alarms = w83781d_read_value(client,
+                        data->alarms = w83781d_read_value(data,
                                                 W83781D_REG_ALARM1)
-                                     | (w83781d_read_value(client,
+                                     | (w83781d_read_value(data,
                                                 W83781D_REG_ALARM2) << 8);
                 }
-                i = w83781d_read_value(client, W83781D_REG_BEEP_INTS2);
+                i = w83781d_read_value(data, W83781D_REG_BEEP_INTS2);
                 data->beep_enable = i >> 7;
                 data->beep_mask = ((i & 0x7f) << 8) +
-                    w83781d_read_value(client, W83781D_REG_BEEP_INTS1);
+                    w83781d_read_value(data, W83781D_REG_BEEP_INTS1);
                 if ((data->type != w83781d) && (data->type != as99127f)) {
                         data->beep_mask |=
-                            w83781d_read_value(client,
+                            w83781d_read_value(data,
                                                W83781D_REG_BEEP_INTS3) << 16;
                 }
                 data->last_updated = jiffies;
@@ -1672,6 +1655,133 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
         return data;
 }
 
+/* return 1 if a supported chip is found, 0 otherwise */
+static int __init
+w83781d_isa_found(unsigned short address)
+{
+        int val, save, found = 0;
+
+        if (!request_region(address, W83781D_EXTENT, "w83781d"))
+                return 0;
+
+#define REALLY_SLOW_IO
+        /* We need the timeouts for at least some W83781D-like
+           chips. But only if we read 'undefined' registers. */
+        val = inb_p(address + 1);
+        if (inb_p(address + 2) != val
+         || inb_p(address + 3) != val
+         || inb_p(address + 7) != val) {
+                pr_debug("w83781d: Detection failed at step 1\n");
+                goto release;
+        }
+#undef REALLY_SLOW_IO
+
+        /* We should be able to change the 7 LSB of the address port. The
+           MSB (busy flag) should be clear initially, set after the write. */
+        save = inb_p(address + W83781D_ADDR_REG_OFFSET);
+        if (save & 0x80) {
+                pr_debug("w83781d: Detection failed at step 2\n");
+                goto release;
+        }
+        val = ~save & 0x7f;
+        outb_p(val, address + W83781D_ADDR_REG_OFFSET);
+        if (inb_p(address + W83781D_ADDR_REG_OFFSET) != (val | 0x80)) {
+                outb_p(save, address + W83781D_ADDR_REG_OFFSET);
+                pr_debug("w83781d: Detection failed at step 3\n");
+                goto release;
+        }
+
+        /* We found a device, now see if it could be a W83781D */
+        outb_p(W83781D_REG_CONFIG, address + W83781D_ADDR_REG_OFFSET);
+        val = inb_p(address + W83781D_DATA_REG_OFFSET);
+        if (val & 0x80) {
+                pr_debug("w83781d: Detection failed at step 4\n");
+                goto release;
+        }
+        outb_p(W83781D_REG_BANK, address + W83781D_ADDR_REG_OFFSET);
+        save = inb_p(address + W83781D_DATA_REG_OFFSET);
+        outb_p(W83781D_REG_CHIPMAN, address + W83781D_ADDR_REG_OFFSET);
+        val = inb_p(address + W83781D_DATA_REG_OFFSET);
+        if ((!(save & 0x80) && (val != 0xa3))
+         || ((save & 0x80) && (val != 0x5c))) {
+                pr_debug("w83781d: Detection failed at step 5\n");
+                goto release;
+        }
+        outb_p(W83781D_REG_I2C_ADDR, address + W83781D_ADDR_REG_OFFSET);
+        val = inb_p(address + W83781D_DATA_REG_OFFSET);
+        if (val < 0x03 || val > 0x77) { /* Not a valid I2C address */
+                pr_debug("w83781d: Detection failed at step 6\n");
+                goto release;
+        }
+
+        /* The busy flag should be clear again */
+        if (inb_p(address + W83781D_ADDR_REG_OFFSET) & 0x80) {
+                pr_debug("w83781d: Detection failed at step 7\n");
+                goto release;
+        }
+
+        /* Determine the chip type */
+        outb_p(W83781D_REG_BANK, address + W83781D_ADDR_REG_OFFSET);
+        save = inb_p(address + W83781D_DATA_REG_OFFSET);
+        outb_p(save & 0xf8, address + W83781D_DATA_REG_OFFSET);
+        outb_p(W83781D_REG_WCHIPID, address + W83781D_ADDR_REG_OFFSET);
+        val = inb_p(address + W83781D_DATA_REG_OFFSET);
+        if ((val & 0xfe) == 0x10        /* W83781D */
+         || val == 0x30                 /* W83782D */
+         || val == 0x21)                /* W83627HF */
+                found = 1;
+
+        if (found)
+                pr_info("w83781d: Found a %s chip at %#x\n",
+                        val == 0x21 ? "W83627HF" :
+                        val == 0x30 ? "W83782D" : "W83781D", (int)address);
+
+ release:
+        release_region(address, W83781D_EXTENT);
+        return found;
+}
+
+static int __init
+w83781d_isa_device_add(unsigned short address)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + W83781D_EXTENT,
+                .name   = "w83781d",
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc("w83781d", address);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR "w83781d: Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR "w83781d: Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR "w83781d: Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+ exit_device_put:
+        platform_device_put(pdev);
+ exit:
+        pdev = NULL;
+        return err;
+}
+
 static int __init
 sensors_w83781d_init(void)
 {
@@ -1679,21 +1789,36 @@ sensors_w83781d_init(void)
 
         res = i2c_add_driver(&w83781d_driver);
         if (res)
-                return res;
+                goto exit;
+
+        if (w83781d_isa_found(isa_address)) {
+                res = platform_driver_register(&w83781d_isa_driver);
+                if (res)
+                        goto exit_unreg_i2c_driver;
 
-        /* Don't exit if this one fails, we still want the I2C variants
-           to work! */
-        if (i2c_isa_add_driver(&w83781d_isa_driver))
-                isa_address = 0;
+                /* Sets global pdev as a side effect */
+                res = w83781d_isa_device_add(isa_address);
+                if (res)
+                        goto exit_unreg_isa_driver;
+        }
 
         return 0;
+
+ exit_unreg_isa_driver:
+        platform_driver_unregister(&w83781d_isa_driver);
+ exit_unreg_i2c_driver:
+        i2c_del_driver(&w83781d_driver);
+ exit:
+        return res;
 }
 
 static void __exit
 sensors_w83781d_exit(void)
 {
-        if (isa_address)
-                i2c_isa_del_driver(&w83781d_isa_driver);
+        if (pdev) {
+                platform_device_unregister(pdev);
+                platform_driver_unregister(&w83781d_isa_driver);
+        }
         i2c_del_driver(&w83781d_driver);
 }
 
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 434a61b415a3..96867347bcbf 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig I2C
         tristate "I2C support"
+        depends on HAS_IOMEM
         ---help---
           I2C (pronounce: I-square-C) is a slow serial bus protocol used in
           many micro controller applications and developed by Philips.  SMBus,
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index f35156c58922..9c8b6d5eaec9 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/delay.h>
@@ -226,13 +227,14 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev)
         adapter->algo = &at91_algorithm;
         adapter->class = I2C_CLASS_HWMON;
         adapter->dev.parent = &pdev->dev;
+        /* adapter->id == 0 ... only one TWI controller for now */
 
         platform_set_drvdata(pdev, adapter);
 
         clk_enable(twi_clk);            /* enable peripheral clock */
         at91_twi_hwinit();              /* initialize TWI controller */
 
-        rc = i2c_add_adapter(adapter);
+        rc = i2c_add_numbered_adapter(adapter);
         if (rc) {
                 dev_err(&pdev->dev, "Adapter %s registration failed\n",
                                 adapter->name);
@@ -295,6 +297,9 @@ static int at91_i2c_resume(struct platform_device *pdev)
 #define at91_i2c_resume         NULL
 #endif
 
+/* work with "modprobe at91_i2c" from hotplugging or coldplugging */
+MODULE_ALIAS("at91_i2c");
+
 static struct platform_driver at91_i2c_driver = {
         .probe          = at91_i2c_probe,
         .remove         = __devexit_p(at91_i2c_remove),
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 8c953707253f..039a07fde908 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -175,6 +175,7 @@ static void i2c_parport_attach (struct parport *port)
         }
         adapter->algo_data.data = port;
         adapter->adapter.algo_data = &adapter->algo_data;
+        adapter->adapter.dev.parent = port->physport->dev;
 
         if (parport_claim_or_block(adapter->pdev) < 0) {
                 printk(KERN_ERR "i2c-parport: Could not claim parallel port\n");
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 873544ab598e..8a0a99b93641 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -548,7 +548,7 @@ static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c)
          */
         icr = readl(_ICR(i2c));
         icr &= ~(ICR_STOP | ICR_ACKNAK);
-        writel(icr, _IRC(i2c));
+        writel(icr, _ICR(i2c));
 }
 
 /*
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index e68a96f589fd..e4540fcf6476 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -830,7 +830,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
         i2c->irq = res;
                 
-        dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start);
+        dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,
+                (unsigned long)res->start);
 
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c
index 907999049d50..cb9abe7565a7 100644
--- a/drivers/i2c/busses/i2c-tiny-usb.c
+++ b/drivers/i2c/busses/i2c-tiny-usb.c
@@ -208,7 +208,7 @@ static int i2c_tiny_usb_probe(struct usb_interface *interface,
         dev->adapter.class = I2C_CLASS_HWMON;
         dev->adapter.algo = &usb_algorithm;
         dev->adapter.algo_data = dev;
-        snprintf(dev->adapter.name, I2C_NAME_SIZE,
+        snprintf(dev->adapter.name, sizeof(dev->adapter.name),
                  "i2c-tiny-usb at bus %03d device %03d",
                  dev->usb_dev->bus->busnum, dev->usb_dev->devnum);
 
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 0db56e7bc34e..0d6bd4f7b7fa 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -28,7 +28,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-#include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 7ed92dc3d833..3c3f2ebf3fc9 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -354,7 +354,7 @@ static void tps65010_interrupt(struct tps65010 *tps)
                          * also needs to get error handling and probably
                          * an #ifdef CONFIG_SOFTWARE_SUSPEND
                          */
-                        pm_suspend(PM_SUSPEND_DISK);
+                        hibernate();
 #endif
                         poll = 1;
                 }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 64f8e56d300e..435925eba437 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -697,9 +697,10 @@ int i2c_attach_client(struct i2c_client *client)
         if (client->driver)
                 client->dev.driver = &client->driver->driver;
 
-        if (client->driver && !is_newstyle_driver(client->driver))
+        if (client->driver && !is_newstyle_driver(client->driver)) {
                 client->dev.release = i2c_client_release;
-        else
+                client->dev.uevent_suppress = 1;
+        } else
                 client->dev.release = i2c_client_dev_release;
 
         snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index cb4fa9bef8cd..e7a709710592 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/i2c.h>
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 5bdf64b77913..b1a9b81c211f 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -4,12 +4,10 @@
 # Andre Hedrick <andre@linux-ide.org>
 #
 
-if BLOCK
-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE
         tristate "ATA/ATAPI/MFM/RLL support"
+        depends on BLOCK
+        depends on HAS_IOMEM
         ---help---
           If you say Y here, your kernel will be able to manage low cost mass
           storage units such as ATA/(E)IDE and ATAPI units. The most common
@@ -291,6 +289,17 @@ config IDE_TASK_IOCTL
 
           If you are unsure, say N here.
 
+config IDE_PROC_FS
+        bool "legacy /proc/ide/ support"
+        depends on IDE && PROC_FS
+        default y
+        help
+          This option enables support for the various files in
+          /proc/ide.  In Linux 2.6 this has been superseded by
+          files in sysfs but many legacy applications rely on this.
+
+          If unsure say Y.
+
 comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
@@ -360,6 +369,9 @@ config IDEPCI_SHARE_IRQ
           It is safe to say Y to this question, in most cases.
           If unsure, say N.
 
+config IDEPCI_PCIBUS_ORDER
+        def_bool PCI && BLK_DEV_IDE=y && BLK_DEV_IDEPCI
+
 config BLK_DEV_OFFBOARD
         bool "Boot off-board chipsets first support"
         depends on PCI && BLK_DEV_IDEPCI
@@ -1084,8 +1096,4 @@ config BLK_DEV_HD_ONLY
 config BLK_DEV_HD
         def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY
 
-endif
-
-endmenu
-
-endif
+endif # IDE
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index d9f029e8ff74..75dc6969e0a7 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -20,7 +20,7 @@ ide-core-$(CONFIG_BLK_DEV_CMD640)	+= pci/cmd640.o
 # Core IDE code - must come before legacy
 ide-core-$(CONFIG_BLK_DEV_IDEPCI)       += setup-pci.o
 ide-core-$(CONFIG_BLK_DEV_IDEDMA)       += ide-dma.o
-ide-core-$(CONFIG_PROC_FS)              += ide-proc.o
+ide-core-$(CONFIG_IDE_PROC_FS)          += ide-proc.o
 ide-core-$(CONFIG_BLK_DEV_IDEPNP)       += ide-pnp.o
 ide-core-$(CONFIG_BLK_DEV_IDEACPI)      += ide-acpi.o
 
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index 9d474e5fd8dc..f7449d04114a 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -45,7 +45,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq,
         hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
         hw.irq = irq;
 
-        ide_register_hw(&hw, hwif);
+        ide_register_hw(&hw, 0, hwif);
 
         return 0;
 }
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index e2953fc1fafb..66f826252aee 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -342,7 +342,7 @@ static int icside_dma_check(ide_drive_t *drive)
          * Enable DMA on any drive that has multiword DMA
          */
         if (id->field_valid & 2) {
-                xfer_mode = ide_dma_speed(drive, 0);
+                xfer_mode = ide_max_dma_mode(drive);
                 goto out;
         }
 
@@ -565,8 +565,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
         ide_hwif_t *hwif;
         void __iomem *base;
 
-        base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                       ecard_resource_len(ec, ECARD_RES_MEMC));
+        base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
                 return -ENOMEM;
 
@@ -574,8 +573,8 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         ec->irqaddr  = base + ICS_ARCIN_V5_INTRSTAT;
         ec->irqmask  = 1;
-        ec->irq_data = state;
-        ec->ops      = &icside_ops_arcin_v5;
+
+        ecard_setirq(ec, &icside_ops_arcin_v5, state);
 
         /*
          * Be on the safe side - disable interrupts
@@ -583,15 +582,14 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
         icside_irqdisable_arcin_v5(ec, 0);
 
         hwif = icside_setup(base, &icside_cardinfo_v5, ec);
-        if (!hwif) {
-                iounmap(base);
+        if (!hwif)
                 return -ENODEV;
-        }
 
         state->hwif[0] = hwif;
 
         probe_hwif_init(hwif);
-        create_proc_ide_interfaces();
+
+        ide_proc_register_port(hwif);
 
         return 0;
 }
@@ -604,8 +602,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         unsigned int sel = 0;
         int ret;
 
-        ioc_base = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                           ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!ioc_base) {
                 ret = -ENOMEM;
                 goto out;
@@ -614,11 +611,10 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         easi_base = ioc_base;
 
         if (ecard_resource_flags(ec, ECARD_RES_EASI)) {
-                easi_base = ioremap(ecard_resource_start(ec, ECARD_RES_EASI),
-                                    ecard_resource_len(ec, ECARD_RES_EASI));
+                easi_base = ecardm_iomap(ec, ECARD_RES_EASI, 0, 0);
                 if (!easi_base) {
                         ret = -ENOMEM;
-                        goto unmap_slot;
+                        goto out;
                 }
 
                 /*
@@ -629,8 +625,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         writeb(sel, ioc_base);
 
-        ec->irq_data      = state;
-        ec->ops           = &icside_ops_arcin_v6;
+        ecard_setirq(ec, &icside_ops_arcin_v6, state);
 
         state->irq_port   = easi_base;
         state->ioc_base   = ioc_base;
@@ -648,7 +643,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         if (!hwif || !mate) {
                 ret = -ENODEV;
-                goto unmap_port;
+                goto out;
         }
 
         state->hwif[0]    = hwif;
@@ -679,15 +674,12 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         probe_hwif_init(hwif);
         probe_hwif_init(mate);
-        create_proc_ide_interfaces();
+
+        ide_proc_register_port(hwif);
+        ide_proc_register_port(mate);
 
         return 0;
 
- unmap_port:
-        if (easi_base != ioc_base)
-                iounmap(easi_base);
- unmap_slot:
-        iounmap(ioc_base);
  out:
         return ret;
 }
@@ -713,8 +705,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
         state->type     = ICS_TYPE_NOTYPE;
         state->dev      = &ec->dev;
 
-        idmem = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                        ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        idmem = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (idmem) {
                 unsigned int type;
 
@@ -722,7 +713,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 4) & 1) << 1;
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 8) & 1) << 2;
                 type |= (readb(idmem + ICS_IDENT_OFFSET + 12) & 1) << 3;
-                iounmap(idmem);
+                ecardm_iounmap(ec, idmem);
 
                 state->type = type;
         }
@@ -790,13 +781,6 @@ static void __devexit icside_remove(struct expansion_card *ec)
         }
 
         ecard_set_drvdata(ec, NULL);
-        ec->ops = NULL;
-        ec->irq_data = NULL;
-
-        if (state->ioc_base)
-                iounmap(state->ioc_base);
-        if (state->ioc_base != state->irq_port)
-                iounmap(state->irq_port);
 
         kfree(state);
         ecard_release_resources(ec);
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 23488c4d1fcd..a3d6744e870a 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -38,6 +38,6 @@ void __init ide_arm_init(void)
                 memset(&hw, 0, sizeof(hw));
                 ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
                 hw.irq = IDE_ARM_IRQ;
-                ide_register_hw(&hw, NULL);
+                ide_register_hw(&hw, 1, NULL);
         }
 }
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 9c6c49fdd2b1..83811af11610 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -63,8 +63,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                       ecard_resource_len(ec, ECARD_RES_MEMC));
+        base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base) {
                 ret = -ENOMEM;
                 goto release;
@@ -76,12 +75,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                 hwif->gendev.parent = &ec->dev;
                 hwif->noprobe = 0;
                 probe_hwif_init(hwif);
-                create_proc_ide_interfaces();
+                ide_proc_register_port(hwif);
                 ecard_set_drvdata(ec, hwif);
                 goto out;
         }
 
-        iounmap(base);
  release:
         ecard_release_resources(ec);
  out:
@@ -96,7 +94,6 @@ static void __devexit rapide_remove(struct expansion_card *ec)
 
         /* there must be a better way */
         ide_unregister(hwif - ide_hwifs);
-        iounmap(hwif->hwif_data);
         ecard_release_resources(ec);
 }
 
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 5e8efc89255a..ca0341c05e55 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -796,7 +796,7 @@ init_e100_ide (void)
                                 ide_offsets,
                                 0, 0, cris_ide_ack_intr,
                                 ide_default_irq(0));
-                ide_register_hw(&hw, &hwif);
+                ide_register_hw(&hw, 1, &hwif);
                 hwif->mmio = 1;
                 hwif->chipset = ide_etrax100;
                 hwif->tuneproc = &tune_cris_ide;
@@ -1002,18 +1002,6 @@ static int cris_ide_build_dmatable (ide_drive_t *drive)
         return 1;       /* let the PIO routines handle this weirdness */
 }
 
-static int cris_config_drive_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, 1);
-
-        if (!speed)
-                return 0;
-
-        speed_cris_ide(drive, speed);
-
-        return ide_dma_enable(drive);
-}
-
 /*
  * cris_dma_intr() is the handler for disk read/write DMA interrupts
  */
@@ -1043,7 +1031,7 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive)
 
 static int cris_dma_check(ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && cris_config_drive_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         return -1;
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 88750a300337..6d26ad7360d5 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -101,7 +101,7 @@ void __init h8300_ide_init(void)
         hw_setup(&hw);
 
         /* register if */
-        idx = ide_register_hw(&hw, &hwif);
+        idx = ide_register_hw(&hw, 1, &hwif);
         if (idx == -1) {
                 printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");
                 return;
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 638becda81c6..252ab8295edf 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -3059,10 +3059,14 @@ int ide_cdrom_probe_capabilities (ide_drive_t *drive)
         return nslots;
 }
 
+#ifdef CONFIG_IDE_PROC_FS
 static void ide_cdrom_add_settings(ide_drive_t *drive)
 {
-        ide_add_setting(drive,  "dsc_overlap",          SETTING_RW, -1, -1, TYPE_BYTE, 0, 1, 1, 1, &drive->dsc_overlap, NULL);
+        ide_add_setting(drive, "dsc_overlap", SETTING_RW, TYPE_BYTE, 0, 1, 1, 1, &drive->dsc_overlap, NULL);
 }
+#else
+static inline void ide_cdrom_add_settings(ide_drive_t *drive) { ; }
+#endif
 
 /*
  * standard prep_rq_fn that builds 10 byte cmds
@@ -3274,7 +3278,7 @@ int ide_cdrom_setup (ide_drive_t *drive)
         return 0;
 }
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_IDE_PROC_FS
 static
 sector_t ide_cdrom_capacity (ide_drive_t *drive)
 {
@@ -3291,7 +3295,7 @@ static void ide_cd_remove(ide_drive_t *drive)
 {
         struct cdrom_info *info = drive->driver_data;
 
-        ide_unregister_subdriver(drive, info->driver);
+        ide_proc_unregister_driver(drive, info->driver);
 
         del_gendisk(info->disk);
 
@@ -3321,7 +3325,7 @@ static void ide_cd_release(struct kref *kref)
 
 static int ide_cd_probe(ide_drive_t *);
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_IDE_PROC_FS
 static int proc_idecd_read_capacity
         (char *page, char **start, off_t off, int count, int *eof, void *data)
 {
@@ -3336,8 +3340,6 @@ static ide_proc_entry_t idecd_proc[] = {
         { "capacity", S_IFREG|S_IRUGO, proc_idecd_read_capacity, NULL },
         { NULL, 0, NULL, NULL }
 };
-#else
-# define idecd_proc     NULL
 #endif
 
 static ide_driver_t ide_cdrom_driver = {
@@ -3355,7 +3357,9 @@ static ide_driver_t ide_cdrom_driver = {
         .end_request            = ide_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
+#ifdef CONFIG_IDE_PROC_FS
         .proc                   = idecd_proc,
+#endif
 };
 
 static int idecd_open(struct inode * inode, struct file * file)
@@ -3517,7 +3521,7 @@ static int ide_cd_probe(ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        ide_register_subdriver(drive, &ide_cdrom_driver);
+        ide_proc_register_driver(drive, &ide_cdrom_driver);
 
         kref_init(&info->kref);
 
@@ -3534,7 +3538,7 @@ static int ide_cd_probe(ide_drive_t *drive)
         g->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE;
         if (ide_cdrom_setup(drive)) {
                 struct cdrom_device_info *devinfo = &info->devinfo;
-                ide_unregister_subdriver(drive, &ide_cdrom_driver);
+                ide_proc_unregister_driver(drive, &ide_cdrom_driver);
                 kfree(info->buffer);
                 kfree(info->toc);
                 kfree(info->changer_info);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 37aa6ddd9702..7fff773f2df7 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -559,8 +559,7 @@ static sector_t idedisk_capacity (ide_drive_t *drive)
         return drive->capacity64 - drive->sect0;
 }
 
-#ifdef CONFIG_PROC_FS
-
+#ifdef CONFIG_IDE_PROC_FS
 static int smart_enable(ide_drive_t *drive)
 {
         ide_task_t args;
@@ -678,12 +677,7 @@ static ide_proc_entry_t idedisk_proc[] = {
         { "smart_thresholds",   S_IFREG|S_IRUSR,        proc_idedisk_read_smart_thresholds,     NULL },
         { NULL, 0, NULL, NULL }
 };
-
-#else
-
-#define idedisk_proc    NULL
-
-#endif  /* CONFIG_PROC_FS */
+#endif  /* CONFIG_IDE_PROC_FS */
 
 static void idedisk_prepare_flush(request_queue_t *q, struct request *rq)
 {
@@ -737,6 +731,9 @@ static int set_multcount(ide_drive_t *drive, int arg)
 {
         struct request rq;
 
+        if (arg < 0 || arg > drive->id->max_multsect)
+                return -EINVAL;
+
         if (drive->special.b.set_multmode)
                 return -EBUSY;
         ide_init_drive_cmd (&rq);
@@ -749,6 +746,9 @@ static int set_multcount(ide_drive_t *drive, int arg)
 
 static int set_nowerr(ide_drive_t *drive, int arg)
 {
+        if (arg < 0 || arg > 1)
+                return -EINVAL;
+
         if (ide_spin_wait_hwgroup(drive))
                 return -EBUSY;
         drive->nowerr = arg;
@@ -800,6 +800,9 @@ static int write_cache(ide_drive_t *drive, int arg)
         ide_task_t args;
         int err = 1;
 
+        if (arg < 0 || arg > 1)
+                return -EINVAL;
+
         if (ide_id_has_flush_cache(drive->id)) {
                 memset(&args, 0, sizeof(ide_task_t));
                 args.tfRegister[IDE_FEATURE_OFFSET]     = (arg) ?
@@ -835,6 +838,9 @@ static int set_acoustic (ide_drive_t *drive, int arg)
 {
         ide_task_t args;
 
+        if (arg < 0 || arg > 254)
+                return -EINVAL;
+
         memset(&args, 0, sizeof(ide_task_t));
         args.tfRegister[IDE_FEATURE_OFFSET]     = (arg) ? SETFEATURES_EN_AAM :
                                                           SETFEATURES_DIS_AAM;
@@ -855,6 +861,9 @@ static int set_acoustic (ide_drive_t *drive, int arg)
  */
 static int set_lba_addressing(ide_drive_t *drive, int arg)
 {
+        if (arg < 0 || arg > 2)
+                return -EINVAL;
+
         drive->addressing =  0;
 
         if (HWIF(drive)->no_lba48)
@@ -866,23 +875,27 @@ static int set_lba_addressing(ide_drive_t *drive, int arg)
         return 0;
 }
 
+#ifdef CONFIG_IDE_PROC_FS
 static void idedisk_add_settings(ide_drive_t *drive)
 {
         struct hd_driveid *id = drive->id;
 
-        ide_add_setting(drive,  "bios_cyl",             SETTING_RW,                                     -1,                     -1,                     TYPE_INT,       0,      65535,                          1,      1,      &drive->bios_cyl,               NULL);
-        ide_add_setting(drive,  "bios_head",            SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      255,                            1,      1,      &drive->bios_head,              NULL);
-        ide_add_setting(drive,  "bios_sect",            SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      63,                             1,      1,      &drive->bios_sect,              NULL);
-        ide_add_setting(drive,  "address",              SETTING_RW,                                     HDIO_GET_ADDRESS,       HDIO_SET_ADDRESS,       TYPE_INTA,      0,      2,                              1,      1,      &drive->addressing,     set_lba_addressing);
-        ide_add_setting(drive,  "bswap",                SETTING_READ,                                   -1,                     -1,                     TYPE_BYTE,      0,      1,                              1,      1,      &drive->bswap,                  NULL);
-        ide_add_setting(drive,  "multcount",            id ? SETTING_RW : SETTING_READ,                 HDIO_GET_MULTCOUNT,     HDIO_SET_MULTCOUNT,     TYPE_BYTE,      0,      id ? id->max_multsect : 0,      1,      1,      &drive->mult_count,             set_multcount);
-        ide_add_setting(drive,  "nowerr",               SETTING_RW,                                     HDIO_GET_NOWERR,        HDIO_SET_NOWERR,        TYPE_BYTE,      0,      1,                              1,      1,      &drive->nowerr,                 set_nowerr);
-        ide_add_setting(drive,  "lun",                  SETTING_RW,                                     -1,                     -1,                     TYPE_INT,       0,      7,                              1,      1,      &drive->lun,                    NULL);
-        ide_add_setting(drive,  "wcache",               SETTING_RW,                                     HDIO_GET_WCACHE,        HDIO_SET_WCACHE,        TYPE_BYTE,      0,      1,                              1,      1,      &drive->wcache,                 write_cache);
-        ide_add_setting(drive,  "acoustic",             SETTING_RW,                                     HDIO_GET_ACOUSTIC,      HDIO_SET_ACOUSTIC,      TYPE_BYTE,      0,      254,                            1,      1,      &drive->acoustic,               set_acoustic);
-        ide_add_setting(drive,  "failures",             SETTING_RW,                                     -1,                     -1,                     TYPE_INT,       0,      65535,                          1,      1,      &drive->failures,               NULL);
-        ide_add_setting(drive,  "max_failures",         SETTING_RW,                                     -1,                     -1,                     TYPE_INT,       0,      65535,                          1,      1,      &drive->max_failures,           NULL);
+        ide_add_setting(drive,  "bios_cyl",     SETTING_RW,     TYPE_INT,       0,      65535,                  1,      1,      &drive->bios_cyl,       NULL);
+        ide_add_setting(drive,  "bios_head",    SETTING_RW,     TYPE_BYTE,      0,      255,                    1,      1,      &drive->bios_head,      NULL);
+        ide_add_setting(drive,  "bios_sect",    SETTING_RW,     TYPE_BYTE,      0,      63,                     1,      1,      &drive->bios_sect,      NULL);
+        ide_add_setting(drive,  "address",      SETTING_RW,     TYPE_BYTE,      0,      2,                      1,      1,      &drive->addressing,     set_lba_addressing);
+        ide_add_setting(drive,  "bswap",        SETTING_READ,   TYPE_BYTE,      0,      1,                      1,      1,      &drive->bswap,          NULL);
+        ide_add_setting(drive,  "multcount",    SETTING_RW,     TYPE_BYTE,      0,      id->max_multsect,       1,      1,      &drive->mult_count,     set_multcount);
+        ide_add_setting(drive,  "nowerr",       SETTING_RW,     TYPE_BYTE,      0,      1,                      1,      1,      &drive->nowerr,         set_nowerr);
+        ide_add_setting(drive,  "lun",          SETTING_RW,     TYPE_INT,       0,      7,                      1,      1,      &drive->lun,            NULL);
+        ide_add_setting(drive,  "wcache",       SETTING_RW,     TYPE_BYTE,      0,      1,                      1,      1,      &drive->wcache,         write_cache);
+        ide_add_setting(drive,  "acoustic",     SETTING_RW,     TYPE_BYTE,      0,      254,                    1,      1,      &drive->acoustic,       set_acoustic);
+        ide_add_setting(drive,  "failures",     SETTING_RW,     TYPE_INT,       0,      65535,                  1,      1,      &drive->failures,       NULL);
+        ide_add_setting(drive,  "max_failures", SETTING_RW,     TYPE_INT,       0,      65535,                  1,      1,      &drive->max_failures,   NULL);
 }
+#else
+static inline void idedisk_add_settings(ide_drive_t *drive) { ; }
+#endif
 
 static void idedisk_setup (ide_drive_t *drive)
 {
@@ -1001,7 +1014,7 @@ static void ide_disk_remove(ide_drive_t *drive)
         struct ide_disk_obj *idkp = drive->driver_data;
         struct gendisk *g = idkp->disk;
 
-        ide_unregister_subdriver(drive, idkp->driver);
+        ide_proc_unregister_driver(drive, idkp->driver);
 
         del_gendisk(g);
 
@@ -1066,7 +1079,9 @@ static ide_driver_t idedisk_driver = {
         .end_request            = ide_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
+#ifdef CONFIG_IDE_PROC_FS
         .proc                   = idedisk_proc,
+#endif
 };
 
 static int idedisk_open(struct inode *inode, struct file *filp)
@@ -1140,9 +1155,49 @@ static int idedisk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 static int idedisk_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
+        unsigned long flags;
         struct block_device *bdev = inode->i_bdev;
         struct ide_disk_obj *idkp = ide_disk_g(bdev->bd_disk);
-        return generic_ide_ioctl(idkp->drive, file, bdev, cmd, arg);
+        ide_drive_t *drive = idkp->drive;
+        int err, (*setfunc)(ide_drive_t *, int);
+        u8 *val;
+
+        switch (cmd) {
+        case HDIO_GET_ADDRESS:   val = &drive->addressing;      goto read_val;
+        case HDIO_GET_MULTCOUNT: val = &drive->mult_count;      goto read_val;
+        case HDIO_GET_NOWERR:    val = &drive->nowerr;          goto read_val;
+        case HDIO_GET_WCACHE:    val = &drive->wcache;          goto read_val;
+        case HDIO_GET_ACOUSTIC:  val = &drive->acoustic;        goto read_val;
+        case HDIO_SET_ADDRESS:   setfunc = set_lba_addressing;  goto set_val;
+        case HDIO_SET_MULTCOUNT: setfunc = set_multcount;       goto set_val;
+        case HDIO_SET_NOWERR:    setfunc = set_nowerr;          goto set_val;
+        case HDIO_SET_WCACHE:    setfunc = write_cache;         goto set_val;
+        case HDIO_SET_ACOUSTIC:  setfunc = set_acoustic;        goto set_val;
+        }
+
+        return generic_ide_ioctl(drive, file, bdev, cmd, arg);
+
+read_val:
+        down(&ide_setting_sem);
+        spin_lock_irqsave(&ide_lock, flags);
+        err = *val;
+        spin_unlock_irqrestore(&ide_lock, flags);
+        up(&ide_setting_sem);
+        return err >= 0 ? put_user(err, (long __user *)arg) : err;
+
+set_val:
+        if (bdev != bdev->bd_contains)
+                err = -EINVAL;
+        else {
+                if (!capable(CAP_SYS_ADMIN))
+                        err = -EACCES;
+                else {
+                        down(&ide_setting_sem);
+                        err = setfunc(drive, arg);
+                        up(&ide_setting_sem);
+                }
+        }
+        return err;
 }
 
 static int idedisk_media_changed(struct gendisk *disk)
@@ -1202,7 +1257,7 @@ static int ide_disk_probe(ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        ide_register_subdriver(drive, &idedisk_driver);
+        ide_proc_register_driver(drive, &idedisk_driver);
 
         kref_init(&idkp->kref);
 
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index fd213088b06b..b77b7d138c49 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -670,40 +670,105 @@ int __ide_dma_good_drive (ide_drive_t *drive)
 
 EXPORT_SYMBOL(__ide_dma_good_drive);
 
-int ide_use_dma(ide_drive_t *drive)
+static const u8 xfer_mode_bases[] = {
+        XFER_UDMA_0,
+        XFER_MW_DMA_0,
+        XFER_SW_DMA_0,
+};
+
+static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base)
 {
         struct hd_driveid *id = drive->id;
         ide_hwif_t *hwif = drive->hwif;
+        unsigned int mask = 0;
+
+        switch(base) {
+        case XFER_UDMA_0:
+                if ((id->field_valid & 4) == 0)
+                        break;
+
+                mask = id->dma_ultra & hwif->ultra_mask;
+
+                if (hwif->udma_filter)
+                        mask &= hwif->udma_filter(drive);
+
+                if ((mask & 0x78) && (eighty_ninty_three(drive) == 0))
+                        mask &= 0x07;
+                break;
+        case XFER_MW_DMA_0:
+                if (id->field_valid & 2)
+                        mask = id->dma_mword & hwif->mwdma_mask;
+                break;
+        case XFER_SW_DMA_0:
+                if (id->field_valid & 2)
+                        mask = id->dma_1word & hwif->swdma_mask;
+                break;
+        default:
+                BUG();
+                break;
+        }
+
+        return mask;
+}
+
+/**
+ *      ide_max_dma_mode        -       compute DMA speed
+ *      @drive: IDE device
+ *
+ *      Checks the drive capabilities and returns the speed to use
+ *      for the DMA transfer.  Returns 0 if the drive is incapable
+ *      of DMA transfers.
+ */
+
+u8 ide_max_dma_mode(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        unsigned int mask;
+        int x, i;
+        u8 mode = 0;
 
-        if ((id->capability & 1) == 0 || drive->autodma == 0)
+        if (drive->media != ide_disk && hwif->atapi_dma == 0)
+                return 0;
+
+        for (i = 0; i < ARRAY_SIZE(xfer_mode_bases); i++) {
+                mask = ide_get_mode_mask(drive, xfer_mode_bases[i]);
+                x = fls(mask) - 1;
+                if (x >= 0) {
+                        mode = xfer_mode_bases[i] + x;
+                        break;
+                }
+        }
+
+        printk(KERN_DEBUG "%s: selected mode 0x%x\n", drive->name, mode);
+
+        return mode;
+}
+
+EXPORT_SYMBOL_GPL(ide_max_dma_mode);
+
+int ide_tune_dma(ide_drive_t *drive)
+{
+        u8 speed;
+
+        if ((drive->id->capability & 1) == 0 || drive->autodma == 0)
                 return 0;
 
         /* consult the list of known "bad" drives */
         if (__ide_dma_bad_drive(drive))
                 return 0;
 
-        /* capable of UltraDMA modes */
-        if (id->field_valid & 4) {
-                if (hwif->ultra_mask & id->dma_ultra)
-                        return 1;
-        }
+        speed = ide_max_dma_mode(drive);
 
-        /* capable of regular DMA modes */
-        if (id->field_valid & 2) {
-                if (hwif->mwdma_mask & id->dma_mword)
-                        return 1;
-                if (hwif->swdma_mask & id->dma_1word)
-                        return 1;
-        }
+        if (!speed)
+                return 0;
 
-        /* consult the list of known "good" drives */
-        if (__ide_dma_good_drive(drive) && id->eide_dma_time < 150)
-                return 1;
+        if (drive->hwif->speedproc(drive, speed))
+                return 0;
 
-        return 0;
+        return 1;
 }
 
-EXPORT_SYMBOL_GPL(ide_use_dma);
+EXPORT_SYMBOL_GPL(ide_tune_dma);
 
 void ide_dma_verbose(ide_drive_t *drive)
 {
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 57cd21c5b2c1..f429be88c4f9 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1811,18 +1811,22 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id)
         return 0;
 }
 
+#ifdef CONFIG_IDE_PROC_FS
 static void idefloppy_add_settings(ide_drive_t *drive)
 {
         idefloppy_floppy_t *floppy = drive->driver_data;
 
 /*
- *                      drive   setting name    read/write      ioctl   ioctl           data type       min     max     mul_factor      div_factor      data pointer            set function
+ *                      drive   setting name    read/write      data type       min     max     mul_factor      div_factor      data pointer            set function
  */
-        ide_add_setting(drive,  "bios_cyl",             SETTING_RW,                                     -1,                     -1,                     TYPE_INT,       0,      1023,                           1,      1,      &drive->bios_cyl,               NULL);
-        ide_add_setting(drive,  "bios_head",            SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      255,                            1,      1,      &drive->bios_head,              NULL);
-        ide_add_setting(drive,  "bios_sect",            SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      63,                             1,      1,      &drive->bios_sect,              NULL);
-        ide_add_setting(drive,  "ticks",                SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      255,                            1,      1,      &floppy->ticks,         NULL);
+        ide_add_setting(drive,  "bios_cyl",     SETTING_RW,     TYPE_INT,       0,      1023,           1,              1,      &drive->bios_cyl,       NULL);
+        ide_add_setting(drive,  "bios_head",    SETTING_RW,     TYPE_BYTE,      0,      255,            1,              1,      &drive->bios_head,      NULL);
+        ide_add_setting(drive,  "bios_sect",    SETTING_RW,     TYPE_BYTE,      0,      63,             1,              1,      &drive->bios_sect,      NULL);
+        ide_add_setting(drive,  "ticks",        SETTING_RW,     TYPE_BYTE,      0,      255,            1,              1,      &floppy->ticks,         NULL);
 }
+#else
+static inline void idefloppy_add_settings(ide_drive_t *drive) { ; }
+#endif
 
 /*
  *      Driver initialization.
@@ -1873,7 +1877,7 @@ static void ide_floppy_remove(ide_drive_t *drive)
         idefloppy_floppy_t *floppy = drive->driver_data;
         struct gendisk *g = floppy->disk;
 
-        ide_unregister_subdriver(drive, floppy->driver);
+        ide_proc_unregister_driver(drive, floppy->driver);
 
         del_gendisk(g);
 
@@ -1892,8 +1896,7 @@ static void ide_floppy_release(struct kref *kref)
         kfree(floppy);
 }
 
-#ifdef CONFIG_PROC_FS
-
+#ifdef CONFIG_IDE_PROC_FS
 static int proc_idefloppy_read_capacity
         (char *page, char **start, off_t off, int count, int *eof, void *data)
 {
@@ -1909,12 +1912,7 @@ static ide_proc_entry_t idefloppy_proc[] = {
         { "geometry",   S_IFREG|S_IRUGO,        proc_ide_read_geometry, NULL },
         { NULL, 0, NULL, NULL }
 };
-
-#else
-
-#define idefloppy_proc  NULL
-
-#endif  /* CONFIG_PROC_FS */
+#endif  /* CONFIG_IDE_PROC_FS */
 
 static int ide_floppy_probe(ide_drive_t *);
 
@@ -1933,7 +1931,9 @@ static ide_driver_t idefloppy_driver = {
         .end_request            = idefloppy_do_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
+#ifdef CONFIG_IDE_PROC_FS
         .proc                   = idefloppy_proc,
+#endif
 };
 
 static int idefloppy_open(struct inode *inode, struct file *filp)
@@ -2159,7 +2159,7 @@ static int ide_floppy_probe(ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        ide_register_subdriver(drive, &idefloppy_driver);
+        ide_proc_register_driver(drive, &idefloppy_driver);
 
         kref_init(&floppy->kref);
 
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 99fd56151131..0f72b98d727f 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -22,8 +22,6 @@ static int __init ide_generic_init(void)
         if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
                 ide_release_lock();     /* for atari only */
 
-        create_proc_ide_interfaces();
-
         return 0;
 }
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8670112f1d39..bfe8f1b712ba 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -172,15 +172,6 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
 
         memset(args, 0, sizeof(*args));
 
-        if (drive->media != ide_disk) {
-                /*
-                 * skip idedisk_pm_restore_pio and idedisk_pm_idle for ATAPI
-                 * devices
-                 */
-                if (pm->pm_step == idedisk_pm_restore_pio)
-                        pm->pm_step = ide_pm_restore_dma;
-        }
-
         switch (pm->pm_step) {
         case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) */
                 if (drive->media != ide_disk)
@@ -207,7 +198,13 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
         case idedisk_pm_restore_pio:    /* Resume step 1 (restore PIO) */
                 if (drive->hwif->tuneproc != NULL)
                         drive->hwif->tuneproc(drive, 255);
-                ide_complete_power_step(drive, rq, 0, 0);
+                /*
+                 * skip idedisk_pm_idle for ATAPI devices
+                 */
+                if (drive->media != ide_disk)
+                        pm->pm_step = ide_pm_restore_dma;
+                else
+                        ide_complete_power_step(drive, rq, 0, 0);
                 return ide_stopped;
 
         case idedisk_pm_idle:           /* Resume step 2 (idle) */
@@ -226,6 +223,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                         break;
                 if (drive->hwif->ide_dma_check == NULL)
                         break;
+                drive->hwif->dma_off_quietly(drive);
                 ide_set_dma(drive);
                 break;
         }
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 3caa176b3155..f0be5f665a0e 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -571,51 +571,54 @@ EXPORT_SYMBOL(ide_wait_stat);
  */
 u8 eighty_ninty_three (ide_drive_t *drive)
 {
-        if(HWIF(drive)->udma_four == 0)
-                return 0;
+        ide_hwif_t *hwif = drive->hwif;
+        struct hd_driveid *id = drive->id;
+
+        if (hwif->udma_four == 0)
+                goto no_80w;
 
         /* Check for SATA but only if we are ATA5 or higher */
-        if (drive->id->hw_config == 0 && (drive->id->major_rev_num & 0x7FE0))
+        if (id->hw_config == 0 && (id->major_rev_num & 0x7FE0))
                 return 1;
-        if (!(drive->id->hw_config & 0x6000))
-                return 0;
-#ifndef CONFIG_IDEDMA_IVB
-        if(!(drive->id->hw_config & 0x4000))
-                return 0;
-#endif /* CONFIG_IDEDMA_IVB */
+
         /*
          * FIXME:
          * - change master/slave IDENTIFY order
          * - force bit13 (80c cable present) check
          *   (unless the slave device is pre-ATA3)
          */
-        return 1;
-}
+#ifndef CONFIG_IDEDMA_IVB
+        if (id->hw_config & 0x4000)
+#else
+        if (id->hw_config & 0x6000)
+#endif
+                return 1;
+
+no_80w:
+        if (drive->udma33_warned == 1)
+                return 0;
 
-EXPORT_SYMBOL(eighty_ninty_three);
+        printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, "
+                            "limiting max speed to UDMA33\n",
+                            drive->name, hwif->udma_four ? "drive" : "host");
+
+        drive->udma33_warned = 1;
+
+        return 0;
+}
 
 int ide_ata66_check (ide_drive_t *drive, ide_task_t *args)
 {
         if ((args->tfRegister[IDE_COMMAND_OFFSET] == WIN_SETFEATURES) &&
             (args->tfRegister[IDE_SECTOR_OFFSET] > XFER_UDMA_2) &&
             (args->tfRegister[IDE_FEATURE_OFFSET] == SETFEATURES_XFER)) {
-#ifndef CONFIG_IDEDMA_IVB
-                if ((drive->id->hw_config & 0x6000) == 0) {
-#else /* !CONFIG_IDEDMA_IVB */
-                if (((drive->id->hw_config & 0x2000) == 0) ||
-                    ((drive->id->hw_config & 0x4000) == 0)) {
-#endif /* CONFIG_IDEDMA_IVB */
-                        printk("%s: Speed warnings UDMA 3/4/5 is not "
-                                "functional.\n", drive->name);
-                        return 1;
-                }
-                if (!HWIF(drive)->udma_four) {
-                        printk("%s: Speed warnings UDMA 3/4/5 is not "
-                                "functional.\n",
-                                HWIF(drive)->name);
+                if (eighty_ninty_three(drive) == 0) {
+                        printk(KERN_WARNING "%s: UDMA speeds >UDMA33 cannot "
+                                            "be set\n", drive->name);
                         return 1;
                 }
         }
+
         return 0;
 }
 
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 68719314df3f..074bb32a4a40 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -69,123 +69,41 @@ char *ide_xfer_verbose (u8 xfer_rate)
 EXPORT_SYMBOL(ide_xfer_verbose);
 
 /**
- *      ide_dma_speed   -       compute DMA speed
- *      @drive: drive
- *      @mode:  modes available
- *
- *      Checks the drive capabilities and returns the speed to use
- *      for the DMA transfer.  Returns 0 if the drive is incapable
- *      of DMA transfers.
- */
- 
-u8 ide_dma_speed(ide_drive_t *drive, u8 mode)
-{
-        struct hd_driveid *id   = drive->id;
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 ultra_mask, mwdma_mask, swdma_mask;
-        u8 speed = 0;
-
-        if (drive->media != ide_disk && hwif->atapi_dma == 0)
-                return 0;
-
-        /* Capable of UltraDMA modes? */
-        ultra_mask = id->dma_ultra & hwif->ultra_mask;
-
-        if (!(id->field_valid & 4))
-                mode = 0;       /* fallback to MW/SW DMA if no UltraDMA */
-
-        switch (mode) {
-        case 4:
-                if (ultra_mask & 0x40) {
-                        speed = XFER_UDMA_6;
-                        break;
-                }
-        case 3:
-                if (ultra_mask & 0x20) {
-                        speed = XFER_UDMA_5;
-                        break;
-                }
-        case 2:
-                if (ultra_mask & 0x10) {
-                        speed = XFER_UDMA_4;
-                        break;
-                }
-                if (ultra_mask & 0x08) {
-                        speed = XFER_UDMA_3;
-                        break;
-                }
-        case 1:
-                if (ultra_mask & 0x04) {
-                        speed = XFER_UDMA_2;
-                        break;
-                }
-                if (ultra_mask & 0x02) {
-                        speed = XFER_UDMA_1;
-                        break;
-                }
-                if (ultra_mask & 0x01) {
-                        speed = XFER_UDMA_0;
-                        break;
-                }
-        case 0:
-                mwdma_mask = id->dma_mword & hwif->mwdma_mask;
-
-                if (mwdma_mask & 0x04) {
-                        speed = XFER_MW_DMA_2;
-                        break;
-                }
-                if (mwdma_mask & 0x02) {
-                        speed = XFER_MW_DMA_1;
-                        break;
-                }
-                if (mwdma_mask & 0x01) {
-                        speed = XFER_MW_DMA_0;
-                        break;
-                }
-
-                swdma_mask = id->dma_1word & hwif->swdma_mask;
-
-                if (swdma_mask & 0x04) {
-                        speed = XFER_SW_DMA_2;
-                        break;
-                }
-                if (swdma_mask & 0x02) {
-                        speed = XFER_SW_DMA_1;
-                        break;
-                }
-                if (swdma_mask & 0x01) {
-                        speed = XFER_SW_DMA_0;
-                        break;
-                }
-        }
-
-        return speed;
-}
-EXPORT_SYMBOL(ide_dma_speed);
-
-
-/**
- *      ide_rate_filter         -       return best speed for mode
- *      @mode: modes available
+ *      ide_rate_filter         -       filter transfer mode
+ *      @drive: IDE device
  *      @speed: desired speed
  *
- *      Given the available DMA/UDMA mode this function returns
+ *      Given the available transfer modes this function returns
  *      the best available speed at or below the speed requested.
+ *
+ *      FIXME: filter also PIO/SWDMA/MWDMA modes
  */
 
-u8 ide_rate_filter (u8 mode, u8 speed) 
+u8 ide_rate_filter(ide_drive_t *drive, u8 speed)
 {
 #ifdef CONFIG_BLK_DEV_IDEDMA
-        static u8 speed_max[] = {
-                XFER_MW_DMA_2, XFER_UDMA_2, XFER_UDMA_4,
-                XFER_UDMA_5, XFER_UDMA_6
-        };
+        ide_hwif_t *hwif = drive->hwif;
+        u8 mask = hwif->ultra_mask, mode = XFER_MW_DMA_2;
+
+        if (hwif->udma_filter)
+                mask = hwif->udma_filter(drive);
+
+        /*
+         * TODO: speed > XFER_UDMA_2 extra check is needed to avoid false
+         * cable warning from eighty_ninty_three(), moving ide_rate_filter()
+         * calls from ->speedproc to core code will make this hack go away
+         */
+        if (speed > XFER_UDMA_2) {
+                if ((mask & 0x78) && (eighty_ninty_three(drive) == 0))
+                        mask &= 0x07;
+        }
+
+        if (mask)
+                mode = fls(mask) - 1 + XFER_UDMA_0;
 
 //      printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);
 
-        /* So that we remember to update this if new modes appear */
-        BUG_ON(mode > 4);
-        return min(speed, speed_max[mode]);
+        return min(speed, mode);
 #else /* !CONFIG_BLK_DEV_IDEDMA */
         return min(speed, (u8)XFER_PIO_4);
 #endif /* CONFIG_BLK_DEV_IDEDMA */
@@ -193,18 +111,6 @@ u8 ide_rate_filter (u8 mode, u8 speed)
 
 EXPORT_SYMBOL(ide_rate_filter);
 
-int ide_dma_enable (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct hd_driveid *id   = drive->id;
-
-        return ((int)   ((((id->dma_ultra >> 8) & hwif->ultra_mask) ||
-                          ((id->dma_mword >> 8) & hwif->mwdma_mask) ||
-                          ((id->dma_1word >> 8) & hwif->swdma_mask)) ? 1 : 0));
-}
-
-EXPORT_SYMBOL(ide_dma_enable);
-
 int ide_use_fast_pio(ide_drive_t *drive)
 {
         struct hd_driveid *id = drive->id;
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 98410ca044cf..2b8009c50e91 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -42,7 +42,7 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id
         hw.irq = pnp_irq(dev, 0);
         hw.dma = NO_DMA;
 
-        index = ide_register_hw(&hw, &hwif);
+        index = ide_register_hw(&hw, 1, &hwif);
 
         if (index != -1) {
                 printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 8f15c23aa70d..3cebed77f55d 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1427,6 +1427,9 @@ int ideprobe_init (void)
                                 }
                 }
         }
+        for (index = 0; index < MAX_HWIFS; ++index)
+                if (probe[index])
+                        ide_proc_register_port(&ide_hwifs[index]);
         return 0;
 }
 
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index a9e0b30fb1f2..d50bd996ff22 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -3,6 +3,8 @@
  *
  *  Copyright (C) 1997-1998     Mark Lord
  *  Copyright (C) 2003          Red Hat <alan@redhat.com>
+ *
+ *  Some code was moved here from ide.c, see it for original copyrights.
  */
 
 /*
@@ -37,6 +39,8 @@
 
 #include <asm/io.h>
 
+static struct proc_dir_entry *proc_ide_root;
+
 static int proc_ide_read_imodel
         (char *page, char **start, off_t off, int count, int *eof, void *data)
 {
@@ -121,6 +125,265 @@ static int proc_ide_read_identify
         PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
 }
 
+/**
+ *      __ide_add_setting       -       add an ide setting option
+ *      @drive: drive to use
+ *      @name: setting name
+ *      @rw: true if the function is read write
+ *      @data_type: type of data
+ *      @min: range minimum
+ *      @max: range maximum
+ *      @mul_factor: multiplication scale
+ *      @div_factor: divison scale
+ *      @data: private data field
+ *      @set: setting
+ *      @auto_remove: setting auto removal flag
+ *
+ *      Removes the setting named from the device if it is present.
+ *      The function takes the settings_lock to protect against
+ *      parallel changes. This function must not be called from IRQ
+ *      context. Returns 0 on success or -1 on failure.
+ *
+ *      BUGS: This code is seriously over-engineered. There is also
+ *      magic about how the driver specific features are setup. If
+ *      a driver is attached we assume the driver settings are auto
+ *      remove.
+ */
+
+static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set, int auto_remove)
+{
+        ide_settings_t **p = (ide_settings_t **) &drive->settings, *setting = NULL;
+
+        down(&ide_setting_sem);
+        while ((*p) && strcmp((*p)->name, name) < 0)
+                p = &((*p)->next);
+        if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
+                goto abort;
+        if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
+                goto abort;
+        strcpy(setting->name, name);
+        setting->rw = rw;
+        setting->data_type = data_type;
+        setting->min = min;
+        setting->max = max;
+        setting->mul_factor = mul_factor;
+        setting->div_factor = div_factor;
+        setting->data = data;
+        setting->set = set;
+
+        setting->next = *p;
+        if (auto_remove)
+                setting->auto_remove = 1;
+        *p = setting;
+        up(&ide_setting_sem);
+        return 0;
+abort:
+        up(&ide_setting_sem);
+        kfree(setting);
+        return -1;
+}
+
+int ide_add_setting(ide_drive_t *drive, const char *name, int rw, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set)
+{
+        return __ide_add_setting(drive, name, rw, data_type, min, max, mul_factor, div_factor, data, set, 1);
+}
+
+EXPORT_SYMBOL(ide_add_setting);
+
+/**
+ *      __ide_remove_setting    -       remove an ide setting option
+ *      @drive: drive to use
+ *      @name: setting name
+ *
+ *      Removes the setting named from the device if it is present.
+ *      The caller must hold the setting semaphore.
+ */
+
+static void __ide_remove_setting (ide_drive_t *drive, char *name)
+{
+        ide_settings_t **p, *setting;
+
+        p = (ide_settings_t **) &drive->settings;
+
+        while ((*p) && strcmp((*p)->name, name))
+                p = &((*p)->next);
+        if ((setting = (*p)) == NULL)
+                return;
+
+        (*p) = setting->next;
+
+        kfree(setting->name);
+        kfree(setting);
+}
+
+/**
+ *      auto_remove_settings    -       remove driver specific settings
+ *      @drive: drive
+ *
+ *      Automatically remove all the driver specific settings for this
+ *      drive. This function may not be called from IRQ context. The
+ *      caller must hold ide_setting_sem.
+ */
+
+static void auto_remove_settings (ide_drive_t *drive)
+{
+        ide_settings_t *setting;
+repeat:
+        setting = drive->settings;
+        while (setting) {
+                if (setting->auto_remove) {
+                        __ide_remove_setting(drive, setting->name);
+                        goto repeat;
+                }
+                setting = setting->next;
+        }
+}
+
+/**
+ *      ide_find_setting_by_name        -       find a drive specific setting
+ *      @drive: drive to scan
+ *      @name: setting name
+ *
+ *      Scan's the device setting table for a matching entry and returns
+ *      this or NULL if no entry is found. The caller must hold the
+ *      setting semaphore
+ */
+
+static ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name)
+{
+        ide_settings_t *setting = drive->settings;
+
+        while (setting) {
+                if (strcmp(setting->name, name) == 0)
+                        break;
+                setting = setting->next;
+        }
+        return setting;
+}
+
+/**
+ *      ide_read_setting        -       read an IDE setting
+ *      @drive: drive to read from
+ *      @setting: drive setting
+ *
+ *      Read a drive setting and return the value. The caller
+ *      must hold the ide_setting_sem when making this call.
+ *
+ *      BUGS: the data return and error are the same return value
+ *      so an error -EINVAL and true return of the same value cannot
+ *      be told apart
+ */
+
+static int ide_read_setting(ide_drive_t *drive, ide_settings_t *setting)
+{
+        int             val = -EINVAL;
+        unsigned long   flags;
+
+        if ((setting->rw & SETTING_READ)) {
+                spin_lock_irqsave(&ide_lock, flags);
+                switch(setting->data_type) {
+                        case TYPE_BYTE:
+                                val = *((u8 *) setting->data);
+                                break;
+                        case TYPE_SHORT:
+                                val = *((u16 *) setting->data);
+                                break;
+                        case TYPE_INT:
+                                val = *((u32 *) setting->data);
+                                break;
+                }
+                spin_unlock_irqrestore(&ide_lock, flags);
+        }
+        return val;
+}
+
+/**
+ *      ide_write_setting       -       read an IDE setting
+ *      @drive: drive to read from
+ *      @setting: drive setting
+ *      @val: value
+ *
+ *      Write a drive setting if it is possible. The caller
+ *      must hold the ide_setting_sem when making this call.
+ *
+ *      BUGS: the data return and error are the same return value
+ *      so an error -EINVAL and true return of the same value cannot
+ *      be told apart
+ *
+ *      FIXME:  This should be changed to enqueue a special request
+ *      to the driver to change settings, and then wait on a sema for completion.
+ *      The current scheme of polling is kludgy, though safe enough.
+ */
+
+static int ide_write_setting(ide_drive_t *drive, ide_settings_t *setting, int val)
+{
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+        if (setting->set)
+                return setting->set(drive, val);
+        if (!(setting->rw & SETTING_WRITE))
+                return -EPERM;
+        if (val < setting->min || val > setting->max)
+                return -EINVAL;
+        if (ide_spin_wait_hwgroup(drive))
+                return -EBUSY;
+        switch (setting->data_type) {
+                case TYPE_BYTE:
+                        *((u8 *) setting->data) = val;
+                        break;
+                case TYPE_SHORT:
+                        *((u16 *) setting->data) = val;
+                        break;
+                case TYPE_INT:
+                        *((u32 *) setting->data) = val;
+                        break;
+        }
+        spin_unlock_irq(&ide_lock);
+        return 0;
+}
+
+static int set_xfer_rate (ide_drive_t *drive, int arg)
+{
+        int err;
+
+        if (arg < 0 || arg > 70)
+                return -EINVAL;
+
+        err = ide_wait_cmd(drive,
+                        WIN_SETFEATURES, (u8) arg,
+                        SETFEATURES_XFER, 0, NULL);
+
+        if (!err && arg) {
+                ide_set_xfer_rate(drive, (u8) arg);
+                ide_driveid_update(drive);
+        }
+        return err;
+}
+
+/**
+ *      ide_add_generic_settings        -       generic ide settings
+ *      @drive: drive being configured
+ *
+ *      Add the generic parts of the system settings to the /proc files.
+ *      The caller must not be holding the ide_setting_sem.
+ */
+
+void ide_add_generic_settings (ide_drive_t *drive)
+{
+/*
+ *                        drive         setting name            read/write access                               data type       min     max                             mul_factor      div_factor      data pointer                    set function
+ */
+        __ide_add_setting(drive,        "io_32bit",             drive->no_io_32bit ? SETTING_READ : SETTING_RW, TYPE_BYTE,      0,      1 + (SUPPORT_VLB_SYNC << 1),    1,              1,              &drive->io_32bit,               set_io_32bit,   0);
+        __ide_add_setting(drive,        "keepsettings",         SETTING_RW,                                     TYPE_BYTE,      0,      1,                              1,              1,              &drive->keep_settings,          NULL,           0);
+        __ide_add_setting(drive,        "nice1",                SETTING_RW,                                     TYPE_BYTE,      0,      1,                              1,              1,              &drive->nice1,                  NULL,           0);
+        __ide_add_setting(drive,        "pio_mode",             SETTING_WRITE,                                  TYPE_BYTE,      0,      255,                            1,              1,              NULL,                           set_pio_mode,   0);
+        __ide_add_setting(drive,        "unmaskirq",            drive->no_unmask ? SETTING_READ : SETTING_RW,   TYPE_BYTE,      0,      1,                              1,              1,              &drive->unmask,                 NULL,           0);
+        __ide_add_setting(drive,        "using_dma",            SETTING_RW,                                     TYPE_BYTE,      0,      1,                              1,              1,              &drive->using_dma,              set_using_dma,  0);
+        __ide_add_setting(drive,        "init_speed",           SETTING_RW,                                     TYPE_BYTE,      0,      70,                             1,              1,              &drive->init_speed,             NULL,           0);
+        __ide_add_setting(drive,        "current_speed",        SETTING_RW,                                     TYPE_BYTE,      0,      70,                             1,              1,              &drive->current_speed,          set_xfer_rate,  0);
+        __ide_add_setting(drive,        "number",               SETTING_RW,                                     TYPE_BYTE,      0,      3,                              1,              1,              &drive->dn,                     NULL,           0);
+}
+
 static void proc_ide_settings_warn(void)
 {
         static int warned = 0;
@@ -399,7 +662,7 @@ static ide_proc_entry_t generic_drive_entries[] = {
         { NULL, 0, NULL, NULL }
 };
 
-void ide_add_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p, void *data)
+static void ide_add_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p, void *data)
 {
         struct proc_dir_entry *ent;
 
@@ -415,7 +678,7 @@ void ide_add_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p, void
         }
 }
 
-void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p)
+static void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p)
 {
         if (!dir || !p)
                 return;
@@ -425,6 +688,51 @@ void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p)
         }
 }
 
+void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver)
+{
+        ide_add_proc_entries(drive->proc, driver->proc, drive);
+}
+
+EXPORT_SYMBOL(ide_proc_register_driver);
+
+/**
+ *      ide_proc_unregister_driver      -       remove driver specific data
+ *      @drive: drive
+ *      @driver: driver
+ *
+ *      Clean up the driver specific /proc files and IDE settings
+ *      for a given drive.
+ *
+ *      Takes ide_setting_sem and ide_lock.
+ *      Caller must hold none of the locks.
+ */
+
+void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver)
+{
+        unsigned long flags;
+
+        ide_remove_proc_entries(drive->proc, driver->proc);
+
+        down(&ide_setting_sem);
+        spin_lock_irqsave(&ide_lock, flags);
+        /*
+         * ide_setting_sem protects the settings list
+         * ide_lock protects the use of settings
+         *
+         * so we need to hold both, ide_settings_sem because we want to
+         * modify the settings list, and ide_lock because we cannot take
+         * a setting out that is being used.
+         *
+         * OTOH both ide_{read,write}_setting are only ever used under
+         * ide_setting_sem.
+         */
+        auto_remove_settings(drive);
+        spin_unlock_irqrestore(&ide_lock, flags);
+        up(&ide_setting_sem);
+}
+
+EXPORT_SYMBOL(ide_proc_unregister_driver);
+
 static void create_proc_ide_drives(ide_hwif_t *hwif)
 {
         int     d;
@@ -477,26 +785,24 @@ static ide_proc_entry_t hwif_entries[] = {
         { NULL, 0, NULL, NULL }
 };
 
-void create_proc_ide_interfaces(void)
+void ide_proc_register_port(ide_hwif_t *hwif)
 {
-        int     h;
+        if (!hwif->present)
+                return;
 
-        for (h = 0; h < MAX_HWIFS; h++) {
-                ide_hwif_t *hwif = &ide_hwifs[h];
+        if (!hwif->proc) {
+                hwif->proc = proc_mkdir(hwif->name, proc_ide_root);
 
-                if (!hwif->present)
-                        continue;
-                if (!hwif->proc) {
-                        hwif->proc = proc_mkdir(hwif->name, proc_ide_root);
-                        if (!hwif->proc)
-                                return;
-                        ide_add_proc_entries(hwif->proc, hwif_entries, hwif);
-                }
-                create_proc_ide_drives(hwif);
+                if (!hwif->proc)
+                        return;
+
+                ide_add_proc_entries(hwif->proc, hwif_entries, hwif);
         }
+
+        create_proc_ide_drives(hwif);
 }
 
-EXPORT_SYMBOL(create_proc_ide_interfaces);
+EXPORT_SYMBOL_GPL(ide_proc_register_port);
 
 #ifdef CONFIG_BLK_DEV_IDEPCI
 void ide_pci_create_host_proc(const char *name, get_info_t *get_info)
@@ -507,7 +813,7 @@ void ide_pci_create_host_proc(const char *name, get_info_t *get_info)
 EXPORT_SYMBOL_GPL(ide_pci_create_host_proc);
 #endif
 
-void destroy_proc_ide_interface(ide_hwif_t *hwif)
+void ide_proc_unregister_port(ide_hwif_t *hwif)
 {
         if (hwif->proc) {
                 destroy_proc_ide_drives(hwif);
@@ -554,11 +860,11 @@ void proc_ide_create(void)
 {
         struct proc_dir_entry *entry;
 
+        proc_ide_root = proc_mkdir("ide", NULL);
+
         if (!proc_ide_root)
                 return;
 
-        create_proc_ide_interfaces();
-
         entry = create_proc_entry("drivers", 0, proc_ide_root);
         if (entry)
                 entry->proc_fops = &ide_drivers_operations;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 4e59239fef75..e82bfa5e0ab8 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -4561,28 +4561,33 @@ static void idetape_get_blocksize_from_block_descriptor(ide_drive_t *drive)
         printk(KERN_INFO "ide-tape: Adjusted block size - %d\n", tape->tape_block_size);
 #endif /* IDETAPE_DEBUG_INFO */
 }
+
+#ifdef CONFIG_IDE_PROC_FS
 static void idetape_add_settings (ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
 
 /*
- *                      drive   setting name    read/write      ioctl   ioctl           data type       min                     max                     mul_factor                      div_factor                      data pointer                            set function
+ *                      drive   setting name            read/write      data type       min                     max                     mul_factor                      div_factor      data pointer                            set function
  */
-        ide_add_setting(drive,  "buffer",       SETTING_READ,   -1,     -1,             TYPE_SHORT,     0,                      0xffff,                 1,                              2,                              &tape->capabilities.buffer_size,        NULL);
-        ide_add_setting(drive,  "pipeline_min", SETTING_RW,     -1,     -1,             TYPE_INT,       1,                      0xffff,                 tape->stage_size / 1024,        1,                              &tape->min_pipeline,                    NULL);
-        ide_add_setting(drive,  "pipeline",     SETTING_RW,     -1,     -1,             TYPE_INT,       1,                      0xffff,                 tape->stage_size / 1024,        1,                              &tape->max_stages,                      NULL);
-        ide_add_setting(drive,  "pipeline_max", SETTING_RW,     -1,     -1,             TYPE_INT,       1,                      0xffff,                 tape->stage_size / 1024,        1,                              &tape->max_pipeline,                    NULL);
-        ide_add_setting(drive,  "pipeline_used",SETTING_READ,   -1,     -1,             TYPE_INT,       0,                      0xffff,                 tape->stage_size / 1024,        1,                              &tape->nr_stages,                       NULL);
-        ide_add_setting(drive,  "pipeline_pending",SETTING_READ,-1,     -1,             TYPE_INT,       0,                      0xffff,                 tape->stage_size / 1024,        1,                              &tape->nr_pending_stages,               NULL);
-        ide_add_setting(drive,  "speed",        SETTING_READ,   -1,     -1,             TYPE_SHORT,     0,                      0xffff,                 1,                              1,                              &tape->capabilities.speed,              NULL);
-        ide_add_setting(drive,  "stage",        SETTING_READ,   -1,     -1,             TYPE_INT,       0,                      0xffff,                 1,                              1024,                           &tape->stage_size,                      NULL);
-        ide_add_setting(drive,  "tdsc",         SETTING_RW,     -1,     -1,             TYPE_INT,       IDETAPE_DSC_RW_MIN,     IDETAPE_DSC_RW_MAX,     1000,                           HZ,                             &tape->best_dsc_rw_frequency,           NULL);
-        ide_add_setting(drive,  "dsc_overlap",  SETTING_RW,     -1,     -1,             TYPE_BYTE,      0,                      1,                      1,                              1,                              &drive->dsc_overlap,                    NULL);
-        ide_add_setting(drive,  "pipeline_head_speed_c",SETTING_READ,   -1,     -1,     TYPE_INT,       0,                      0xffff,                 1,                              1,                              &tape->controlled_pipeline_head_speed,  NULL);
-        ide_add_setting(drive,  "pipeline_head_speed_u",SETTING_READ,   -1,     -1,     TYPE_INT,       0,                      0xffff,                 1,                              1,                              &tape->uncontrolled_pipeline_head_speed,        NULL);
-        ide_add_setting(drive,  "avg_speed",    SETTING_READ,   -1,     -1,             TYPE_INT,       0,                      0xffff,                 1,                              1,                              &tape->avg_speed,               NULL);
-        ide_add_setting(drive,  "debug_level",SETTING_RW,       -1,     -1,             TYPE_INT,       0,                      0xffff,                 1,                              1,                              &tape->debug_level,             NULL);
+        ide_add_setting(drive,  "buffer",               SETTING_READ,   TYPE_SHORT,     0,                      0xffff,                 1,                              2,              &tape->capabilities.buffer_size,        NULL);
+        ide_add_setting(drive,  "pipeline_min",         SETTING_RW,     TYPE_INT,       1,                      0xffff,                 tape->stage_size / 1024,        1,              &tape->min_pipeline,                    NULL);
+        ide_add_setting(drive,  "pipeline",             SETTING_RW,     TYPE_INT,       1,                      0xffff,                 tape->stage_size / 1024,        1,              &tape->max_stages,                      NULL);
+        ide_add_setting(drive,  "pipeline_max",         SETTING_RW,     TYPE_INT,       1,                      0xffff,                 tape->stage_size / 1024,        1,              &tape->max_pipeline,                    NULL);
+        ide_add_setting(drive,  "pipeline_used",        SETTING_READ,   TYPE_INT,       0,                      0xffff,                 tape->stage_size / 1024,        1,              &tape->nr_stages,                       NULL);
+        ide_add_setting(drive,  "pipeline_pending",     SETTING_READ,   TYPE_INT,       0,                      0xffff,                 tape->stage_size / 1024,        1,              &tape->nr_pending_stages,               NULL);
+        ide_add_setting(drive,  "speed",                SETTING_READ,   TYPE_SHORT,     0,                      0xffff,                 1,                              1,              &tape->capabilities.speed,              NULL);
+        ide_add_setting(drive,  "stage",                SETTING_READ,   TYPE_INT,       0,                      0xffff,                 1,                              1024,           &tape->stage_size,                      NULL);
+        ide_add_setting(drive,  "tdsc",                 SETTING_RW,     TYPE_INT,       IDETAPE_DSC_RW_MIN,     IDETAPE_DSC_RW_MAX,     1000,                           HZ,             &tape->best_dsc_rw_frequency,           NULL);
+        ide_add_setting(drive,  "dsc_overlap",          SETTING_RW,     TYPE_BYTE,      0,                      1,                      1,                              1,              &drive->dsc_overlap,                    NULL);
+        ide_add_setting(drive,  "pipeline_head_speed_c",SETTING_READ,   TYPE_INT,       0,                      0xffff,                 1,                              1,              &tape->controlled_pipeline_head_speed,  NULL);
+        ide_add_setting(drive,  "pipeline_head_speed_u",SETTING_READ,   TYPE_INT,       0,                      0xffff,                 1,                              1,              &tape->uncontrolled_pipeline_head_speed,NULL);
+        ide_add_setting(drive,  "avg_speed",            SETTING_READ,   TYPE_INT,       0,                      0xffff,                 1,                              1,              &tape->avg_speed,                       NULL);
+        ide_add_setting(drive,  "debug_level",          SETTING_RW,     TYPE_INT,       0,                      0xffff,                 1,                              1,              &tape->debug_level,                     NULL);
 }
+#else
+static inline void idetape_add_settings(ide_drive_t *drive) { ; }
+#endif
 
 /*
  *      ide_setup is called to:
@@ -4703,7 +4708,7 @@ static void ide_tape_remove(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
 
-        ide_unregister_subdriver(drive, tape->driver);
+        ide_proc_unregister_driver(drive, tape->driver);
 
         ide_unregister_region(tape->disk);
 
@@ -4730,8 +4735,7 @@ static void ide_tape_release(struct kref *kref)
         kfree(tape);
 }
 
-#ifdef CONFIG_PROC_FS
-
+#ifdef CONFIG_IDE_PROC_FS
 static int proc_idetape_read_name
         (char *page, char **start, off_t off, int count, int *eof, void *data)
 {
@@ -4749,11 +4753,6 @@ static ide_proc_entry_t idetape_proc[] = {
         { "name",       S_IFREG|S_IRUGO,        proc_idetape_read_name, NULL },
         { NULL, 0, NULL, NULL }
 };
-
-#else
-
-#define idetape_proc    NULL
-
 #endif
 
 static int ide_tape_probe(ide_drive_t *);
@@ -4773,7 +4772,9 @@ static ide_driver_t idetape_driver = {
         .end_request            = idetape_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
+#ifdef CONFIG_IDE_PROC_FS
         .proc                   = idetape_proc,
+#endif
 };
 
 /*
@@ -4864,7 +4865,7 @@ static int ide_tape_probe(ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        ide_register_subdriver(drive, &idetape_driver);
+        ide_proc_register_driver(drive, &idetape_driver);
 
         kref_init(&tape->kref);
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index ae5bf2be6f52..6002713a20a1 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -168,12 +168,11 @@ static const u8 ide_hwif_to_major[] = { IDE0_MAJOR, IDE1_MAJOR,
 
 static int idebus_parameter;    /* holds the "idebus=" parameter */
 static int system_bus_speed;    /* holds what we think is VESA/PCI bus speed */
-static int initializing;        /* set while initializing built-in drivers */
 
 DECLARE_MUTEX(ide_cfg_sem);
  __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);
 
-#ifdef CONFIG_BLK_DEV_IDEPCI
+#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
 static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
 #endif
 
@@ -216,9 +215,6 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
         hwif->bus_state = BUSSTATE_ON;
 
         hwif->atapi_dma = 0;            /* disable all atapi dma */ 
-        hwif->ultra_mask = 0x80;        /* disable all ultra */
-        hwif->mwdma_mask = 0x80;        /* disable all mwdma */
-        hwif->swdma_mask = 0x80;        /* disable all swdma */
 
         init_completion(&hwif->gendev_rel_comp);
 
@@ -305,9 +301,7 @@ static void __init init_ide_data (void)
 #endif
         }
 #ifdef CONFIG_IDE_ARM
-        initializing = 1;
         ide_arm_init();
-        initializing = 0;
 #endif
 }
 
@@ -353,10 +347,6 @@ static int ide_system_bus_speed(void)
         return system_bus_speed;
 }
 
-#ifdef CONFIG_PROC_FS
-struct proc_dir_entry *proc_ide_root;
-#endif
-
 static struct resource* hwif_request_region(ide_hwif_t *hwif,
                                             unsigned long addr, int num)
 {
@@ -480,6 +470,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
 
         hwif->tuneproc                  = tmp_hwif->tuneproc;
         hwif->speedproc                 = tmp_hwif->speedproc;
+        hwif->udma_filter               = tmp_hwif->udma_filter;
         hwif->selectproc                = tmp_hwif->selectproc;
         hwif->reset_poll                = tmp_hwif->reset_poll;
         hwif->pre_reset                 = tmp_hwif->pre_reset;
@@ -599,7 +590,7 @@ void ide_unregister(unsigned int index)
 
         spin_unlock_irq(&ide_lock);
 
-        destroy_proc_ide_interface(hwif);
+        ide_proc_unregister_port(hwif);
 
         hwgroup = hwif->hwgroup;
         /*
@@ -751,6 +742,7 @@ void ide_setup_ports (	hw_regs_t *hw,
 /**
  *      ide_register_hw_with_fixup      -       register IDE interface
  *      @hw: hardware registers
+ *      @initializing: set while initializing built-in drivers
  *      @hwifp: pointer to returned hwif
  *      @fixup: fixup function
  *
@@ -760,7 +752,9 @@ void ide_setup_ports (	hw_regs_t *hw,
  *      Returns -1 on error.
  */
 
-int ide_register_hw_with_fixup(hw_regs_t *hw, ide_hwif_t **hwifp, void(*fixup)(ide_hwif_t *hwif))
+int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
+                               ide_hwif_t **hwifp,
+                               void(*fixup)(ide_hwif_t *hwif))
 {
         int index, retry = 1;
         ide_hwif_t *hwif;
@@ -801,7 +795,7 @@ found:
 
         if (!initializing) {
                 probe_hwif_init_with_fixup(hwif, fixup);
-                create_proc_ide_interfaces();
+                ide_proc_register_port(hwif);
         }
 
         if (hwifp)
@@ -812,9 +806,9 @@ found:
 
 EXPORT_SYMBOL(ide_register_hw_with_fixup);
 
-int ide_register_hw(hw_regs_t *hw, ide_hwif_t **hwifp)
+int ide_register_hw(hw_regs_t *hw, int initializing, ide_hwif_t **hwifp)
 {
-        return ide_register_hw_with_fixup(hw, hwifp, NULL);
+        return ide_register_hw_with_fixup(hw, initializing, hwifp, NULL);
 }
 
 EXPORT_SYMBOL(ide_register_hw);
@@ -825,205 +819,7 @@ EXPORT_SYMBOL(ide_register_hw);
 
 DECLARE_MUTEX(ide_setting_sem);
 
-/**
- *      __ide_add_setting       -       add an ide setting option
- *      @drive: drive to use
- *      @name: setting name
- *      @rw: true if the function is read write
- *      @read_ioctl: function to call on read
- *      @write_ioctl: function to call on write
- *      @data_type: type of data
- *      @min: range minimum
- *      @max: range maximum
- *      @mul_factor: multiplication scale
- *      @div_factor: divison scale
- *      @data: private data field
- *      @set: setting
- *      @auto_remove: setting auto removal flag
- *
- *      Removes the setting named from the device if it is present.
- *      The function takes the settings_lock to protect against 
- *      parallel changes. This function must not be called from IRQ
- *      context. Returns 0 on success or -1 on failure.
- *
- *      BUGS: This code is seriously over-engineered. There is also
- *      magic about how the driver specific features are setup. If
- *      a driver is attached we assume the driver settings are auto
- *      remove.
- */
-
-static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int read_ioctl, int write_ioctl, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set, int auto_remove)
-{
-        ide_settings_t **p = (ide_settings_t **) &drive->settings, *setting = NULL;
-
-        down(&ide_setting_sem);
-        while ((*p) && strcmp((*p)->name, name) < 0)
-                p = &((*p)->next);
-        if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
-                goto abort;
-        if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
-                goto abort;
-        strcpy(setting->name, name);
-        setting->rw = rw;
-        setting->read_ioctl = read_ioctl;
-        setting->write_ioctl = write_ioctl;
-        setting->data_type = data_type;
-        setting->min = min;
-        setting->max = max;
-        setting->mul_factor = mul_factor;
-        setting->div_factor = div_factor;
-        setting->data = data;
-        setting->set = set;
-        
-        setting->next = *p;
-        if (auto_remove)
-                setting->auto_remove = 1;
-        *p = setting;
-        up(&ide_setting_sem);
-        return 0;
-abort:
-        up(&ide_setting_sem);
-        kfree(setting);
-        return -1;
-}
-
-int ide_add_setting(ide_drive_t *drive, const char *name, int rw, int read_ioctl, int write_ioctl, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set)
-{
-        return __ide_add_setting(drive, name, rw, read_ioctl, write_ioctl, data_type, min, max, mul_factor, div_factor, data, set, 1);
-}
-
-EXPORT_SYMBOL(ide_add_setting);
-
-/**
- *      __ide_remove_setting    -       remove an ide setting option
- *      @drive: drive to use
- *      @name: setting name
- *
- *      Removes the setting named from the device if it is present.
- *      The caller must hold the setting semaphore.
- */
- 
-static void __ide_remove_setting (ide_drive_t *drive, char *name)
-{
-        ide_settings_t **p, *setting;
-
-        p = (ide_settings_t **) &drive->settings;
-
-        while ((*p) && strcmp((*p)->name, name))
-                p = &((*p)->next);
-        if ((setting = (*p)) == NULL)
-                return;
-
-        (*p) = setting->next;
-        
-        kfree(setting->name);
-        kfree(setting);
-}
-
-/**
- *      ide_find_setting_by_ioctl       -       find a drive specific ioctl
- *      @drive: drive to scan
- *      @cmd: ioctl command to handle
- *
- *      Scan's the device setting table for a matching entry and returns
- *      this or NULL if no entry is found. The caller must hold the
- *      setting semaphore
- */
- 
-static ide_settings_t *ide_find_setting_by_ioctl (ide_drive_t *drive, int cmd)
-{
-        ide_settings_t *setting = drive->settings;
-
-        while (setting) {
-                if (setting->read_ioctl == cmd || setting->write_ioctl == cmd)
-                        break;
-                setting = setting->next;
-        }
-        
-        return setting;
-}
-
-/**
- *      ide_find_setting_by_name        -       find a drive specific setting
- *      @drive: drive to scan
- *      @name: setting name
- *
- *      Scan's the device setting table for a matching entry and returns
- *      this or NULL if no entry is found. The caller must hold the
- *      setting semaphore
- */
- 
-ide_settings_t *ide_find_setting_by_name (ide_drive_t *drive, char *name)
-{
-        ide_settings_t *setting = drive->settings;
-
-        while (setting) {
-                if (strcmp(setting->name, name) == 0)
-                        break;
-                setting = setting->next;
-        }
-        return setting;
-}
-
-/**
- *      auto_remove_settings    -       remove driver specific settings
- *      @drive: drive
- *
- *      Automatically remove all the driver specific settings for this
- *      drive. This function may not be called from IRQ context. The
- *      caller must hold ide_setting_sem.
- */
- 
-static void auto_remove_settings (ide_drive_t *drive)
-{
-        ide_settings_t *setting;
-repeat:
-        setting = drive->settings;
-        while (setting) {
-                if (setting->auto_remove) {
-                        __ide_remove_setting(drive, setting->name);
-                        goto repeat;
-                }
-                setting = setting->next;
-        }
-}
-
-/**
- *      ide_read_setting        -       read an IDE setting
- *      @drive: drive to read from
- *      @setting: drive setting
- *
- *      Read a drive setting and return the value. The caller
- *      must hold the ide_setting_sem when making this call.
- *
- *      BUGS: the data return and error are the same return value
- *      so an error -EINVAL and true return of the same value cannot
- *      be told apart
- */
- 
-int ide_read_setting (ide_drive_t *drive, ide_settings_t *setting)
-{
-        int             val = -EINVAL;
-        unsigned long   flags;
-
-        if ((setting->rw & SETTING_READ)) {
-                spin_lock_irqsave(&ide_lock, flags);
-                switch(setting->data_type) {
-                        case TYPE_BYTE:
-                                val = *((u8 *) setting->data);
-                                break;
-                        case TYPE_SHORT:
-                                val = *((u16 *) setting->data);
-                                break;
-                        case TYPE_INT:
-                        case TYPE_INTA:
-                                val = *((u32 *) setting->data);
-                                break;
-                }
-                spin_unlock_irqrestore(&ide_lock, flags);
-        }
-        return val;
-}
+EXPORT_SYMBOL_GPL(ide_setting_sem);
 
 /**
  *      ide_spin_wait_hwgroup   -       wait for group
@@ -1058,61 +854,14 @@ int ide_spin_wait_hwgroup (ide_drive_t *drive)
 
 EXPORT_SYMBOL(ide_spin_wait_hwgroup);
 
-/**
- *      ide_write_setting       -       read an IDE setting
- *      @drive: drive to read from
- *      @setting: drive setting
- *      @val: value
- *
- *      Write a drive setting if it is possible. The caller
- *      must hold the ide_setting_sem when making this call.
- *
- *      BUGS: the data return and error are the same return value
- *      so an error -EINVAL and true return of the same value cannot
- *      be told apart
- *
- *      FIXME:  This should be changed to enqueue a special request
- *      to the driver to change settings, and then wait on a sema for completion.
- *      The current scheme of polling is kludgy, though safe enough.
- */
-
-int ide_write_setting (ide_drive_t *drive, ide_settings_t *setting, int val)
+int set_io_32bit(ide_drive_t *drive, int arg)
 {
-        int i;
-        u32 *p;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-        if (!(setting->rw & SETTING_WRITE))
+        if (drive->no_io_32bit)
                 return -EPERM;
-        if (val < setting->min || val > setting->max)
+
+        if (arg < 0 || arg > 1 + (SUPPORT_VLB_SYNC << 1))
                 return -EINVAL;
-        if (setting->set)
-                return setting->set(drive, val);
-        if (ide_spin_wait_hwgroup(drive))
-                return -EBUSY;
-        switch (setting->data_type) {
-                case TYPE_BYTE:
-                        *((u8 *) setting->data) = val;
-                        break;
-                case TYPE_SHORT:
-                        *((u16 *) setting->data) = val;
-                        break;
-                case TYPE_INT:
-                        *((u32 *) setting->data) = val;
-                        break;
-                case TYPE_INTA:
-                        p = (u32 *) setting->data;
-                        for (i = 0; i < 1 << PARTN_BITS; i++, p++)
-                                *p = val;
-                        break;
-        }
-        spin_unlock_irq(&ide_lock);
-        return 0;
-}
 
-static int set_io_32bit(ide_drive_t *drive, int arg)
-{
         drive->io_32bit = arg;
 #ifdef CONFIG_BLK_DEV_DTC2278
         if (HWIF(drive)->chipset == ide_dtc2278)
@@ -1121,12 +870,28 @@ static int set_io_32bit(ide_drive_t *drive, int arg)
         return 0;
 }
 
-static int set_using_dma (ide_drive_t *drive, int arg)
+static int set_ksettings(ide_drive_t *drive, int arg)
+{
+        if (arg < 0 || arg > 1)
+                return -EINVAL;
+
+        if (ide_spin_wait_hwgroup(drive))
+                return -EBUSY;
+        drive->keep_settings = arg;
+        spin_unlock_irq(&ide_lock);
+
+        return 0;
+}
+
+int set_using_dma(ide_drive_t *drive, int arg)
 {
 #ifdef CONFIG_BLK_DEV_IDEDMA
         ide_hwif_t *hwif = drive->hwif;
         int err = -EPERM;
 
+        if (arg < 0 || arg > 1)
+                return -EINVAL;
+
         if (!drive->id || !(drive->id->capability & 1))
                 goto out;
 
@@ -1145,6 +910,7 @@ static int set_using_dma (ide_drive_t *drive, int arg)
         err = 0;
 
         if (arg) {
+                hwif->dma_off_quietly(drive);
                 if (ide_set_dma(drive) || hwif->ide_dma_on(drive))
                         err = -EIO;
         } else
@@ -1159,14 +925,20 @@ static int set_using_dma (ide_drive_t *drive, int arg)
 out:
         return err;
 #else
+        if (arg < 0 || arg > 1)
+                return -EINVAL;
+
         return -EPERM;
 #endif
 }
 
-static int set_pio_mode (ide_drive_t *drive, int arg)
+int set_pio_mode(ide_drive_t *drive, int arg)
 {
         struct request rq;
 
+        if (arg < 0 || arg > 255)
+                return -EINVAL;
+
         if (!HWIF(drive)->tuneproc)
                 return -ENOSYS;
         if (drive->special.b.set_tune)
@@ -1178,42 +950,20 @@ static int set_pio_mode (ide_drive_t *drive, int arg)
         return 0;
 }
 
-static int set_xfer_rate (ide_drive_t *drive, int arg)
+static int set_unmaskirq(ide_drive_t *drive, int arg)
 {
-        int err = ide_wait_cmd(drive,
-                        WIN_SETFEATURES, (u8) arg,
-                        SETFEATURES_XFER, 0, NULL);
+        if (drive->no_unmask)
+                return -EPERM;
 
-        if (!err && arg) {
-                ide_set_xfer_rate(drive, (u8) arg);
-                ide_driveid_update(drive);
-        }
-        return err;
-}
+        if (arg < 0 || arg > 1)
+                return -EINVAL;
 
-/**
- *      ide_add_generic_settings        -       generic ide settings
- *      @drive: drive being configured
- *
- *      Add the generic parts of the system settings to the /proc files and
- *      ioctls for this IDE device. The caller must not be holding the
- *      ide_setting_sem.
- */
+        if (ide_spin_wait_hwgroup(drive))
+                return -EBUSY;
+        drive->unmask = arg;
+        spin_unlock_irq(&ide_lock);
 
-void ide_add_generic_settings (ide_drive_t *drive)
-{
-/*
- *                        drive         setting name            read/write access                               read ioctl              write ioctl             data type       min     max                             mul_factor      div_factor      data pointer                    set function
- */
-        __ide_add_setting(drive,        "io_32bit",             drive->no_io_32bit ? SETTING_READ : SETTING_RW, HDIO_GET_32BIT,         HDIO_SET_32BIT,         TYPE_BYTE,      0,      1 + (SUPPORT_VLB_SYNC << 1),    1,              1,              &drive->io_32bit,               set_io_32bit,   0);
-        __ide_add_setting(drive,        "keepsettings",         SETTING_RW,                                     HDIO_GET_KEEPSETTINGS,  HDIO_SET_KEEPSETTINGS,  TYPE_BYTE,      0,      1,                              1,              1,              &drive->keep_settings,          NULL,           0);
-        __ide_add_setting(drive,        "nice1",                SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      1,                              1,              1,              &drive->nice1,                  NULL,           0);
-        __ide_add_setting(drive,        "pio_mode",             SETTING_WRITE,                                  -1,                     HDIO_SET_PIO_MODE,      TYPE_BYTE,      0,      255,                            1,              1,              NULL,                           set_pio_mode,   0);
-        __ide_add_setting(drive,        "unmaskirq",            drive->no_unmask ? SETTING_READ : SETTING_RW,   HDIO_GET_UNMASKINTR,    HDIO_SET_UNMASKINTR,    TYPE_BYTE,      0,      1,                              1,              1,              &drive->unmask,                 NULL,           0);
-        __ide_add_setting(drive,        "using_dma",            SETTING_RW,                                     HDIO_GET_DMA,           HDIO_SET_DMA,           TYPE_BYTE,      0,      1,                              1,              1,              &drive->using_dma,              set_using_dma,  0);
-        __ide_add_setting(drive,        "init_speed",           SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      70,                             1,              1,              &drive->init_speed,             NULL,           0);
-        __ide_add_setting(drive,        "current_speed",        SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      70,                             1,              1,              &drive->current_speed,          set_xfer_rate,  0);
-        __ide_add_setting(drive,        "number",               SETTING_RW,                                     -1,                     -1,                     TYPE_BYTE,      0,      3,                              1,              1,              &drive->dn,                     NULL,           0);
+        return 0;
 }
 
 /**
@@ -1285,27 +1035,23 @@ static int generic_ide_resume(struct device *dev)
 int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device *bdev,
                         unsigned int cmd, unsigned long arg)
 {
-        ide_settings_t *setting;
+        unsigned long flags;
         ide_driver_t *drv;
-        int err = 0;
         void __user *p = (void __user *)arg;
+        int err = 0, (*setfunc)(ide_drive_t *, int);
+        u8 *val;
 
-        down(&ide_setting_sem);
-        if ((setting = ide_find_setting_by_ioctl(drive, cmd)) != NULL) {
-                if (cmd == setting->read_ioctl) {
-                        err = ide_read_setting(drive, setting);
-                        up(&ide_setting_sem);
-                        return err >= 0 ? put_user(err, (long __user *)arg) : err;
-                } else {
-                        if (bdev != bdev->bd_contains)
-                                err = -EINVAL;
-                        else
-                                err = ide_write_setting(drive, setting, arg);
-                        up(&ide_setting_sem);
-                        return err;
-                }
+        switch (cmd) {
+        case HDIO_GET_32BIT:        val = &drive->io_32bit;      goto read_val;
+        case HDIO_GET_KEEPSETTINGS: val = &drive->keep_settings; goto read_val;
+        case HDIO_GET_UNMASKINTR:   val = &drive->unmask;        goto read_val;
+        case HDIO_GET_DMA:          val = &drive->using_dma;     goto read_val;
+        case HDIO_SET_32BIT:        setfunc = set_io_32bit;      goto set_val;
+        case HDIO_SET_KEEPSETTINGS: setfunc = set_ksettings;     goto set_val;
+        case HDIO_SET_PIO_MODE:     setfunc = set_pio_mode;      goto set_val;
+        case HDIO_SET_UNMASKINTR:   setfunc = set_unmaskirq;     goto set_val;
+        case HDIO_SET_DMA:          setfunc = set_using_dma;     goto set_val;
         }
-        up(&ide_setting_sem);
 
         switch (cmd) {
                 case HDIO_OBSOLETE_IDENTITY:
@@ -1359,7 +1105,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         ide_init_hwif_ports(&hw, (unsigned long) args[0],
                                             (unsigned long) args[1], NULL);
                         hw.irq = args[2];
-                        if (ide_register_hw(&hw, NULL) == -1)
+                        if (ide_register_hw(&hw, 0, NULL) == -1)
                                 return -EIO;
                         return 0;
                 }
@@ -1434,6 +1180,28 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                 default:
                         return -EINVAL;
         }
+
+read_val:
+        down(&ide_setting_sem);
+        spin_lock_irqsave(&ide_lock, flags);
+        err = *val;
+        spin_unlock_irqrestore(&ide_lock, flags);
+        up(&ide_setting_sem);
+        return err >= 0 ? put_user(err, (long __user *)arg) : err;
+
+set_val:
+        if (bdev != bdev->bd_contains)
+                err = -EINVAL;
+        else {
+                if (!capable(CAP_SYS_ADMIN))
+                        err = -EACCES;
+                else {
+                        down(&ide_setting_sem);
+                        err = setfunc(drive, arg);
+                        up(&ide_setting_sem);
+                }
+        }
+        return err;
 }
 
 EXPORT_SYMBOL(generic_ide_ioctl);
@@ -1566,13 +1334,13 @@ static int __init ide_setup(char *s)
                 return 1;
         }
 
-#ifdef CONFIG_BLK_DEV_IDEPCI
+#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
         if (!strcmp(s, "ide=reverse")) {
                 ide_scan_direction = 1;
                 printk(" : Enabled support for IDE inverse scan order.\n");
                 return 1;
         }
-#endif /* CONFIG_BLK_DEV_IDEPCI */
+#endif
 
 #ifdef CONFIG_BLK_DEV_IDEACPI
         if (!strcmp(s, "ide=noacpi")) {
@@ -1832,9 +1600,9 @@ extern void __init h8300_ide_init(void);
  */
 static void __init probe_for_hwifs (void)
 {
-#ifdef CONFIG_BLK_DEV_IDEPCI
+#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
         ide_scan_pcibus(ide_scan_direction);
-#endif /* CONFIG_BLK_DEV_IDEPCI */
+#endif
 
 #ifdef CONFIG_ETRAX_IDE
         {
@@ -1892,54 +1660,6 @@ static void __init probe_for_hwifs (void)
 #endif
 }
 
-void ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver)
-{
-#ifdef CONFIG_PROC_FS
-        ide_add_proc_entries(drive->proc, driver->proc, drive);
-#endif
-}
-
-EXPORT_SYMBOL(ide_register_subdriver);
-
-/**
- *      ide_unregister_subdriver        -       disconnect drive from driver
- *      @drive: drive to unplug
- *      @driver: driver
- *
- *      Disconnect a drive from the driver it was attached to and then
- *      clean up the various proc files and other objects attached to it.
- *
- *      Takes ide_setting_sem and ide_lock.
- *      Caller must hold none of the locks.
- */
-
-void ide_unregister_subdriver(ide_drive_t *drive, ide_driver_t *driver)
-{
-        unsigned long flags;
-        
-#ifdef CONFIG_PROC_FS
-        ide_remove_proc_entries(drive->proc, driver->proc);
-#endif
-        down(&ide_setting_sem);
-        spin_lock_irqsave(&ide_lock, flags);
-        /*
-         * ide_setting_sem protects the settings list
-         * ide_lock protects the use of settings
-         *
-         * so we need to hold both, ide_settings_sem because we want to
-         * modify the settings list, and ide_lock because we cannot take
-         * a setting out that is being used.
-         *
-         * OTOH both ide_{read,write}_setting are only ever used under
-         * ide_setting_sem.
-         */
-        auto_remove_settings(drive);
-        spin_unlock_irqrestore(&ide_lock, flags);
-        up(&ide_setting_sem);
-}
-
-EXPORT_SYMBOL(ide_unregister_subdriver);
-
 /*
  * Probe module
  */
@@ -2071,9 +1791,7 @@ static int __init ide_init(void)
 
         init_ide_data();
 
-#ifdef CONFIG_PROC_FS
-        proc_ide_root = proc_mkdir("ide", NULL);
-#endif
+        proc_ide_create();
 
 #ifdef CONFIG_BLK_DEV_ALI14XX
         if (probe_ali14xx)
@@ -2096,14 +1814,9 @@ static int __init ide_init(void)
                 (void)qd65xx_init();
 #endif
 
-        initializing = 1;
         /* Probe for special PCI and other "known" interface chipsets. */
         probe_for_hwifs();
-        initializing = 0;
 
-#ifdef CONFIG_PROC_FS
-        proc_ide_create();
-#endif
         return 0;
 }
 
@@ -2143,9 +1856,7 @@ void __exit cleanup_module (void)
         pnpide_exit();
 #endif
 
-#ifdef CONFIG_PROC_FS
         proc_ide_destroy();
-#endif
 
         bus_unregister(&ide_bus_type);
 }
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 91961aa03047..df17ed68c0bc 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -223,7 +223,8 @@ static int __init ali14xx_probe(void)
         probe_hwif_init(hwif);
         probe_hwif_init(mate);
 
-        create_proc_ide_interfaces();
+        ide_proc_register_port(hwif);
+        ide_proc_register_port(mate);
 
         return 0;
 }
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 1ed224a01f79..101aee1711c4 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -213,7 +213,7 @@ fail_base2:
                                                 IRQ_AMIGA_PORTS);
                         }       
                         
-                        index = ide_register_hw(&hw, &hwif);
+                        index = ide_register_hw(&hw, 1, &hwif);
                         if (index != -1) {
                                 hwif->mmio = 1;
                                 printk("ide%d: ", index);
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 0219ffa64db6..36a3f0ac6162 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -138,7 +138,8 @@ static int __init dtc2278_probe(void)
         probe_hwif_init(hwif);
         probe_hwif_init(mate);
 
-        create_proc_ide_interfaces();
+        ide_proc_register_port(hwif);
+        ide_proc_register_port(mate);
 
         return 0;
 }
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index a9f2cd5bb81e..e1e9d9d6893f 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -70,7 +70,7 @@ void __init falconide_init(void)
                         0, 0, NULL,
 //                      falconide_iops,
                         IRQ_MFP_IDE);
-        index = ide_register_hw(&hw, NULL);
+        index = ide_register_hw(&hw, 1, NULL);
 
         if (index != -1)
             printk("ide%d: Falcon IDE interface\n", index);
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index dcfadbbf55d8..0830a021bbb6 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -165,7 +165,7 @@ found:
 //                      &gayle_iops,
                         IRQ_AMIGA_PORTS);
 
-        index = ide_register_hw(&hw, &hwif);
+        index = ide_register_hw(&hw, 1, &hwif);
         if (index != -1) {
             hwif->mmio = 1;
             switch (i) {
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index a2832643c522..c8f353b1296f 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -357,7 +357,8 @@ int __init ht6560b_init(void)
         probe_hwif_init(hwif);
         probe_hwif_init(mate);
 
-        create_proc_ide_interfaces();
+        ide_proc_register_port(hwif);
+        ide_proc_register_port(mate);
 
         return 0;
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index c6522a64d7ec..2f3977f195b7 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -153,7 +153,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
     hw.irq = irq;
     hw.chipset = ide_pci;
     hw.dev = &handle->dev;
-    return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave);
+    return ide_register_hw_with_fixup(&hw, 0, NULL, ide_undecoded_slave);
 }
 
 /*======================================================================
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 4c0079ad52ac..c211fc78345d 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -102,21 +102,21 @@ void macide_init(void)
                                 0, 0, macide_ack_intr,
 //                              quadra_ide_iops,
                                 IRQ_NUBUS_F);
-                index = ide_register_hw(&hw, &hwif);
+                index = ide_register_hw(&hw, 1, &hwif);
                 break;
         case MAC_IDE_PB:
                 ide_setup_ports(&hw, IDE_BASE, macide_offsets,
                                 0, 0, macide_ack_intr,
 //                              macide_pb_iops,
                                 IRQ_NUBUS_C);
-                index = ide_register_hw(&hw, &hwif);
+                index = ide_register_hw(&hw, 1, &hwif);
                 break;
         case MAC_IDE_BABOON:
                 ide_setup_ports(&hw, BABOON_BASE, macide_offsets,
                                 0, 0, NULL,
 //                              macide_baboon_iops,
                                 IRQ_BABOON_1);
-                index = ide_register_hw(&hw, &hwif);
+                index = ide_register_hw(&hw, 1, &hwif);
                 if (index == -1) break;
                 if (macintosh_config->ident == MAC_MODEL_PB190) {
 
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 74f08124eabb..e628a983ce33 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -142,7 +142,7 @@ void q40ide_init(void)
                         0, NULL,
 //                      m68kide_iops,
                         q40ide_default_irq(pcide_bases[i]));
-        index = ide_register_hw(&hw, &hwif);
+        index = ide_register_hw(&hw, 1, &hwif);
         // **FIXME**
         if (index != -1)
                 hwif->mmio = 1;
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 2fb8f50f1293..d1414a75b523 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -427,7 +427,7 @@ static int __init qd_probe(int base)
                 qd_setup(hwif, base, config, QD6500_DEF_DATA, QD6500_DEF_DATA,
                          &qd6500_tune_drive);
 
-                create_proc_ide_interfaces();
+                ide_proc_register_port(hwif);
 
                 return 1;
         }
@@ -459,7 +459,7 @@ static int __init qd_probe(int base)
                                  &qd6580_tune_drive);
                         qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
 
-                        create_proc_ide_interfaces();
+                        ide_proc_register_port(hwif);
 
                         return 1;
                 } else {
@@ -479,7 +479,8 @@ static int __init qd_probe(int base)
                                  &qd6580_tune_drive);
                         qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
 
-                        create_proc_ide_interfaces();
+                        ide_proc_register_port(hwif);
+                        ide_proc_register_port(mate);
 
                         return 0; /* no other qd65xx possible */
                 }
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index ca7974455578..ddc403a0bd82 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -160,7 +160,8 @@ static int __init umc8672_probe(void)
         probe_hwif_init(hwif);
         probe_hwif_init(mate);
 
-        create_proc_ide_interfaces();
+        ide_proc_register_port(hwif);
+        ide_proc_register_port(mate);
 
         return 0;
 }
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index d54d9fe92a7d..ca95e990862e 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -760,6 +760,9 @@ static int au_ide_probe(struct device *dev)
 #endif
 
         probe_hwif_init(hwif);
+
+        ide_proc_register_port(hwif);
+
         dev_set_drvdata(dev, hwif);
 
         printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode );
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index 81fa06851b27..6e935d7c63fd 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -129,6 +129,9 @@ static int __devinit swarm_ide_probe(struct device *dev)
         hwif->irq = hwif->hw.irq;
 
         probe_hwif_init(hwif);
+
+        ide_proc_register_port(hwif);
+
         dev_set_drvdata(dev, hwif);
 
         return 0;
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 73bdf64dbbfc..b173bc66ce1e 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -87,38 +87,12 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr
         return chipset_table->ultra_settings;
 }
 
-static u8 aec62xx_ratemask (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 mode;
-
-        switch(hwif->pci_dev->device) {
-                case PCI_DEVICE_ID_ARTOP_ATP865:
-                case PCI_DEVICE_ID_ARTOP_ATP865R:
-                        mode = (inb(hwif->channel ?
-                                    hwif->mate->dma_status :
-                                    hwif->dma_status) & 0x10) ? 4 : 3;
-                        break;
-                case PCI_DEVICE_ID_ARTOP_ATP860:
-                case PCI_DEVICE_ID_ARTOP_ATP860R:
-                        mode = 2;
-                        break;
-                case PCI_DEVICE_ID_ARTOP_ATP850UF:
-                default:
-                        return 1;
-        }
-
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
 static int aec6210_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
         u16 d_conf              = 0;
-        u8 speed        = ide_rate_filter(aec62xx_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
         u8 ultra = 0, ultra_conf = 0;
         u8 tmp0 = 0, tmp1 = 0, tmp2 = 0;
         unsigned long flags;
@@ -145,7 +119,7 @@ static int aec6260_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
-        u8 speed        = ide_rate_filter(aec62xx_ratemask(drive), xferspeed);
+        u8 speed        = ide_rate_filter(drive, xferspeed);
         u8 unit         = (drive->select.b.unit & 0x01);
         u8 tmp1 = 0, tmp2 = 0;
         u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
@@ -181,17 +155,6 @@ static int aec62xx_tune_chipset (ide_drive_t *drive, u8 speed)
         }
 }
 
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, aec62xx_ratemask(drive));       
-
-        if (!(speed))
-                return 0;
-
-        (void) aec62xx_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
 {
         pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
@@ -200,7 +163,7 @@ static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
 
 static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -261,11 +224,13 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
 
 static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = hwif->pci_dev;
+
         hwif->autodma = 0;
         hwif->tuneproc = &aec62xx_tune_drive;
         hwif->speedproc = &aec62xx_tune_chipset;
 
-        if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
+        if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
                 hwif->serialized = hwif->channel;
 
         if (hwif->mate)
@@ -277,7 +242,15 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
                 return;
         }
 
-        hwif->ultra_mask = 0x7f;
+        hwif->ultra_mask = hwif->cds->udma_mask;
+
+        /* atp865 and atp865r */
+        if (hwif->ultra_mask == 0x3f) {
+                /* check bit 0x10 of DMA status register */
+                if (inb(pci_resource_start(dev, 4) + 2) & 0x10)
+                        hwif->ultra_mask = 0x7f; /* udma0-6 */
+        }
+
         hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check     = &aec62xx_config_drive_xfer_rate;
@@ -344,6 +317,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 1 */
                 .name           = "AEC6260",
                 .init_setup     = init_setup_aec62xx,
@@ -353,6 +327,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 2 */
                 .name           = "AEC6260R",
                 .init_setup     = init_setup_aec62xx,
@@ -363,6 +338,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = NEVER_BOARD,
+                .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
                 .name           = "AEC6X80",
                 .init_setup     = init_setup_aec6x80,
@@ -372,6 +348,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 4 */
                 .name           = "AEC6X80R",
                 .init_setup     = init_setup_aec6x80,
@@ -382,6 +359,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x3f, /* udma0-5 */
         }
 };
 
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 946a12746cb5..27525ec2e19a 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -50,7 +50,7 @@ static u8 m5229_revision;
 static u8 chip_is_1543c_e;
 static struct pci_dev *isa_dev;
 
-#if defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
 
@@ -278,7 +278,7 @@ static int ali_get_info (char *buffer, char **addr, off_t offset, int count)
 
         return p-buffer; /* => must be less than 4k! */
 }
-#endif  /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS) */
+#endif  /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */
 
 /**
  *      ali15x3_tune_pio        -       set up chipset for PIO mode
@@ -378,74 +378,31 @@ static void ali15x3_tune_drive (ide_drive_t *drive, u8 pio)
 }
 
 /**
- *      ali15x3_can_ultra       -       check for ultra DMA support
- *      @drive: drive to do the check
+ *      ali_udma_filter         -       compute UDMA mask
+ *      @drive: IDE device
  *
- *      Check the drive and controller revisions. Return 0 if UDMA is
- *      not available, or 1 if UDMA can be used. The actual rules for
- *      the ALi are
+ *      Return available UDMA modes.
+ *
+ *      The actual rules for the ALi are:
  *              No UDMA on revisions <= 0x20
  *              Disk only for revisions < 0xC2
  *              Not WDC drives for revisions < 0xC2
  *
  *      FIXME: WDC ifdef needs to die
  */
- 
-static u8 ali15x3_can_ultra (ide_drive_t *drive)
-{
-#ifndef CONFIG_WDC_ALI15X3
-        struct hd_driveid *id   = drive->id;
-#endif /* CONFIG_WDC_ALI15X3 */
 
-        if (m5229_revision <= 0x20) {
-                return 0;
-        } else if ((m5229_revision < 0xC2) &&
-#ifndef CONFIG_WDC_ALI15X3
-                   ((chip_is_1543c_e && strstr(id->model, "WDC ")) ||
-                    (drive->media!=ide_disk))) {
-#else /* CONFIG_WDC_ALI15X3 */
-                   (drive->media!=ide_disk)) {
-#endif /* CONFIG_WDC_ALI15X3 */
-                return 0;
-        } else {
-                return 1;
-        }
-}
-
-/**
- *      ali15x3_ratemask        -       generate DMA mode list
- *      @drive: drive to compute against
- *
- *      Generate a list of the available DMA modes for the drive. 
- *      FIXME: this function contains lots of bogus masking we can dump
- *
- *      Return the highest available mode (UDMA33, UDMA66, UDMA100,..)
- */
- 
-static u8 ali15x3_ratemask (ide_drive_t *drive)
+static u8 ali_udma_filter(ide_drive_t *drive)
 {
-        u8 mode = 0, can_ultra  = ali15x3_can_ultra(drive);
-
-        if (m5229_revision > 0xC4 && can_ultra) {
-                mode = 4;
-        } else if (m5229_revision == 0xC4 && can_ultra) {
-                mode = 3;
-        } else if (m5229_revision >= 0xC2 && can_ultra) {
-                mode = 2;
-        } else if (can_ultra) {
-                return 1;
-        } else {
-                return 0;
+        if (m5229_revision > 0x20 && m5229_revision < 0xC2) {
+                if (drive->media != ide_disk)
+                        return 0;
+#ifndef CONFIG_WDC_ALI15X3
+                if (chip_is_1543c_e && strstr(drive->id->model, "WDC "))
+                        return 0;
+#endif
         }
 
-        /*
-         *      If the drive sees no suitable cable then UDMA 33
-         *      is the highest permitted mode
-         */
-         
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
+        return drive->hwif->ultra_mask;
 }
 
 /**
@@ -461,7 +418,7 @@ static int ali15x3_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
-        u8 speed                = ide_rate_filter(ali15x3_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
         u8 speed1               = speed;
         u8 unit                 = (drive->select.b.unit & 0x01);
         u8 tmpbyte              = 0x00;
@@ -498,28 +455,6 @@ static int ali15x3_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         return (ide_config_drive_speed(drive, speed));
 }
 
-
-/**
- *      config_chipset_for_dma  -       set up DMA mode
- *      @drive: drive to configure for
- *
- *      Place a drive into DMA mode and tune the chipset for
- *      the selected speed.
- *
- *      Returns true if DMA mode can be used
- */
- 
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, ali15x3_ratemask(drive));
-
-        if (!(speed))
-                return 0;
-
-        (void) ali15x3_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 /**
  *      ali15x3_config_drive_for_dma    -       configure for DMA
  *      @drive: drive to configure
@@ -530,48 +465,14 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct hd_driveid *id   = drive->id;
-
-        if ((m5229_revision<=0x20) && (drive->media!=ide_disk))
-                goto ata_pio;
-
         drive->init_speed = 0;
 
-        if ((id != NULL) && ((id->capability & 1) != 0) && drive->autodma) {
-                /* Consult the list of known "bad" drives */
-                if (__ide_dma_bad_drive(drive))
-                        goto ata_pio;
-                if ((id->field_valid & 4) && (m5229_revision >= 0xC2)) {
-                        if (id->dma_ultra & hwif->ultra_mask) {
-                                /* Force if Capable UltraDMA */
-                                int dma = config_chipset_for_dma(drive);
-                                if ((id->field_valid & 2) && !dma)
-                                        goto try_dma_modes;
-                        }
-                } else if (id->field_valid & 2) {
-try_dma_modes:
-                        if ((id->dma_mword & hwif->mwdma_mask) ||
-                            (id->dma_1word & hwif->swdma_mask)) {
-                                /* Force if Capable regular DMA modes */
-                                if (!config_chipset_for_dma(drive))
-                                        goto ata_pio;
-                        }
-                } else if (__ide_dma_good_drive(drive) &&
-                           (id->eide_dma_time < 150)) {
-                        /* Consult the list of known "good" drives */
-                        if (!config_chipset_for_dma(drive))
-                                goto ata_pio;
-                } else {
-                        goto ata_pio;
-                }
-        } else {
-ata_pio:
-                hwif->tuneproc(drive, 255);
-                return -1;
-        }
+        if (ide_tune_dma(drive))
+                return 0;
 
-        return 0;
+        ali15x3_tune_drive(drive, 255);
+
+        return -1;
 }
 
 /**
@@ -609,13 +510,13 @@ static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const c
 
         isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
 
-#if defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
         if (!ali_proc) {
                 ali_proc = 1;
                 bmide_dev = dev;
                 ide_pci_create_host_proc("ali", ali_get_info);
         }
-#endif  /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS) */
+#endif  /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */
 
         local_irq_save(flags);
 
@@ -771,6 +672,7 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
         hwif->autodma = 0;
         hwif->tuneproc = &ali15x3_tune_drive;
         hwif->speedproc = &ali15x3_tune_chipset;
+        hwif->udma_filter = &ali_udma_filter;
 
         /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
         hwif->no_lba48_dma = (m5229_revision <= 0xC4) ? 1 : 0;
@@ -781,10 +683,20 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
                 return;
         }
 
-        hwif->atapi_dma = 1;
-
         if (m5229_revision > 0x20)
-                hwif->ultra_mask = 0x7f;
+                hwif->atapi_dma = 1;
+
+        if (m5229_revision <= 0x20)
+                hwif->ultra_mask = 0x00; /* no udma */
+        else if (m5229_revision < 0xC2)
+                hwif->ultra_mask = 0x07; /* udma0-2 */
+        else if (m5229_revision == 0xC2 || m5229_revision == 0xC3)
+                hwif->ultra_mask = 0x1f; /* udma0-4 */
+        else if (m5229_revision == 0xC4)
+                hwif->ultra_mask = 0x3f; /* udma0-5 */
+        else
+                hwif->ultra_mask = 0x7f; /* udma0-6 */
+
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 7989bdd842a2..becb1a5648b0 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -92,7 +92,7 @@ static unsigned char amd_cyc2udma[] = { 6, 6, 5, 4, 0, 1, 1, 2, 2, 3, 3, 3, 3, 3
  * AMD /proc entry.
  */
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_IDE_PROC_FS
 
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
@@ -402,14 +402,14 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
  * Register /proc/ide/amd74xx entry
  */
 
-#if defined(DISPLAY_AMD_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_AMD_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
         if (!amd74xx_proc) {
                 amd_base = pci_resource_start(dev, 4);
                 bmide_dev = dev;
                 ide_pci_create_host_proc("amd74xx", amd74xx_get_info);
                 amd74xx_proc = 1;
         }
-#endif /* DISPLAY_AMD_TIMINGS && CONFIG_PROC_FS */
+#endif /* DISPLAY_AMD_TIMINGS && CONFIG_IDE_PROC_FS */
 
         return dev->irq;
 }
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 2d48af32e3f4..0e52ad722a72 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -49,22 +49,6 @@ static int save_mdma_mode[4];
 static DEFINE_SPINLOCK(atiixp_lock);
 
 /**
- *      atiixp_ratemask         -       compute rate mask for ATIIXP IDE
- *      @drive: IDE drive to compute for
- *
- *      Returns the available modes for the ATIIXP IDE controller.
- */
-
-static u8 atiixp_ratemask(ide_drive_t *drive)
-{
-        u8 mode = 3;
-
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
-/**
  *      atiixp_dma_2_pio                -       return the PIO mode matching DMA
  *      @xfer_rate: transfer speed
  *
@@ -189,7 +173,7 @@ static int atiixp_speedproc(ide_drive_t *drive, u8 xferspeed)
         u16 tmp16;
         u8 speed, pio;
 
-        speed = ide_rate_filter(atiixp_ratemask(drive), xferspeed);
+        speed = ide_rate_filter(drive, xferspeed);
 
         spin_lock_irqsave(&atiixp_lock, flags);
 
@@ -223,26 +207,6 @@ static int atiixp_speedproc(ide_drive_t *drive, u8 xferspeed)
 }
 
 /**
- *      atiixp_config_drive_for_dma     -       configure drive for DMA
- *      @drive: IDE drive to configure
- *
- *      Set up a ATIIXP interface channel for the best available speed.
- *      We prefer UDMA if it is available and then MWDMA. If DMA is
- *      not available we switch to PIO and return 0.
- */
-
-static int atiixp_config_drive_for_dma(ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, atiixp_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        (void) atiixp_speedproc(drive, speed);
-        return ide_dma_enable(drive);
-}
-
-/**
  *      atiixp_dma_check        -       set up an IDE device
  *      @drive: IDE drive to configure
  *
@@ -256,7 +220,7 @@ static int atiixp_dma_check(ide_drive_t *drive)
 
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && atiixp_config_drive_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive)) {
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 77f51ab6d439..7c57dc696f52 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -74,7 +74,7 @@
 #define UDIDETCR1       0x7B
 #define DTPR1           0x7C
 
-#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
 
@@ -165,7 +165,7 @@ static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count)
         return p-buffer;        /* => must be less than 4k! */
 }
 
-#endif  /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */
+#endif  /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */
 
 static u8 quantize_timing(int timing, int quant)
 {
@@ -292,55 +292,6 @@ static void cmd64x_tune_drive (ide_drive_t *drive, u8 pio)
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
-static u8 cmd64x_ratemask (ide_drive_t *drive)
-{
-        struct pci_dev *dev     = HWIF(drive)->pci_dev;
-        u8 mode = 0;
-
-        switch(dev->device) {
-                case PCI_DEVICE_ID_CMD_649:
-                        mode = 3;
-                        break;
-                case PCI_DEVICE_ID_CMD_648:
-                        mode = 2;
-                        break;
-                case PCI_DEVICE_ID_CMD_643:
-                        return 0;
-
-                case PCI_DEVICE_ID_CMD_646:
-                {
-                        unsigned int class_rev  = 0;
-                        pci_read_config_dword(dev,
-                                PCI_CLASS_REVISION, &class_rev);
-                        class_rev &= 0xff;
-                /*
-                 * UltraDMA only supported on PCI646U and PCI646U2, which
-                 * correspond to revisions 0x03, 0x05 and 0x07 respectively.
-                 * Actually, although the CMD tech support people won't
-                 * tell me the details, the 0x03 revision cannot support
-                 * UDMA correctly without hardware modifications, and even
-                 * then it only works with Quantum disks due to some
-                 * hold time assumptions in the 646U part which are fixed
-                 * in the 646U2.
-                 *
-                 * So we only do UltraDMA on revision 0x05 and 0x07 chipsets.
-                 */
-                        switch(class_rev) {
-                                case 0x07:
-                                case 0x05:
-                                        return 1;
-                                case 0x03:
-                                case 0x01:
-                                default:
-                                        return 0;
-                        }
-                }
-        }
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
 static int cmd64x_tune_chipset (ide_drive_t *drive, u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
@@ -348,7 +299,7 @@ static int cmd64x_tune_chipset (ide_drive_t *drive, u8 speed)
         u8 unit                 = drive->dn & 0x01;
         u8 regU = 0, pciU       = hwif->channel ? UDIDETCR1 : UDIDETCR0;
 
-        speed = ide_rate_filter(cmd64x_ratemask(drive), speed);
+        speed = ide_rate_filter(drive, speed);
 
         if (speed >= XFER_SW_DMA_0) {
                 (void) pci_read_config_byte(dev, pciU, &regU);
@@ -401,22 +352,9 @@ static int cmd64x_tune_chipset (ide_drive_t *drive, u8 speed)
         return ide_config_drive_speed(drive, speed);
 }
 
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed        = ide_dma_speed(drive, cmd64x_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        if (cmd64x_tune_chipset(drive, speed))
-                return 0;
-
-        return ide_dma_enable(drive);
-}
-
 static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -597,7 +535,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha
         (void) pci_write_config_byte(dev, UDIDETCR0, 0xf0);
 #endif /* CONFIG_PPC */
 
-#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
 
         cmd_devs[n_cmd_devs++] = dev;
 
@@ -605,7 +543,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha
                 cmd64x_proc = 1;
                 ide_pci_create_host_proc("cmd64x", cmd64x_get_info);
         }
-#endif /* DISPLAY_CMD64X_TIMINGS && CONFIG_PROC_FS */
+#endif /* DISPLAY_CMD64X_TIMINGS && CONFIG_IDE_PROC_FS */
 
         return 0;
 }
@@ -644,15 +582,24 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
 
         hwif->atapi_dma = 1;
 
-        hwif->ultra_mask = 0x3f;
-        hwif->mwdma_mask = 0x07;
+        hwif->ultra_mask = hwif->cds->udma_mask;
 
-        if (dev->device == PCI_DEVICE_ID_CMD_643)
-                hwif->ultra_mask = 0x80;
-        if (dev->device == PCI_DEVICE_ID_CMD_646)
-                hwif->ultra_mask = (class_rev > 0x04) ? 0x07 : 0x80;
-        if (dev->device == PCI_DEVICE_ID_CMD_648)
-                hwif->ultra_mask = 0x1f;
+        /*
+         * UltraDMA only supported on PCI646U and PCI646U2, which
+         * correspond to revisions 0x03, 0x05 and 0x07 respectively.
+         * Actually, although the CMD tech support people won't
+         * tell me the details, the 0x03 revision cannot support
+         * UDMA correctly without hardware modifications, and even
+         * then it only works with Quantum disks due to some
+         * hold time assumptions in the 646U part which are fixed
+         * in the 646U2.
+         *
+         * So we only do UltraDMA on revision 0x05 and 0x07 chipsets.
+         */
+        if (dev->device == PCI_DEVICE_ID_CMD_646 && class_rev < 5)
+                hwif->ultra_mask = 0x00;
+
+        hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check = &cmd64x_config_drive_for_dma;
         if (!(hwif->udma_four))
@@ -716,6 +663,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .udma_mask      = 0x00, /* no udma */
         },{     /* 1 */
                 .name           = "CMD646",
                 .init_setup     = init_setup_cmd646,
@@ -725,6 +673,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 2 */
                 .name           = "CMD648",
                 .init_setup     = init_setup_cmd64x,
@@ -734,6 +683,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
                 .name           = "CMD649",
                 .init_setup     = init_setup_cmd64x,
@@ -743,6 +693,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .udma_mask      = 0x3f, /* udma0-5 */
         }
 };
 
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 400859a839f7..3b88a3a56116 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -213,6 +213,7 @@ static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
  
 static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
+        ide_hwif_t *hwif = NULL, *mate = NULL;
         ata_index_t index;
         ide_pci_device_t *d = &cyrix_chipsets[id->driver_data];
 
@@ -239,10 +240,21 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
 
         ide_pci_setup_ports(dev, d, 14, &index);
 
-        if((index.b.low & 0xf0) != 0xf0)
-                probe_hwif_init(&ide_hwifs[index.b.low]);
-        if((index.b.high & 0xf0) != 0xf0)
-                probe_hwif_init(&ide_hwifs[index.b.high]);
+        if ((index.b.low & 0xf0) != 0xf0)
+                hwif = &ide_hwifs[index.b.low];
+        if ((index.b.high & 0xf0) != 0xf0)
+                mate = &ide_hwifs[index.b.high];
+
+        if (hwif)
+                probe_hwif_init(hwif);
+        if (mate)
+                probe_hwif_init(mate);
+
+        if (hwif)
+                ide_proc_register_port(hwif);
+        if (mate)
+                ide_proc_register_port(mate);
+
         return 0;
 }
 
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index b2d7c132ef4b..1eec1f308d16 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -1,10 +1,10 @@
 /*
- * linux/drivers/ide/pci/cs5530.c               Version 0.7     Sept 10, 2002
+ * linux/drivers/ide/pci/cs5530.c               Version 0.73    Mar 10 2007
  *
  * Copyright (C) 2000                   Andre Hedrick <andre@linux-ide.org>
- * Ditto of GNU General Public License.
- *
  * Copyright (C) 2000                   Mark Lord <mlord@pobox.com>
+ * Copyright (C) 2007                   Bartlomiej Zolnierkiewicz
+ *
  * May be copied or modified under the terms of the GNU General Public License
  *
  * Development of this chipset driver was funded
@@ -62,6 +62,14 @@ static unsigned int cs5530_pio_timings[2][5] = {
 #define CS5530_BAD_PIO(timings) (((timings)&~0x80000000)==0x0000e132)
 #define CS5530_BASEREG(hwif)    (((hwif)->dma_base & ~0xf) + ((hwif)->channel ? 0x30 : 0x20))
 
+static void cs5530_tunepio(ide_drive_t *drive, u8 pio)
+{
+        unsigned long basereg = CS5530_BASEREG(drive->hwif);
+        unsigned int format = (inl(basereg + 4) >> 31) & 1;
+
+        outl(cs5530_pio_timings[format][pio], basereg + ((drive->dn & 1)<<3));
+}
+
 /**
  *      cs5530_tuneproc         -       select/set PIO modes
  *
@@ -74,98 +82,78 @@ static unsigned int cs5530_pio_timings[2][5] = {
 
 static void cs5530_tuneproc (ide_drive_t *drive, u8 pio)        /* pio=255 means "autotune" */
 {
-        ide_hwif_t      *hwif = HWIF(drive);
-        unsigned int    format;
-        unsigned long basereg = CS5530_BASEREG(hwif);
-        static u8       modes[5] = { XFER_PIO_0, XFER_PIO_1, XFER_PIO_2, XFER_PIO_3, XFER_PIO_4};
-
         pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
-        if (!cs5530_set_xfer_mode(drive, modes[pio])) {
-                format = (inl(basereg + 4) >> 31) & 1;
-                outl(cs5530_pio_timings[format][pio],
-                        basereg+(drive->select.b.unit<<3));
+
+        if (cs5530_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
+                cs5530_tunepio(drive, pio);
+}
+
+/**
+ *      cs5530_udma_filter      -       UDMA filter
+ *      @drive: drive
+ *
+ *      cs5530_udma_filter() does UDMA mask filtering for the given drive
+ *      taking into the consideration capabilities of the mate device.
+ *
+ *      The CS5530 specifies that two drives sharing a cable cannot mix
+ *      UDMA/MDMA.  It has to be one or the other, for the pair, though
+ *      different timings can still be chosen for each drive.  We could
+ *      set the appropriate timing bits on the fly, but that might be
+ *      a bit confusing.  So, for now we statically handle this requirement
+ *      by looking at our mate drive to see what it is capable of, before
+ *      choosing a mode for our own drive.
+ *
+ *      Note: This relies on the fact we never fail from UDMA to MWDMA2
+ *      but instead drop to PIO.
+ */
+
+static u8 cs5530_udma_filter(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        ide_drive_t *mate = &hwif->drives[(drive->dn & 1) ^ 1];
+        struct hd_driveid *mateid = mate->id;
+        u8 mask = hwif->ultra_mask;
+
+        if (mate->present == 0)
+                goto out;
+
+        if ((mateid->capability & 1) && __ide_dma_bad_drive(mate) == 0) {
+                if ((mateid->field_valid & 4) && (mateid->dma_ultra & 7))
+                        goto out;
+                if ((mateid->field_valid & 2) && (mateid->dma_mword & 7))
+                        mask = 0;
         }
+out:
+        return mask;
 }
 
 /**
- *      cs5530_config_dma       -       select/set DMA and UDMA modes
+ *      cs5530_config_dma       -       set DMA/UDMA mode
  *      @drive: drive to tune
  *
- *      cs5530_config_dma() handles selection/setting of DMA/UDMA modes
- *      for both the chipset and drive. The CS5530 has limitations about
- *      mixing DMA/UDMA on the same cable.
+ *      cs5530_config_dma() handles setting of DMA/UDMA mode
+ *      for both the chipset and drive.
  */
- 
-static int cs5530_config_dma (ide_drive_t *drive)
+
+static int cs5530_config_dma(ide_drive_t *drive)
 {
-        int                     udma_ok = 1, mode = 0;
-        ide_hwif_t              *hwif = HWIF(drive);
-        int                     unit = drive->select.b.unit;
-        ide_drive_t             *mate = &hwif->drives[unit^1];
-        struct hd_driveid       *id = drive->id;
-        unsigned int            reg, timings = 0;
-        unsigned long           basereg;
+        if (ide_tune_dma(drive))
+                return 0;
 
-        /*
-         * Default to DMA-off in case we run into trouble here.
-         */
-        hwif->dma_off_quietly(drive);
+        return 1;
+}
 
-        /*
-         * The CS5530 specifies that two drives sharing a cable cannot
-         * mix UDMA/MDMA.  It has to be one or the other, for the pair,
-         * though different timings can still be chosen for each drive.
-         * We could set the appropriate timing bits on the fly,
-         * but that might be a bit confusing.  So, for now we statically
-         * handle this requirement by looking at our mate drive to see
-         * what it is capable of, before choosing a mode for our own drive.
-         *
-         * Note: This relies on the fact we never fail from UDMA to MWDMA_2
-         * but instead drop to PIO
-         */
-        if (mate->present) {
-                struct hd_driveid *mateid = mate->id;
-                if (mateid && (mateid->capability & 1) &&
-                    !__ide_dma_bad_drive(mate)) {
-                        if ((mateid->field_valid & 4) &&
-                            (mateid->dma_ultra & 7))
-                                udma_ok = 1;
-                        else if ((mateid->field_valid & 2) &&
-                                 (mateid->dma_mword & 7))
-                                udma_ok = 0;
-                        else
-                                udma_ok = 1;
-                }
-        }
+static int cs5530_tune_chipset(ide_drive_t *drive, u8 mode)
+{
+        unsigned long basereg;
+        unsigned int reg, timings = 0;
 
-        /*
-         * Now see what the current drive is capable of,
-         * selecting UDMA only if the mate said it was ok.
-         */
-        if (id && (id->capability & 1) && drive->autodma &&
-            !__ide_dma_bad_drive(drive)) {
-                if (udma_ok && (id->field_valid & 4) && (id->dma_ultra & 7)) {
-                        if      (id->dma_ultra & 4)
-                                mode = XFER_UDMA_2;
-                        else if (id->dma_ultra & 2)
-                                mode = XFER_UDMA_1;
-                        else if (id->dma_ultra & 1)
-                                mode = XFER_UDMA_0;
-                }
-                if (!mode && (id->field_valid & 2) && (id->dma_mword & 7)) {
-                        if      (id->dma_mword & 4)
-                                mode = XFER_MW_DMA_2;
-                        else if (id->dma_mword & 2)
-                                mode = XFER_MW_DMA_1;
-                        else if (id->dma_mword & 1)
-                                mode = XFER_MW_DMA_0;
-                }
-        }
+        mode = ide_rate_filter(drive, mode);
 
         /*
          * Tell the drive to switch to the new mode; abort on failure.
          */
-        if (!mode || cs5530_set_xfer_mode(drive, mode))
+        if (cs5530_set_xfer_mode(drive, mode))
                 return 1;       /* failure */
 
         /*
@@ -178,14 +166,21 @@ static int cs5530_config_dma (ide_drive_t *drive)
                 case XFER_MW_DMA_0:     timings = 0x00077771; break;
                 case XFER_MW_DMA_1:     timings = 0x00012121; break;
                 case XFER_MW_DMA_2:     timings = 0x00002020; break;
+                case XFER_PIO_4:
+                case XFER_PIO_3:
+                case XFER_PIO_2:
+                case XFER_PIO_1:
+                case XFER_PIO_0:
+                        cs5530_tunepio(drive, mode - XFER_PIO_0);
+                        return 0;
                 default:
                         BUG();
                         break;
         }
-        basereg = CS5530_BASEREG(hwif);
+        basereg = CS5530_BASEREG(drive->hwif);
         reg = inl(basereg + 4);                 /* get drive0 config register */
         timings |= reg & 0x80000000;            /* preserve PIO format bit */
-        if (unit == 0) {                        /* are we configuring drive0? */
+        if ((drive-> dn & 1) == 0) {            /* are we configuring drive0? */
                 outl(timings, basereg + 4);     /* write drive0 config register */
         } else {
                 if (timings & 0x00100000)
@@ -311,6 +306,8 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
                 hwif->serialized = hwif->mate->serialized = 1;
 
         hwif->tuneproc = &cs5530_tuneproc;
+        hwif->speedproc = &cs5530_tune_chipset;
+
         basereg = CS5530_BASEREG(hwif);
         d0_timings = inl(basereg + 0);
         if (CS5530_BAD_PIO(d0_timings)) {
@@ -332,6 +329,7 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
         hwif->ultra_mask = 0x07;
         hwif->mwdma_mask = 0x07;
 
+        hwif->udma_filter = cs5530_udma_filter;
         hwif->ide_dma_check = &cs5530_config_dma;
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 45f43efbf92c..41925c47ef05 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -127,20 +127,6 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed)
         }
 }
 
-static u8 cs5535_ratemask(ide_drive_t *drive)
-{
-        /* eighty93 will return 1 if it's 80core and capable of
-        exceeding udma2, 0 otherwise. we need ratemask to set
-        the max speed and if we can > udma2 then we return 2
-        which selects speed_max as udma4 which is the 5535's max
-        speed, and 1 selects udma2 which is the max for 40c */
-        if (!eighty_ninty_three(drive))
-                return 1;
-
-        return 2;
-}
-
-
 /****
  *      cs5535_set_drive         -     Configure the drive to the new speed
  *      @drive: Drive to set up
@@ -151,7 +137,7 @@ static u8 cs5535_ratemask(ide_drive_t *drive)
  */
 static int cs5535_set_drive(ide_drive_t *drive, u8 speed)
 {
-        speed = ide_rate_filter(cs5535_ratemask(drive), speed);
+        speed = ide_rate_filter(drive, speed);
         ide_config_drive_speed(drive, speed);
         cs5535_set_speed(drive, speed);
 
@@ -178,28 +164,13 @@ static void cs5535_tuneproc(ide_drive_t *drive, u8 xferspeed)
         cs5535_set_speed(drive, xferspeed);
 }
 
-static int cs5535_config_drive_for_dma(ide_drive_t *drive)
-{
-        u8 speed;
-
-        speed = ide_dma_speed(drive, cs5535_ratemask(drive));
-
-        /* If no DMA speed was available then let dma_check hit pio */
-        if (!speed) {
-                return 0;
-        }
-
-        cs5535_set_drive(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int cs5535_dma_check(ide_drive_t *drive)
 {
         u8 speed;
 
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && cs5535_config_drive_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive)) {
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index dd7ec37fdeab..46f4a888c037 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -80,7 +80,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         hw.irq = dev->irq;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-        rc = ide_register_hw_with_fixup(&hw, &hwif, ide_undecoded_slave);
+        rc = ide_register_hw_with_fixup(&hw, 0, &hwif, ide_undecoded_slave);
         if (rc < 0) {
                 printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
                 pci_disable_device(dev);
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 924eaa3a5708..2c24c3de8846 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -43,15 +43,10 @@
 
 #define HPT343_DEBUG_DRIVE_INFO         0
 
-static u8 hpt34x_ratemask (ide_drive_t *drive)
-{
-        return 1;
-}
-
 static int hpt34x_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 {
         struct pci_dev *dev     = HWIF(drive)->pci_dev;
-        u8 speed        = ide_rate_filter(hpt34x_ratemask(drive), xferspeed);
+        u8 speed = ide_rate_filter(drive, xferspeed);
         u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0;
         u8                      hi_speed, lo_speed;
 
@@ -89,29 +84,11 @@ static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio)
         (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio));
 }
 
-/*
- * This allows the configuration of ide_pci chipset registers
- * for cards that learn about the drive's UDMA, DMA, PIO capabilities
- * after the drive is reported by the OS.  Initially for designed for
- * HPT343 UDMA chipset by HighPoint|Triones Technologies, Inc.
- */
-
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, hpt34x_ratemask(drive));
-
-        if (!(speed))
-                return 0;
-
-        (void) hpt34x_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
 #ifndef CONFIG_HPT34X_AUTODMA
                 return -1;
 #else
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index cf9d344d19f8..fcbc5605b38e 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -514,43 +514,31 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
         return 0;
 }
 
-static u8 hpt3xx_ratemask(ide_drive_t *drive)
-{
-        struct hpt_info *info   = pci_get_drvdata(HWIF(drive)->pci_dev);
-        u8 mode                 = info->max_mode;
-
-        if (!eighty_ninty_three(drive) && mode)
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
 /*
  *      Note for the future; the SATA hpt37x we must set
  *      either PIO or UDMA modes 0,4,5
  */
- 
-static u8 hpt3xx_ratefilter(ide_drive_t *drive, u8 speed)
+
+static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 {
         struct hpt_info *info   = pci_get_drvdata(HWIF(drive)->pci_dev);
         u8 chip_type            = info->chip_type;
-        u8 mode                 = hpt3xx_ratemask(drive);
-
-        if (drive->media != ide_disk)
-                return min(speed, (u8)XFER_PIO_4);
+        u8 mode                 = info->max_mode;
+        u8 mask;
 
         switch (mode) {
                 case 0x04:
-                        speed = min_t(u8, speed, XFER_UDMA_6);
+                        mask = 0x7f;
                         break;
                 case 0x03:
-                        speed = min_t(u8, speed, XFER_UDMA_5);
+                        mask = 0x3f;
                         if (chip_type >= HPT374)
                                 break;
                         if (!check_in_drive_list(drive, bad_ata100_5))
                                 goto check_bad_ata33;
                         /* fall thru */
                 case 0x02:
-                        speed = min_t(u8, speed, XFER_UDMA_4);
+                        mask = 0x1f;
 
                         /*
                          * CHECK ME, Does this need to be changed to HPT374 ??
@@ -561,13 +549,13 @@ static u8 hpt3xx_ratefilter(ide_drive_t *drive, u8 speed)
                             !check_in_drive_list(drive, bad_ata66_4))
                                 goto check_bad_ata33;
 
-                        speed = min_t(u8, speed, XFER_UDMA_3);
+                        mask = 0x0f;
                         if (HPT366_ALLOW_ATA66_3 &&
                             !check_in_drive_list(drive, bad_ata66_3))
                                 goto check_bad_ata33;
                         /* fall thru */
                 case 0x01:
-                        speed = min_t(u8, speed, XFER_UDMA_2);
+                        mask = 0x07;
 
                 check_bad_ata33:
                         if (chip_type >= HPT370A)
@@ -577,10 +565,10 @@ static u8 hpt3xx_ratefilter(ide_drive_t *drive, u8 speed)
                         /* fall thru */
                 case 0x00:
                 default:
-                        speed = min_t(u8, speed, XFER_MW_DMA_2);
+                        mask = 0x00;
                         break;
         }
-        return speed;
+        return mask;
 }
 
 static u32 get_speed_setting(u8 speed, struct hpt_info *info)
@@ -608,12 +596,19 @@ static int hpt36x_tune_chipset(ide_drive_t *drive, u8 xferspeed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev  *dev    = hwif->pci_dev;
         struct hpt_info *info   = pci_get_drvdata(dev);
-        u8  speed               = hpt3xx_ratefilter(drive, xferspeed);
+        u8  speed               = ide_rate_filter(drive, xferspeed);
         u8  itr_addr            = drive->dn ? 0x44 : 0x40;
-        u32 itr_mask            = speed < XFER_MW_DMA_0 ? 0x30070000 :
-                                 (speed < XFER_UDMA_0   ? 0xc0070000 : 0xc03800ff);
-        u32 new_itr             = get_speed_setting(speed, info);
         u32 old_itr             = 0;
+        u32 itr_mask, new_itr;
+
+        /* TODO: move this to ide_rate_filter() [ check ->atapi_dma ] */
+        if (drive->media != ide_disk)
+                speed = min_t(u8, speed, XFER_PIO_4);
+
+        itr_mask = speed < XFER_MW_DMA_0 ? 0x30070000 :
+                  (speed < XFER_UDMA_0   ? 0xc0070000 : 0xc03800ff);
+
+        new_itr = get_speed_setting(speed, info);
 
         /*
          * Disable on-chip PIO FIFO/buffer (and PIO MST mode as well)
@@ -633,12 +628,19 @@ static int hpt37x_tune_chipset(ide_drive_t *drive, u8 xferspeed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev  *dev    = hwif->pci_dev;
         struct hpt_info *info   = pci_get_drvdata(dev);
-        u8  speed               = hpt3xx_ratefilter(drive, xferspeed);
+        u8  speed               = ide_rate_filter(drive, xferspeed);
         u8  itr_addr            = 0x40 + (drive->dn * 4);
-        u32 itr_mask            = speed < XFER_MW_DMA_0 ? 0x303c0000 :
-                                 (speed < XFER_UDMA_0   ? 0xc03c0000 : 0xc1c001ff);
-        u32 new_itr             = get_speed_setting(speed, info);
         u32 old_itr             = 0;
+        u32 itr_mask, new_itr;
+
+        /* TODO: move this to ide_rate_filter() [ check ->atapi_dma ] */
+        if (drive->media != ide_disk)
+                speed = min_t(u8, speed, XFER_PIO_4);
+
+        itr_mask = speed < XFER_MW_DMA_0 ? 0x303c0000 :
+                  (speed < XFER_UDMA_0   ? 0xc03c0000 : 0xc1c001ff);
+
+        new_itr = get_speed_setting(speed, info);
 
         pci_read_config_dword(dev, itr_addr, &old_itr);
         new_itr = (new_itr & ~itr_mask) | (old_itr & itr_mask);
@@ -667,24 +669,6 @@ static void hpt3xx_tune_drive(ide_drive_t *drive, u8 pio)
         (void) hpt3xx_tune_chipset (drive, XFER_PIO_0 + pio);
 }
 
-/*
- * This allows the configuration of ide_pci chipset registers
- * for cards that learn about the drive's UDMA, DMA, PIO capabilities
- * after the drive is reported by the OS.  Initially designed for
- * HPT366 UDMA chipset by HighPoint|Triones Technologies, Inc.
- *
- */
-static int config_chipset_for_dma(ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, hpt3xx_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        (void) hpt3xx_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int hpt3xx_quirkproc(ide_drive_t *drive)
 {
         struct hd_driveid *id   = drive->id;
@@ -739,7 +723,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -1271,6 +1255,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         hwif->intrproc                  = &hpt3xx_intrproc;
         hwif->maskproc                  = &hpt3xx_maskproc;
         hwif->busproc                   = &hpt3xx_busproc;
+        hwif->udma_filter               = &hpt3xx_udma_filter;
 
         /*
          * HPT3xxN chips have some complications:
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 424f00bb160d..c04a02687b95 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -17,22 +17,6 @@
 
 #include <asm/io.h>
 
-/*
- *      it8213_ratemask -       Compute available modes
- *      @drive: IDE drive
- *
- *      Compute the available speeds for the devices on the interface. This
- *      is all modes to ATA133 clipped by drive cable setup.
- */
-
-static u8 it8213_ratemask (ide_drive_t *drive)
-{
-        u8 mode = 4;
-        if (!eighty_ninty_three(drive))
-                mode = min_t(u8, mode, 1);
-        return mode;
-}
-
 /**
  *      it8213_dma_2_pio                -       return the PIO mode matching DMA
  *      @xfer_rate: transfer speed
@@ -145,7 +129,7 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
         u8 maslave              = 0x40;
-        u8 speed                = ide_rate_filter(it8213_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
         int a_speed             = 3 << (drive->dn * 4);
         int u_flag              = 1 << drive->dn;
         int v_flag              = 0x01 << drive->dn;
@@ -213,25 +197,6 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         return ide_config_drive_speed(drive, speed);
 }
 
-/*
- *      config_chipset_for_dma  -       configure for DMA
- *      @drive: drive to configure
- *
- *      Called by the IDE layer when it wants the timings set up.
- */
-
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, it8213_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        it8213_tune_chipset(drive, speed);
-
-        return ide_dma_enable(drive);
-}
-
 /**
  *      it8213_configure_drive_for_dma  -       set up for DMA transfers
  *      @drive: drive we are going to set up
@@ -246,7 +211,7 @@ static int it8213_config_drive_for_dma (ide_drive_t *drive)
 {
         u8 pio;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         pio = ide_get_best_pio_mode(drive, 255, 4, NULL);
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 4e1254813ee0..5faaff87d580 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -229,22 +229,6 @@ static void it821x_clock_strategy(ide_drive_t *drive)
 }
 
 /**
- *      it821x_ratemask -       Compute available modes
- *      @drive: IDE drive
- *
- *      Compute the available speeds for the devices on the interface. This
- *      is all modes to ATA133 clipped by drive cable setup.
- */
-
-static u8 it821x_ratemask (ide_drive_t *drive)
-{
-        u8 mode = 4;
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
-/**
  *      it821x_tunepio  -       tune a drive
  *      @drive: drive to tune
  *      @pio: the desired PIO mode
@@ -438,7 +422,7 @@ static int it821x_tune_chipset (ide_drive_t *drive, byte xferspeed)
 
         ide_hwif_t *hwif        = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        u8 speed                = ide_rate_filter(it821x_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
 
         switch (speed) {
         case XFER_PIO_4:
@@ -480,25 +464,6 @@ static int it821x_tune_chipset (ide_drive_t *drive, byte xferspeed)
 }
 
 /**
- *      config_chipset_for_dma  -       configure for DMA
- *      @drive: drive to configure
- *
- *      Called by the IDE layer when it wants the timings set up.
- */
-
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed        = ide_dma_speed(drive, it821x_ratemask(drive));
-
-        if (speed == 0)
-                return 0;
-
-        it821x_tune_chipset(drive, speed);
-
-        return ide_dma_enable(drive);
-}
-
-/**
  *      it821x_configure_drive_for_dma  -       set up for DMA transfers
  *      @drive: drive we are going to set up
  *
@@ -510,7 +475,7 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int it821x_config_drive_for_dma (ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         it821x_tuneproc(drive, 255);
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index be4fc96c29e0..76ed25147229 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -22,22 +22,6 @@ typedef enum {
 } port_type;
 
 /**
- *      jmicron_ratemask        -       Compute available modes
- *      @drive: IDE drive
- *
- *      Compute the available speeds for the devices on the interface. This
- *      is all modes to ATA133 clipped by drive cable setup.
- */
-
-static u8 jmicron_ratemask(ide_drive_t *drive)
-{
-        u8 mode = 4;
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
-/**
  *      ata66_jmicron           -       Cable check
  *      @hwif: IDE port
  *
@@ -129,32 +113,12 @@ static void config_jmicron_chipset_for_pio (ide_drive_t *drive, byte set_speed)
 
 static int jmicron_tune_chipset (ide_drive_t *drive, byte xferspeed)
 {
-
-        u8 speed                = ide_rate_filter(jmicron_ratemask(drive), xferspeed);
+        u8 speed = ide_rate_filter(drive, xferspeed);
 
         return ide_config_drive_speed(drive, speed);
 }
 
 /**
- *      config_chipset_for_dma  -       configure for DMA
- *      @drive: drive to configure
- *
- *      As the JMicron snoops for timings all we actually need to do is
- *      make sure we don't set an invalid mode.
- */
-
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed        = ide_dma_speed(drive, jmicron_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        jmicron_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
-/**
  *      jmicron_configure_drive_for_dma -       set up for DMA transfers
  *      @drive: drive we are going to set up
  *
@@ -164,7 +128,7 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int jmicron_config_drive_for_dma (ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         config_jmicron_chipset_for_pio(drive, 1);
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 2da5cbb53566..cc0bfdcf1f19 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -37,8 +37,6 @@
 #include <asm/pci-bridge.h>
 #endif
 
-#define PDC202_DEBUG_CABLE      0
-
 #undef DEBUG
 
 #ifdef DEBUG
@@ -82,16 +80,6 @@ static u8 max_dma_rate(struct pci_dev *pdev)
         return mode;
 }
 
-static u8 pdcnew_ratemask(ide_drive_t *drive)
-{
-        u8 mode = max_dma_rate(HWIF(drive)->pci_dev);
-
-        if (!eighty_ninty_three(drive))
-                mode = min_t(u8, mode, 1);
-
-        return  mode;
-}
-
 /**
  * get_indexed_reg - Get indexed register
  * @hwif: for the port address
@@ -164,7 +152,7 @@ static int pdcnew_tune_chipset(ide_drive_t *drive, u8 speed)
         u8 adj                  = (drive->dn & 1) ? 0x08 : 0x00;
         int                     err;
 
-        speed = ide_rate_filter(pdcnew_ratemask(drive), speed);
+        speed = ide_rate_filter(drive, speed);
 
         /*
          * Issue SETFEATURES_XFER to the drive first. PDC202xx hardware will
@@ -240,47 +228,11 @@ static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
         return get_indexed_reg(hwif, 0x0b) & 0x04;
 }
 
-static int config_chipset_for_dma(ide_drive_t *drive)
-{
-        struct hd_driveid *id   = drive->id;
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 ultra_66             = (id->dma_ultra & 0x0078) ? 1 : 0;
-        u8 cable                = pdcnew_cable_detect(hwif);
-        u8 speed;
-
-        if (ultra_66 && cable) {
-                printk(KERN_WARNING "Warning: %s channel "
-                       "requires an 80-pin cable for operation.\n",
-                       hwif->channel ? "Secondary" : "Primary");
-                printk(KERN_WARNING "%s reduced to Ultra33 mode.\n", drive->name);
-        }
-
-        if (id->capability & 4) {
-                /*
-                 * Set IORDY_EN & PREFETCH_EN (this seems to have
-                 * NO real effect since this register is reloaded
-                 * by hardware when the transfer mode is selected)
-                 */
-                u8 tmp, adj = (drive->dn & 1) ? 0x08 : 0x00;
-
-                tmp = get_indexed_reg(hwif, 0x13 + adj);
-                set_indexed_reg(hwif, 0x13 + adj, tmp | 0x03);
-        }
-
-        speed = ide_dma_speed(drive, pdcnew_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        (void) hwif->speedproc(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -395,7 +347,7 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev)
         unsigned int class_rev = 0;
         u8 conf;
 
-        if (np == NULL || !device_is_compatible(np, "kiwi-root"))
+        if (np == NULL || !of_device_is_compatible(np, "kiwi-root"))
                 return;
 
         pci_read_config_dword(pdev, PCI_CLASS_REVISION, &class_rev);
@@ -543,7 +495,8 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
         hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
 
         hwif->atapi_dma  = 1;
-        hwif->ultra_mask = 0x7f;
+
+        hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
 
         hwif->err_stops_fifo = 1;
@@ -556,11 +509,6 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
         if (!noautodma)
                 hwif->autodma = 1;
         hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
-
-#if PDC202_DEBUG_CABLE
-        printk(KERN_DEBUG "%s: %s-pin cable\n",
-                hwif->name, hwif->udma_four ? "80" : "40");
-#endif /* PDC202_DEBUG_CABLE */
 }
 
 static int __devinit init_setup_pdcnew(struct pci_dev *dev, ide_pci_device_t *d)
@@ -619,6 +567,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 1 */
                 .name           = "PDC20269",
                 .init_setup     = init_setup_pdcnew,
@@ -627,6 +576,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 2 */
                 .name           = "PDC20270",
                 .init_setup     = init_setup_pdc20270,
@@ -635,6 +585,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 3 */
                 .name           = "PDC20271",
                 .init_setup     = init_setup_pdcnew,
@@ -643,6 +594,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 4 */
                 .name           = "PDC20275",
                 .init_setup     = init_setup_pdcnew,
@@ -651,6 +603,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 5 */
                 .name           = "PDC20276",
                 .init_setup     = init_setup_pdc20276,
@@ -659,6 +612,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 6 */
                 .name           = "PDC20277",
                 .init_setup     = init_setup_pdcnew,
@@ -667,6 +621,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .udma_mask      = 0x7f, /* udma0-6*/
         }
 };
 
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index a7a639fe1eaf..23844687deea 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -1,8 +1,9 @@
 /*
- *  linux/drivers/ide/pci/pdc202xx_old.c        Version 0.36    Sept 11, 2002
+ *  linux/drivers/ide/pci/pdc202xx_old.c        Version 0.50    Mar 3, 2007
  *
  *  Copyright (C) 1998-2002             Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2006-2007             MontaVista Software, Inc.
+ *  Copyright (C) 2007                  Bartlomiej Zolnierkiewicz
  *
  *  Promise Ultra33 cards with BIOS v1.20 through 1.28 will need this
  *  compiled into the kernel if you have more than one card installed.
@@ -46,7 +47,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#define PDC202_DEBUG_CABLE              0
 #define PDC202XX_DEBUG_DRIVE_INFO       0
 
 static const char *pdc_quirk_drives[] = {
@@ -61,122 +61,34 @@ static const char *pdc_quirk_drives[] = {
         NULL
 };
 
-/* A Register */
-#define SYNC_ERRDY_EN   0xC0
-
-#define SYNC_IN         0x80    /* control bit, different for master vs. slave drives */
-#define ERRDY_EN        0x40    /* control bit, different for master vs. slave drives */
-#define IORDY_EN        0x20    /* PIO: IOREADY */
-#define PREFETCH_EN     0x10    /* PIO: PREFETCH */
-
-#define PA3             0x08    /* PIO"A" timing */
-#define PA2             0x04    /* PIO"A" timing */
-#define PA1             0x02    /* PIO"A" timing */
-#define PA0             0x01    /* PIO"A" timing */
-
-/* B Register */
-
-#define MB2             0x80    /* DMA"B" timing */
-#define MB1             0x40    /* DMA"B" timing */
-#define MB0             0x20    /* DMA"B" timing */
-
-#define PB4             0x10    /* PIO_FORCE 1:0 */
-
-#define PB3             0x08    /* PIO"B" timing */     /* PIO flow Control mode */
-#define PB2             0x04    /* PIO"B" timing */     /* PIO 4 */
-#define PB1             0x02    /* PIO"B" timing */     /* PIO 3 half */
-#define PB0             0x01    /* PIO"B" timing */     /* PIO 3 other half */
-
-/* C Register */
-#define IORDYp_NO_SPEED 0x4F
-#define SPEED_DIS       0x0F
-
-#define DMARQp          0x80
-#define IORDYp          0x40
-#define DMAR_EN         0x20
-#define DMAW_EN         0x10
-
-#define MC3             0x08    /* DMA"C" timing */
-#define MC2             0x04    /* DMA"C" timing */
-#define MC1             0x02    /* DMA"C" timing */
-#define MC0             0x01    /* DMA"C" timing */
-
-static u8 pdc202xx_ratemask (ide_drive_t *drive)
-{
-        u8 mode;
-
-        switch(HWIF(drive)->pci_dev->device) {
-                case PCI_DEVICE_ID_PROMISE_20267:
-                case PCI_DEVICE_ID_PROMISE_20265:
-                        mode = 3;
-                        break;
-                case PCI_DEVICE_ID_PROMISE_20263:
-                case PCI_DEVICE_ID_PROMISE_20262:
-                        mode = 2;
-                        break;
-                case PCI_DEVICE_ID_PROMISE_20246:
-                        return 1;
-                default:
-                        return 0;
-        }
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
+static void pdc_old_disable_66MHz_clock(ide_hwif_t *);
 
 static int pdc202xx_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
         u8 drive_pci            = 0x60 + (drive->dn << 2);
-        u8 speed        = ide_rate_filter(pdc202xx_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
 
-        u32                     drive_conf;
-        u8                      AP, BP, CP, DP;
+        u8                      AP = 0, BP = 0, CP = 0;
         u8                      TA = 0, TB = 0, TC = 0;
 
-        if (drive->media != ide_disk &&
-                drive->media != ide_cdrom && speed < XFER_SW_DMA_0)
-                return -1;
-
+#if PDC202XX_DEBUG_DRIVE_INFO
+        u32                     drive_conf = 0;
         pci_read_config_dword(dev, drive_pci, &drive_conf);
-        pci_read_config_byte(dev, (drive_pci), &AP);
-        pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-        pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
-        pci_read_config_byte(dev, (drive_pci)|0x03, &DP);
-
-        if (speed < XFER_SW_DMA_0) {
-                if ((AP & 0x0F) || (BP & 0x07)) {
-                        /* clear PIO modes of lower 8421 bits of A Register */
-                        pci_write_config_byte(dev, (drive_pci), AP &~0x0F);
-                        pci_read_config_byte(dev, (drive_pci), &AP);
+#endif
 
-                        /* clear PIO modes of lower 421 bits of B Register */
-                        pci_write_config_byte(dev, (drive_pci)|0x01, BP &~0x07);
-                        pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-
-                        pci_read_config_byte(dev, (drive_pci), &AP);
-                        pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-                }
-        } else {
-                if ((BP & 0xF0) && (CP & 0x0F)) {
-                        /* clear DMA modes of upper 842 bits of B Register */
-                        /* clear PIO forced mode upper 1 bit of B Register */
-                        pci_write_config_byte(dev, (drive_pci)|0x01, BP &~0xF0);
-                        pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-
-                        /* clear DMA modes of lower 8421 bits of C Register */
-                        pci_write_config_byte(dev, (drive_pci)|0x02, CP &~0x0F);
-                        pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
-                }
-        }
+        /*
+         * TODO: do this once per channel
+         */
+        if (dev->device != PCI_DEVICE_ID_PROMISE_20246)
+                pdc_old_disable_66MHz_clock(hwif);
 
-        pci_read_config_byte(dev, (drive_pci), &AP);
-        pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-        pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
+        pci_read_config_byte(dev, drive_pci,     &AP);
+        pci_read_config_byte(dev, drive_pci + 1, &BP);
+        pci_read_config_byte(dev, drive_pci + 2, &CP);
 
         switch(speed) {
-                case XFER_UDMA_6:       speed = XFER_UDMA_5;
                 case XFER_UDMA_5:
                 case XFER_UDMA_4:       TB = 0x20; TC = 0x01; break;
                 case XFER_UDMA_2:       TB = 0x20; TC = 0x01; break;
@@ -185,7 +97,7 @@ static int pdc202xx_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                 case XFER_UDMA_0:
                 case XFER_MW_DMA_2:     TB = 0x60; TC = 0x03; break;
                 case XFER_MW_DMA_1:     TB = 0x60; TC = 0x04; break;
-                case XFER_MW_DMA_0:
+                case XFER_MW_DMA_0:     TB = 0xE0; TC = 0x0F; break;
                 case XFER_SW_DMA_2:     TB = 0x60; TC = 0x05; break;
                 case XFER_SW_DMA_1:     TB = 0x80; TC = 0x06; break;
                 case XFER_SW_DMA_0:     TB = 0xC0; TC = 0x0B; break;
@@ -198,25 +110,39 @@ static int pdc202xx_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         }
 
         if (speed < XFER_SW_DMA_0) {
-                pci_write_config_byte(dev, (drive_pci), AP|TA);
-                pci_write_config_byte(dev, (drive_pci)|0x01, BP|TB);
+                /*
+                 * preserve SYNC_INT / ERDDY_EN bits while clearing
+                 * Prefetch_EN / IORDY_EN / PA[3:0] bits of register A
+                 */
+                AP &= ~0x3f;
+                if (drive->id->capability & 4)
+                        AP |= 0x20;     /* set IORDY_EN bit */
+                if (drive->media == ide_disk)
+                        AP |= 0x10;     /* set Prefetch_EN bit */
+                /* clear PB[4:0] bits of register B */
+                BP &= ~0x1f;
+                pci_write_config_byte(dev, drive_pci,     AP | TA);
+                pci_write_config_byte(dev, drive_pci + 1, BP | TB);
         } else {
-                pci_write_config_byte(dev, (drive_pci)|0x01, BP|TB);
-                pci_write_config_byte(dev, (drive_pci)|0x02, CP|TC);
+                /* clear MB[2:0] bits of register B */
+                BP &= ~0xe0;
+                /* clear MC[3:0] bits of register C */
+                CP &= ~0x0f;
+                pci_write_config_byte(dev, drive_pci + 1, BP | TB);
+                pci_write_config_byte(dev, drive_pci + 2, CP | TC);
         }
 
 #if PDC202XX_DEBUG_DRIVE_INFO
         printk(KERN_DEBUG "%s: %s drive%d 0x%08x ",
                 drive->name, ide_xfer_verbose(speed),
                 drive->dn, drive_conf);
-                pci_read_config_dword(dev, drive_pci, &drive_conf);
+        pci_read_config_dword(dev, drive_pci, &drive_conf);
         printk("0x%08x\n", drive_conf);
-#endif /* PDC202XX_DEBUG_DRIVE_INFO */
+#endif
 
-        return (ide_config_drive_speed(drive, speed));
+        return ide_config_drive_speed(drive, speed);
 }
 
-
 static void pdc202xx_tune_drive(ide_drive_t *drive, u8 pio)
 {
         pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
@@ -234,6 +160,8 @@ static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif)
  * Set the control register to use the 66MHz system
  * clock for UDMA 3/4/5 mode operation when necessary.
  *
+ * FIXME: this register is shared by both channels, some locking is needed
+ *
  * It may also be possible to leave the 66MHz clock on
  * and readjust the timing parameters.
  */
@@ -253,78 +181,11 @@ static void pdc_old_disable_66MHz_clock(ide_hwif_t *hwif)
         outb(clock & ~(hwif->channel ? 0x08 : 0x02), clock_reg);
 }
 
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        struct hd_driveid *id   = drive->id;
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
-        u32 drive_conf          = 0;
-        u8 drive_pci            = 0x60 + (drive->dn << 2);
-        u8 test1 = 0, test2 = 0, speed = -1;
-        u8 AP = 0, cable = 0;
-
-        u8 ultra_66             = ((id->dma_ultra & 0x0010) ||
-                                   (id->dma_ultra & 0x0008)) ? 1 : 0;
-
-        if (dev->device != PCI_DEVICE_ID_PROMISE_20246)
-                cable = pdc202xx_old_cable_detect(hwif);
-        else
-                ultra_66 = 0;
-
-        if (ultra_66 && cable) {
-                printk(KERN_WARNING "Warning: %s channel requires an 80-pin cable for operation.\n", hwif->channel ? "Secondary":"Primary");
-                printk(KERN_WARNING "%s reduced to Ultra33 mode.\n", drive->name);
-        }
-
-        if (dev->device != PCI_DEVICE_ID_PROMISE_20246)
-                pdc_old_disable_66MHz_clock(drive->hwif);
-
-        drive_pci = 0x60 + (drive->dn << 2);
-        pci_read_config_dword(dev, drive_pci, &drive_conf);
-        if ((drive_conf != 0x004ff304) && (drive_conf != 0x004ff3c4))
-                goto chipset_is_set;
-
-        pci_read_config_byte(dev, drive_pci, &test1);
-        if (!(test1 & SYNC_ERRDY_EN)) {
-                if (drive->select.b.unit & 0x01) {
-                        pci_read_config_byte(dev, drive_pci - 4, &test2);
-                        if ((test2 & SYNC_ERRDY_EN) &&
-                            !(test1 & SYNC_ERRDY_EN)) {
-                                pci_write_config_byte(dev, drive_pci,
-                                        test1|SYNC_ERRDY_EN);
-                        }
-                } else {
-                        pci_write_config_byte(dev, drive_pci,
-                                test1|SYNC_ERRDY_EN);
-                }
-        }
-
-chipset_is_set:
-
-        pci_read_config_byte(dev, (drive_pci), &AP);
-        if (id->capability & 4) /* IORDY_EN */
-                pci_write_config_byte(dev, (drive_pci), AP|IORDY_EN);
-        pci_read_config_byte(dev, (drive_pci), &AP);
-        if (drive->media == ide_disk)   /* PREFETCH_EN */
-                pci_write_config_byte(dev, (drive_pci), AP|PREFETCH_EN);
-
-        speed = ide_dma_speed(drive, pdc202xx_ratemask(drive));
-
-        if (!(speed)) {
-                /* restore original pci-config space */
-                pci_write_config_dword(dev, drive_pci, drive_conf);
-                return 0;
-        }
-
-        (void) hwif->speedproc(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -478,7 +339,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 
         hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
 
-        hwif->ultra_mask = 0x3f;
+        hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
         hwif->atapi_dma = 1;
@@ -500,10 +361,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         if (!noautodma)
                 hwif->autodma = 1;
         hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
-#if PDC202_DEBUG_CABLE
-        printk(KERN_DEBUG "%s: %s-pin cable\n",
-                hwif->name, hwif->udma_four ? "80" : "40");
-#endif /* PDC202_DEBUG_CABLE */ 
 }
 
 static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase)
@@ -587,6 +444,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 16,
+                .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 1 */
                 .name           = "PDC20262",
                 .init_setup     = init_setup_pdc202ata4,
@@ -597,6 +455,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 2 */
                 .name           = "PDC20263",
                 .init_setup     = init_setup_pdc202ata4,
@@ -607,6 +466,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
                 .name           = "PDC20265",
                 .init_setup     = init_setup_pdc20265,
@@ -617,6 +477,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 4 */
                 .name           = "PDC20267",
                 .init_setup     = init_setup_pdc202xx,
@@ -627,6 +488,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .udma_mask      = 0x3f, /* udma0-5 */
         }
 };
 
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 061d300ab8be..8b219dd63024 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -106,68 +106,6 @@
 static int no_piix_dma;
 
 /**
- *      piix_ratemask           -       compute rate mask for PIIX IDE
- *      @drive: IDE drive to compute for
- *
- *      Returns the available modes for the PIIX IDE controller.
- */
- 
-static u8 piix_ratemask (ide_drive_t *drive)
-{
-        struct pci_dev *dev     = HWIF(drive)->pci_dev;
-        u8 mode;
-
-        switch(dev->device) {
-                case PCI_DEVICE_ID_INTEL_82801EB_1:
-                        mode = 3;
-                        break;
-                /* UDMA 100 capable */
-                case PCI_DEVICE_ID_INTEL_82801BA_8:
-                case PCI_DEVICE_ID_INTEL_82801BA_9:
-                case PCI_DEVICE_ID_INTEL_82801CA_10:
-                case PCI_DEVICE_ID_INTEL_82801CA_11:
-                case PCI_DEVICE_ID_INTEL_82801E_11:
-                case PCI_DEVICE_ID_INTEL_82801DB_1:
-                case PCI_DEVICE_ID_INTEL_82801DB_10:
-                case PCI_DEVICE_ID_INTEL_82801DB_11:
-                case PCI_DEVICE_ID_INTEL_82801EB_11:
-                case PCI_DEVICE_ID_INTEL_ESB_2:
-                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 */
-                case PCI_DEVICE_ID_INTEL_82801AA_1:
-                case PCI_DEVICE_ID_INTEL_82372FB_1:
-                        mode = 2;
-                        break;
-                /* UDMA 33 capable */
-                case PCI_DEVICE_ID_INTEL_82371AB:
-                case PCI_DEVICE_ID_INTEL_82443MX_1:
-                case PCI_DEVICE_ID_INTEL_82451NX:
-                case PCI_DEVICE_ID_INTEL_82801AB_1:
-                        return 1;
-                /* Non UDMA capable (MWDMA2) */
-                case PCI_DEVICE_ID_INTEL_82371SB_1:
-                case PCI_DEVICE_ID_INTEL_82371FB_1:
-                case PCI_DEVICE_ID_INTEL_82371FB_0:
-                case PCI_DEVICE_ID_INTEL_82371MX:
-                default:
-                        return 0;
-        }
-        
-        /*
-         *      If we are UDMA66 capable fall back to UDMA33 
-         *      if the drive cannot see an 80pin cable.
-         */
-        if (!eighty_ninty_three(drive))
-                mode = min_t(u8, mode, 1);
-        return mode;
-}
-
-/**
  *      piix_dma_2_pio          -       return the PIO mode matching DMA
  *      @xfer_rate: transfer speed
  *
@@ -301,7 +239,7 @@ static int piix_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
         u8 maslave              = hwif->channel ? 0x42 : 0x40;
-        u8 speed                = ide_rate_filter(piix_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
         int a_speed             = 3 << (drive->dn * 4);
         int u_flag              = 1 << drive->dn;
         int v_flag              = 0x01 << drive->dn;
@@ -366,30 +304,6 @@ static int piix_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 }
 
 /**
- *      piix_config_drive_for_dma       -       configure drive for DMA
- *      @drive: IDE drive to configure
- *
- *      Set up a PIIX interface channel for the best available speed.
- *      We prefer UDMA if it is available and then MWDMA.  If DMA is
- *      not available we switch to PIO and return 0.
- */
- 
-static int piix_config_drive_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, piix_ratemask(drive));
-
-        /*
-         * If no DMA speed was available or the chipset has DMA bugs
-         * then disable DMA and use PIO
-         */
-        if (!speed)
-                return 0;
-
-        (void) piix_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
-/**
  *      piix_config_drive_xfer_rate     -       set up an IDE device
  *      @drive: IDE drive to configure
  *
@@ -401,7 +315,7 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && piix_config_drive_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -524,26 +438,14 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
                 hwif->ide_dma_clear_irq = &piix_dma_clear_irq;
 
         hwif->atapi_dma = 1;
-        hwif->ultra_mask = 0x3f;
+
+        hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x06;
         hwif->swdma_mask = 0x04;
 
-        switch(hwif->pci_dev->device) {
-                case PCI_DEVICE_ID_INTEL_82371FB_0:
-                case PCI_DEVICE_ID_INTEL_82371FB_1:
-                case PCI_DEVICE_ID_INTEL_82371SB_1:
-                        hwif->ultra_mask = 0x80;
-                        break;
-                case PCI_DEVICE_ID_INTEL_82371AB:
-                case PCI_DEVICE_ID_INTEL_82443MX_1:
-                case PCI_DEVICE_ID_INTEL_82451NX:
-                case PCI_DEVICE_ID_INTEL_82801AB_1:
-                        hwif->ultra_mask = 0x07;
-                        break;
-                default:
-                        if (!hwif->udma_four)
-                                hwif->udma_four = piix_cable_detect(hwif);
-                        break;
+        if (hwif->ultra_mask & 0x78) {
+                if (!hwif->udma_four)
+                        hwif->udma_four = piix_cable_detect(hwif);
         }
 
         if (no_piix_dma)
@@ -557,7 +459,7 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
         hwif->drives[0].autodma = hwif->autodma;
 }
 
-#define DECLARE_PIIX_DEV(name_str) \
+#define DECLARE_PIIX_DEV(name_str, udma) \
         {                                               \
                 .name           = name_str,             \
                 .init_chipset   = init_chipset_piix,    \
@@ -566,11 +468,12 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
                 .autodma        = AUTODMA,              \
                 .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
                 .bootable       = ON_BOARD,             \
+                .udma_mask      = udma,                 \
         }
 
 static ide_pci_device_t piix_pci_info[] __devinitdata = {
-        /*  0 */ DECLARE_PIIX_DEV("PIIXa"),
-        /*  1 */ DECLARE_PIIX_DEV("PIIXb"),
+        /*  0 */ DECLARE_PIIX_DEV("PIIXa", 0x00),       /* no udma */
+        /*  1 */ DECLARE_PIIX_DEV("PIIXb", 0x00),       /* no udma */
 
         /*  2 */
         {       /*
@@ -587,28 +490,28 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
                 .flags          = IDEPCI_FLAG_ISA_PORTS
         },
 
-        /*  3 */ DECLARE_PIIX_DEV("PIIX3"),
-        /*  4 */ DECLARE_PIIX_DEV("PIIX4"),
-        /*  5 */ DECLARE_PIIX_DEV("ICH0"),
-        /*  6 */ DECLARE_PIIX_DEV("PIIX4"),
-        /*  7 */ DECLARE_PIIX_DEV("ICH"),
-        /*  8 */ DECLARE_PIIX_DEV("PIIX4"),
-        /*  9 */ DECLARE_PIIX_DEV("PIIX4"),
-        /* 10 */ DECLARE_PIIX_DEV("ICH2"),
-        /* 11 */ DECLARE_PIIX_DEV("ICH2M"),
-        /* 12 */ DECLARE_PIIX_DEV("ICH3M"),
-        /* 13 */ DECLARE_PIIX_DEV("ICH3"),
-        /* 14 */ DECLARE_PIIX_DEV("ICH4"),
-        /* 15 */ DECLARE_PIIX_DEV("ICH5"),
-        /* 16 */ DECLARE_PIIX_DEV("C-ICH"),
-        /* 17 */ DECLARE_PIIX_DEV("ICH4"),
-        /* 18 */ DECLARE_PIIX_DEV("ICH5-SATA"),
-        /* 19 */ DECLARE_PIIX_DEV("ICH5"),
-        /* 20 */ DECLARE_PIIX_DEV("ICH6"),
-        /* 21 */ DECLARE_PIIX_DEV("ICH7"),
-        /* 22 */ DECLARE_PIIX_DEV("ICH4"),
-        /* 23 */ DECLARE_PIIX_DEV("ESB2"),
-        /* 24 */ DECLARE_PIIX_DEV("ICH8M"),
+        /*  3 */ DECLARE_PIIX_DEV("PIIX3", 0x00),       /* no udma */
+        /*  4 */ DECLARE_PIIX_DEV("PIIX4", 0x07),       /* udma0-2 */
+        /*  5 */ DECLARE_PIIX_DEV("ICH0",  0x07),       /* udma0-2 */
+        /*  6 */ DECLARE_PIIX_DEV("PIIX4", 0x07),       /* udma0-2 */
+        /*  7 */ DECLARE_PIIX_DEV("ICH",   0x1f),       /* udma0-4 */
+        /*  8 */ DECLARE_PIIX_DEV("PIIX4", 0x1f),       /* udma0-4 */
+        /*  9 */ DECLARE_PIIX_DEV("PIIX4", 0x07),       /* udma0-2 */
+        /* 10 */ DECLARE_PIIX_DEV("ICH2",  0x3f),       /* udma0-5 */
+        /* 11 */ DECLARE_PIIX_DEV("ICH2M", 0x3f),       /* udma0-5 */
+        /* 12 */ DECLARE_PIIX_DEV("ICH3M", 0x3f),       /* udma0-5 */
+        /* 13 */ DECLARE_PIIX_DEV("ICH3",  0x3f),       /* udma0-5 */
+        /* 14 */ DECLARE_PIIX_DEV("ICH4",  0x3f),       /* udma0-5 */
+        /* 15 */ DECLARE_PIIX_DEV("ICH5",  0x3f),       /* udma0-5 */
+        /* 16 */ DECLARE_PIIX_DEV("C-ICH", 0x3f),       /* udma0-5 */
+        /* 17 */ DECLARE_PIIX_DEV("ICH4",  0x3f),       /* udma0-5 */
+        /* 18 */ DECLARE_PIIX_DEV("ICH5-SATA", 0x3f),   /* udma0-5 */
+        /* 19 */ DECLARE_PIIX_DEV("ICH5",  0x3f),       /* udma0-5 */
+        /* 20 */ DECLARE_PIIX_DEV("ICH6",  0x3f),       /* udma0-5 */
+        /* 21 */ DECLARE_PIIX_DEV("ICH7",  0x3f),       /* udma0-5 */
+        /* 22 */ DECLARE_PIIX_DEV("ICH4",  0x3f),       /* udma0-5 */
+        /* 23 */ DECLARE_PIIX_DEV("ESB2",  0x3f),       /* udma0-5 */
+        /* 24 */ DECLARE_PIIX_DEV("ICH8M", 0x3f),       /* udma0-5 */
 };
 
 /**
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index b5ae0c50e216..523363c93794 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -1,7 +1,9 @@
 /*
- * linux/drivers/ide/pci/sc1200.c               Version 0.91    28-Jan-2003
+ * linux/drivers/ide/pci/sc1200.c               Version 0.94    Mar 10 2007
  *
  * Copyright (C) 2000-2002              Mark Lord <mlord@pobox.com>
+ * Copyright (C)      2007              Bartlomiej Zolnierkiewicz
+ *
  * May be copied or modified under the terms of the GNU General Public License
  *
  * Development of this chipset driver was funded
@@ -93,64 +95,50 @@ static const unsigned int sc1200_pio_timings[4][5] =
  */
 //#define SC1200_BAD_PIO(timings) (((timings)&~0x80000000)==0x00009172)
 
-static int sc1200_autoselect_dma_mode (ide_drive_t *drive)
+static void sc1200_tunepio(ide_drive_t *drive, u8 pio)
 {
-        int                     udma_ok = 1, mode = 0;
-        ide_hwif_t              *hwif = HWIF(drive);
-        int                     unit = drive->select.b.unit;
-        ide_drive_t             *mate = &hwif->drives[unit^1];
-        struct hd_driveid       *id = drive->id;
-
-        /*
-         * The SC1200 specifies that two drives sharing a cable cannot
-         * mix UDMA/MDMA.  It has to be one or the other, for the pair,
-         * though different timings can still be chosen for each drive.
-         * We could set the appropriate timing bits on the fly,
-         * but that might be a bit confusing.  So, for now we statically
-         * handle this requirement by looking at our mate drive to see
-         * what it is capable of, before choosing a mode for our own drive.
-         */
-        if (mate->present) {
-                struct hd_driveid *mateid = mate->id;
-                if (mateid && (mateid->capability & 1) && !__ide_dma_bad_drive(mate)) {
-                        if ((mateid->field_valid & 4) && (mateid->dma_ultra & 7))
-                                udma_ok = 1;
-                        else if ((mateid->field_valid & 2) && (mateid->dma_mword & 7))
-                                udma_ok = 0;
-                        else
-                                udma_ok = 1;
-                }
-        }
-        /*
-         * Now see what the current drive is capable of,
-         * selecting UDMA only if the mate said it was ok.
-         */
-        if (id && (id->capability & 1) && hwif->autodma && !__ide_dma_bad_drive(drive)) {
-                if (udma_ok && (id->field_valid & 4) && (id->dma_ultra & 7)) {
-                        if      (id->dma_ultra & 4)
-                                mode = XFER_UDMA_2;
-                        else if (id->dma_ultra & 2)
-                                mode = XFER_UDMA_1;
-                        else if (id->dma_ultra & 1)
-                                mode = XFER_UDMA_0;
-                }
-                if (!mode && (id->field_valid & 2) && (id->dma_mword & 7)) {
-                        if      (id->dma_mword & 4)
-                                mode = XFER_MW_DMA_2;
-                        else if (id->dma_mword & 2)
-                                mode = XFER_MW_DMA_1;
-                        else if (id->dma_mword & 1)
-                                mode = XFER_MW_DMA_0;
-                }
-        }
-        return mode;
+        ide_hwif_t *hwif = drive->hwif;
+        struct pci_dev *pdev = hwif->pci_dev;
+        unsigned int basereg = hwif->channel ? 0x50 : 0x40, format = 0;
+
+        pci_read_config_dword(pdev, basereg + 4, &format);
+        format = (format >> 31) & 1;
+        if (format)
+                format += sc1200_get_pci_clock();
+        pci_write_config_dword(pdev, basereg + ((drive->dn & 1) << 3),
+                               sc1200_pio_timings[format][pio]);
 }
 
 /*
- * sc1200_config_dma2() handles selection/setting of DMA/UDMA modes
- * for both the chipset and drive.
+ *      The SC1200 specifies that two drives sharing a cable cannot mix
+ *      UDMA/MDMA.  It has to be one or the other, for the pair, though
+ *      different timings can still be chosen for each drive.  We could
+ *      set the appropriate timing bits on the fly, but that might be
+ *      a bit confusing.  So, for now we statically handle this requirement
+ *      by looking at our mate drive to see what it is capable of, before
+ *      choosing a mode for our own drive.
  */
-static int sc1200_config_dma2 (ide_drive_t *drive, int mode)
+static u8 sc1200_udma_filter(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        ide_drive_t *mate = &hwif->drives[(drive->dn & 1) ^ 1];
+        struct hd_driveid *mateid = mate->id;
+        u8 mask = hwif->ultra_mask;
+
+        if (mate->present == 0)
+                goto out;
+
+        if ((mateid->capability & 1) && __ide_dma_bad_drive(mate) == 0) {
+                if ((mateid->field_valid & 4) && (mateid->dma_ultra & 7))
+                        goto out;
+                if ((mateid->field_valid & 2) && (mateid->dma_mword & 7))
+                        mask = 0;
+        }
+out:
+        return mask;
+}
+
+static int sc1200_tune_chipset(ide_drive_t *drive, u8 mode)
 {
         ide_hwif_t              *hwif = HWIF(drive);
         int                     unit = drive->select.b.unit;
@@ -158,20 +146,26 @@ static int sc1200_config_dma2 (ide_drive_t *drive, int mode)
         unsigned short          pci_clock;
         unsigned int            basereg = hwif->channel ? 0x50 : 0x40;
 
-        /*
-         * Default to DMA-off in case we run into trouble here.
-         */
-        hwif->dma_off_quietly(drive);   /* turn off DMA while we fiddle */
-        outb(inb(hwif->dma_base+2)&~(unit?0x40:0x20), hwif->dma_base+2); /* clear DMA_capable bit */
+        mode = ide_rate_filter(drive, mode);
 
         /*
          * Tell the drive to switch to the new mode; abort on failure.
          */
-        if (!mode || sc1200_set_xfer_mode(drive, mode)) {
+        if (sc1200_set_xfer_mode(drive, mode)) {
                 printk("SC1200: set xfer mode failure\n");
                 return 1;       /* failure */
         }
 
+        switch (mode) {
+        case XFER_PIO_4:
+        case XFER_PIO_3:
+        case XFER_PIO_2:
+        case XFER_PIO_1:
+        case XFER_PIO_0:
+                sc1200_tunepio(drive, mode - XFER_PIO_0);
+                return 0;
+        }
+
         pci_clock = sc1200_get_pci_clock();
 
         /*
@@ -224,11 +218,9 @@ static int sc1200_config_dma2 (ide_drive_t *drive, int mode)
                                 case PCI_CLK_66:        timings = 0x00015151;   break;
                         }
                         break;
-        }
-
-        if (timings == 0) {
-                printk("%s: sc1200_config_dma: huh? mode=%02x clk=%x \n", drive->name, mode, pci_clock);
-                return 1;       /* failure */
+                default:
+                        BUG();
+                        break;
         }
 
         if (unit == 0) {                        /* are we configuring drive0? */
@@ -239,8 +231,6 @@ static int sc1200_config_dma2 (ide_drive_t *drive, int mode)
                 pci_write_config_dword(hwif->pci_dev, basereg+12, timings);
         }
 
-        outb(inb(hwif->dma_base+2)|(unit?0x40:0x20), hwif->dma_base+2); /* set DMA_capable bit */
-
         return 0;       /* success */
 }
 
@@ -250,7 +240,10 @@ static int sc1200_config_dma2 (ide_drive_t *drive, int mode)
  */
 static int sc1200_config_dma (ide_drive_t *drive)
 {
-        return sc1200_config_dma2(drive, sc1200_autoselect_dma_mode(drive));
+        if (ide_tune_dma(drive))
+                return 0;
+
+        return 1;
 }
 
 
@@ -290,10 +283,11 @@ static int sc1200_ide_dma_end (ide_drive_t *drive)
 static void sc1200_tuneproc (ide_drive_t *drive, byte pio)      /* mode=255 means "autotune" */
 {
         ide_hwif_t      *hwif = HWIF(drive);
-        unsigned int    format;
-        static byte     modes[5] = {XFER_PIO_0, XFER_PIO_1, XFER_PIO_2, XFER_PIO_3, XFER_PIO_4};
         int             mode = -1;
 
+        /*
+         * bad abuse of ->tuneproc interface
+         */
         switch (pio) {
                 case 200: mode = XFER_UDMA_0;   break;
                 case 201: mode = XFER_UDMA_1;   break;
@@ -304,20 +298,17 @@ static void sc1200_tuneproc (ide_drive_t *drive, byte pio)	/* mode=255 means "au
         }
         if (mode != -1) {
                 printk("SC1200: %s: changing (U)DMA mode\n", drive->name);
-                (void)sc1200_config_dma2(drive, mode);
+                hwif->dma_off_quietly(drive);
+                if (sc1200_tune_chipset(drive, mode) == 0)
+                        hwif->dma_host_on(drive);
                 return;
         }
 
         pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
         printk("SC1200: %s: setting PIO mode%d\n", drive->name, pio);
-        if (!sc1200_set_xfer_mode(drive, modes[pio])) {
-                unsigned int basereg = hwif->channel ? 0x50 : 0x40;
-                pci_read_config_dword (hwif->pci_dev, basereg+4, &format);
-                format = (format >> 31) & 1;
-                if (format)
-                        format += sc1200_get_pci_clock();
-                pci_write_config_dword(hwif->pci_dev, basereg + (drive->select.b.unit << 3), sc1200_pio_timings[format][pio]);
-        }
+
+        if (sc1200_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
+                sc1200_tunepio(drive, pio);
 }
 
 #ifdef CONFIG_PM
@@ -438,12 +429,12 @@ static int sc1200_resume (struct pci_dev *dev)
                 for (d = 0; d < MAX_DRIVES; ++d) {
                         ide_drive_t *drive = &(hwif->drives[d]);
                         if (drive->present && !__ide_dma_bad_drive(drive)) {
-                                int was_using_dma = drive->using_dma;
+                                int enable_dma = drive->using_dma;
                                 hwif->dma_off_quietly(drive);
-                                sc1200_config_dma(drive);
-                                if (!was_using_dma && drive->using_dma) {
-                                        hwif->dma_off_quietly(drive);
-                                }
+                                if (sc1200_config_dma(drive))
+                                        enable_dma = 0;
+                                if (enable_dma)
+                                        hwif->dma_host_on(drive);
                         }
                 }
         }
@@ -461,11 +452,13 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
                 hwif->serialized = hwif->mate->serialized = 1;
         hwif->autodma = 0;
         if (hwif->dma_base) {
+                hwif->udma_filter = sc1200_udma_filter;
                 hwif->ide_dma_check = &sc1200_config_dma;
                 hwif->ide_dma_end   = &sc1200_ide_dma_end;
                 if (!noautodma)
                         hwif->autodma = 1;
                 hwif->tuneproc = &sc1200_tuneproc;
+                hwif->speedproc = &sc1200_tune_chipset;
         }
         hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x07;
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index f84bf791f72e..55bc0a32e34f 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -190,23 +190,6 @@ scc_ide_outsl(unsigned long port, void *addr, u32 count)
 }
 
 /**
- *      scc_ratemask    -       Compute available modes
- *      @drive: IDE drive
- *
- *      Compute the available speeds for the devices on the interface.
- *      Enforce UDMA33 as a limit if there is no 80pin cable present.
- */
-
-static u8 scc_ratemask(ide_drive_t *drive)
-{
-        u8 mode = 4;
-
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
-
-/**
  *      scc_tuneproc    -       tune a drive PIO mode
  *      @drive: drive to tune
  *      @mode_wanted: the target operating mode
@@ -273,7 +256,7 @@ static void scc_tuneproc(ide_drive_t *drive, byte mode_wanted)
 static int scc_tune_chipset(ide_drive_t *drive, byte xferspeed)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        u8 speed = ide_rate_filter(scc_ratemask(drive), xferspeed);
+        u8 speed = ide_rate_filter(drive, xferspeed);
         struct scc_ports *ports = ide_get_hwifdata(hwif);
         unsigned long ctl_base = ports->ctl;
         unsigned long cckctrl_port = ctl_base + 0xff0;
@@ -339,26 +322,6 @@ static int scc_tune_chipset(ide_drive_t *drive, byte xferspeed)
 }
 
 /**
- *      scc_config_chipset_for_dma      -       configure for DMA
- *      @drive: drive to configure
- *
- *      Called by scc_config_drive_for_dma().
- */
-
-static int scc_config_chipset_for_dma(ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, scc_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        if (scc_tune_chipset(drive, speed))
-                return 0;
-
-        return ide_dma_enable(drive);
-}
-
-/**
  *      scc_configure_drive_for_dma     -       set up for DMA transfers
  *      @drive: drive we are going to set up
  *
@@ -371,7 +334,7 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive)
 
 static int scc_config_drive_for_dma(ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index dbcd37a0c652..6234f806c6b5 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -1,9 +1,10 @@
 /*
- * linux/drivers/ide/pci/serverworks.c          Version 0.8      25 Ebr 2003
+ * linux/drivers/ide/pci/serverworks.c          Version 0.9     Mar 4 2007
  *
  * Copyright (C) 1998-2000 Michel Aubry
  * Copyright (C) 1998-2000 Andrzej Krzysztofowicz
  * Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
+ * Copyright (C)      2007 Bartlomiej Zolnierkiewicz
  * Portions copyright (c) 2001 Sun Microsystems
  *
  *
@@ -65,16 +66,16 @@ static int check_in_drive_lists (ide_drive_t *drive, const char **list)
         return 0;
 }
 
-static u8 svwks_ratemask (ide_drive_t *drive)
+static u8 svwks_udma_filter(ide_drive_t *drive)
 {
         struct pci_dev *dev     = HWIF(drive)->pci_dev;
-        u8 mode = 0;
+        u8 mask = 0;
 
         if (!svwks_revision)
                 pci_read_config_byte(dev, PCI_REVISION_ID, &svwks_revision);
 
         if (dev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE)
-                return 2;
+                return 0x1f;
         if (dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
                 u32 reg = 0;
                 if (isa_dev)
@@ -86,25 +87,31 @@ static u8 svwks_ratemask (ide_drive_t *drive)
                 if(drive->media == ide_disk)
                         return 0;
                 /* Check the OSB4 DMA33 enable bit */
-                return ((reg & 0x00004000) == 0x00004000) ? 1 : 0;
+                return ((reg & 0x00004000) == 0x00004000) ? 0x07 : 0;
         } else if (svwks_revision < SVWKS_CSB5_REVISION_NEW) {
-                return 1;
+                return 0x07;
         } else if (svwks_revision >= SVWKS_CSB5_REVISION_NEW) {
-                u8 btr = 0;
+                u8 btr = 0, mode;
                 pci_read_config_byte(dev, 0x5A, &btr);
                 mode = btr & 0x3;
-                if (!eighty_ninty_three(drive))
-                        mode = min(mode, (u8)1);
+
                 /* If someone decides to do UDMA133 on CSB5 the same
                    issue will bite so be inclusive */
                 if (mode > 2 && check_in_drive_lists(drive, svwks_bad_ata100))
                         mode = 2;
+
+                switch(mode) {
+                case 2:  mask = 0x1f; break;
+                case 1:  mask = 0x07; break;
+                default: mask = 0x00; break;
+                }
         }
         if (((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||
              (dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2)) &&
             (!(PCI_FUNC(dev->devfn) & 1)))
-                mode = 2;
-        return mode;
+                mask = 0x1f;
+
+        return mask;
 }
 
 static u8 svwks_csb_check (struct pci_dev *dev)
@@ -130,19 +137,14 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
-        u8 speed;
-        u8 pio                  = ide_get_best_pio_mode(drive, 255, 5, NULL);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
+        u8 pio                  = ide_get_best_pio_mode(drive, 255, 4, NULL);
         u8 unit                 = (drive->select.b.unit & 0x01);
         u8 csb5                 = svwks_csb_check(dev);
         u8 ultra_enable         = 0, ultra_timing = 0;
         u8 dma_timing           = 0, pio_timing = 0;
         u16 csb5_pio            = 0;
 
-        if (xferspeed == 255)   /* PIO auto-tuning */
-                speed = XFER_PIO_0 + pio;
-        else
-                speed = ide_rate_filter(svwks_ratemask(drive), xferspeed);
-
         /* If we are about to put a disk into UDMA mode we screwed up.
            Our code assumes we never _ever_ do this on an OSB4 */
            
@@ -225,6 +227,9 @@ oem_setup_failed:
                 case XFER_MW_DMA_2:
                 case XFER_MW_DMA_1:
                 case XFER_MW_DMA_0:
+                        /*
+                         * TODO: always setup PIO mode so this won't be needed
+                         */
                         pio_timing |= pio_modes[pio];
                         csb5_pio   |= (pio << (4*drive->dn));
                         dma_timing |= dma_modes[speed - XFER_MW_DMA_0];
@@ -236,6 +241,9 @@ oem_setup_failed:
                 case XFER_UDMA_2:
                 case XFER_UDMA_1:
                 case XFER_UDMA_0:
+                        /*
+                         * TODO: always setup PIO mode so this won't be needed
+                         */
                         pio_timing   |= pio_modes[pio];
                         csb5_pio     |= (pio << (4*drive->dn));
                         dma_timing   |= dma_modes[2];
@@ -256,72 +264,21 @@ oem_setup_failed:
         return (ide_config_drive_speed(drive, speed));
 }
 
-static void config_chipset_for_pio (ide_drive_t *drive)
-{
-        u16 eide_pio_timing[6] = {960, 480, 240, 180, 120, 90};
-        u16 xfer_pio = drive->id->eide_pio_modes;
-        u8 timing, speed, pio;
-
-        pio = ide_get_best_pio_mode(drive, 255, 5, NULL);
-
-        if (xfer_pio > 4)
-                xfer_pio = 0;
-
-        if (drive->id->eide_pio_iordy > 0)
-                for (xfer_pio = 5;
-                        xfer_pio>0 &&
-                        drive->id->eide_pio_iordy>eide_pio_timing[xfer_pio];
-                        xfer_pio--);
-        else
-                xfer_pio = (drive->id->eide_pio_modes & 4) ? 0x05 :
-                           (drive->id->eide_pio_modes & 2) ? 0x04 :
-                           (drive->id->eide_pio_modes & 1) ? 0x03 :
-                           (drive->id->tPIO & 2) ? 0x02 :
-                           (drive->id->tPIO & 1) ? 0x01 : xfer_pio;
-
-        timing = (xfer_pio >= pio) ? xfer_pio : pio;
-
-        switch(timing) {
-                case 4: speed = XFER_PIO_4;break;
-                case 3: speed = XFER_PIO_3;break;
-                case 2: speed = XFER_PIO_2;break;
-                case 1: speed = XFER_PIO_1;break;
-                default:
-                        speed = (!drive->id->tPIO) ? XFER_PIO_0 : XFER_PIO_SLOW;
-                        break;
-        }
-        (void) svwks_tune_chipset(drive, speed);
-        drive->current_speed = speed;
-}
-
 static void svwks_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        if(pio == 255)
-                (void) svwks_tune_chipset(drive, 255);
-        else
-                (void) svwks_tune_chipset(drive, (XFER_PIO_0 + pio));
-}
-
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, svwks_ratemask(drive));
-
-        if (!(speed))
-                speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5, NULL);
-
-        (void) svwks_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
+        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        (void)svwks_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
 static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                config_chipset_for_pio(drive);
+                svwks_tune_drive(drive, 255);
 
         return -1;
 }
@@ -500,6 +457,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
 
         hwif->tuneproc = &svwks_tune_drive;
         hwif->speedproc = &svwks_tune_chipset;
+        hwif->udma_filter = &svwks_udma_filter;
 
         hwif->atapi_dma = 1;
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index fd09b295a69d..d3185e29a38e 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -692,7 +692,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();
+        ide_proc_register_port(hwif);
 
         return 0;
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index c0188de3cc66..1a4444e7226a 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -122,45 +122,41 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
 }
 
 /**
- *      siimage_ratemask        -       Compute available modes
- *      @drive: IDE drive
+ *      sil_udma_filter         -       compute UDMA mask
+ *      @drive: IDE device
+ *
+ *      Compute the available UDMA speeds for the device on the interface.
  *
- *      Compute the available speeds for the devices on the interface.
  *      For the CMD680 this depends on the clocking mode (scsc), for the
- *      SI3312 SATA controller life is a bit simpler. Enforce UDMA33
- *      as a limit if there is no 80pin cable present.
+ *      SI3112 SATA controller life is a bit simpler.
  */
- 
-static byte siimage_ratemask (ide_drive_t *drive)
+
+static u8 sil_udma_filter(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 mode = 0, scsc = 0;
+        ide_hwif_t *hwif = drive->hwif;
         unsigned long base = (unsigned long) hwif->hwif_data;
+        u8 mask = 0, scsc = 0;
 
         if (hwif->mmio)
                 scsc = hwif->INB(base + 0x4A);
         else
                 pci_read_config_byte(hwif->pci_dev, 0x8A, &scsc);
 
-        if(is_sata(hwif))
-        {
-                if(strstr(drive->id->model, "Maxtor"))
-                        return 3;
-                return 4;
+        if (is_sata(hwif)) {
+                mask = strstr(drive->id->model, "Maxtor") ? 0x3f : 0x7f;
+                goto out;
         }
-        
+
         if ((scsc & 0x30) == 0x10)      /* 133 */
-                mode = 4;
+                mask = 0x7f;
         else if ((scsc & 0x30) == 0x20) /* 2xPCI */
-                mode = 4;
+                mask = 0x7f;
         else if ((scsc & 0x30) == 0x00) /* 100 */
-                mode = 3;
+                mask = 0x3f;
         else    /* Disabled ? */
                 BUG();
-
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
+out:
+        return mask;
 }
 
 /**
@@ -306,7 +302,7 @@ static int siimage_tune_chipset (ide_drive_t *drive, byte xferspeed)
         ide_hwif_t *hwif        = HWIF(drive);
         u16 ultra = 0, multi    = 0;
         u8 mode = 0, unit       = drive->select.b.unit;
-        u8 speed                = ide_rate_filter(siimage_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
         unsigned long base      = (unsigned long)hwif->hwif_data;
         u8 scsc = 0, addr_mask  = ((hwif->channel) ?
                                     ((hwif->mmio) ? 0xF4 : 0x84) :
@@ -379,28 +375,6 @@ static int siimage_tune_chipset (ide_drive_t *drive, byte xferspeed)
 }
 
 /**
- *      config_chipset_for_dma  -       configure for DMA
- *      @drive: drive to configure
- *
- *      Called by the IDE layer when it wants the timings set up.
- *      For the CMD680 we also need to set up the PIO timings and
- *      enable DMA.
- */
- 
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed        = ide_dma_speed(drive, siimage_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        if (siimage_tune_chipset(drive, speed))
-                return 0;
-
-        return ide_dma_enable(drive);
-}
-
-/**
  *      siimage_configure_drive_for_dma -       set up for DMA transfers
  *      @drive: drive we are going to set up
  *
@@ -412,7 +386,7 @@ static int config_chipset_for_dma (ide_drive_t *drive)
  
 static int siimage_config_drive_for_dma (ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
@@ -831,7 +805,7 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
 
         /*
          *      Now set up the hw. We have to do this ourselves as
-         *      the MMIO layout isnt the same as the the standard port
+         *      the MMIO layout isnt the same as the standard port
          *      based I/O
          */
 
@@ -989,6 +963,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
         hwif->tuneproc  = &siimage_tuneproc;
         hwif->reset_poll = &siimage_reset_poll;
         hwif->pre_reset = &siimage_pre_reset;
+        hwif->udma_filter = &sil_udma_filter;
 
         if(is_sata(hwif)) {
                 static int first = 1;
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 2ba0669f36a1..bb6cc4aedd63 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -1,9 +1,11 @@
 /*
- * linux/drivers/ide/pci/sis5513.c      Version 0.16ac+vp       Jun 18, 2003
+ * linux/drivers/ide/pci/sis5513.c      Version 0.20    Mar 4, 2007
  *
  * Copyright (C) 1999-2000      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2002           Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer
  * Copyright (C) 2003           Vojtech Pavlik <vojtech@suse.cz>
+ * Copyright (C) 2007           Bartlomiej Zolnierkiewicz
+ *
  * May be copied or modified under the terms of the GNU General Public License
  *
  *
@@ -191,7 +193,7 @@ static char* chipset_capability[] = {
         "ATA 133 (1st gen)", "ATA 133 (2nd gen)"
 };
 
-#if defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
 
@@ -426,17 +428,7 @@ static int sis_get_info (char *buffer, char **addr, off_t offset, int count)
 
         return len > count ? count : len;
 }
-#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */
-
-static u8 sis5513_ratemask (ide_drive_t *drive)
-{
-        u8 rates[] = { 0, 0, 1, 2, 3, 3, 4, 4 };
-        u8 mode = rates[chipset_family];
-
-        if (!eighty_ninty_three(drive))
-                mode = min(mode, (u8)1);
-        return mode;
-}
+#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */
 
 /*
  * Configuration functions
@@ -458,36 +450,15 @@ static void config_drive_art_rwp (ide_drive_t *drive)
                 pci_write_config_byte(dev, 0x4b, reg4bh|rw_prefetch);
 }
 
-
 /* Set per-drive active and recovery time */
 static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
 
-        u8                      timing, drive_pci, test1, test2;
-
-        u16 eide_pio_timing[6] = {600, 390, 240, 180, 120, 90};
-        u16 xfer_pio = drive->id->eide_pio_modes;
+        u8 drive_pci, test1, test2;
 
         config_drive_art_rwp(drive);
-        pio = ide_get_best_pio_mode(drive, 255, pio, NULL);
-
-        if (xfer_pio> 4)
-                xfer_pio = 0;
-
-        if (drive->id->eide_pio_iordy > 0) {
-                for (xfer_pio = 5;
-                        (xfer_pio > 0) &&
-                        (drive->id->eide_pio_iordy > eide_pio_timing[xfer_pio]);
-                        xfer_pio--);
-        } else {
-                xfer_pio = (drive->id->eide_pio_modes & 4) ? 0x05 :
-                           (drive->id->eide_pio_modes & 2) ? 0x04 :
-                           (drive->id->eide_pio_modes & 1) ? 0x03 : xfer_pio;
-        }
-
-        timing = (xfer_pio >= pio) ? xfer_pio : pio;
 
         /* In pre ATA_133 case, drives sit at 0x40 + 4*drive->dn */
         drive_pci = 0x40;
@@ -510,17 +481,18 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
                 test1 &= ~0x0F;
                 test2 &= ~0x07;
 
-                switch(timing) {
+                switch(pio) {
                         case 4:         test1 |= 0x01; test2 |= 0x03; break;
                         case 3:         test1 |= 0x03; test2 |= 0x03; break;
                         case 2:         test1 |= 0x04; test2 |= 0x04; break;
                         case 1:         test1 |= 0x07; test2 |= 0x06; break;
+                        case 0:         /* PIO0: register setting == X000 */
                         default:        break;
                 }
                 pci_write_config_byte(dev, drive_pci, test1);
                 pci_write_config_byte(dev, drive_pci+1, test2);
         } else if (chipset_family < ATA_133) {
-                switch(timing) { /*             active  recovery
+                switch(pio) { /*                active  recovery
                                                   v     v */
                         case 4:         test1 = 0x30|0x01; break;
                         case 3:         test1 = 0x30|0x03; break;
@@ -535,24 +507,28 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
                 pci_read_config_dword(dev, drive_pci, &test3);
                 test3 &= 0xc0c00fff;
                 if (test3 & 0x08) {
-                        test3 |= (unsigned long)ini_time_value[ATA_133][timing] << 12;
-                        test3 |= (unsigned long)act_time_value[ATA_133][timing] << 16;
-                        test3 |= (unsigned long)rco_time_value[ATA_133][timing] << 24;
+                        test3 |= ini_time_value[ATA_133][pio] << 12;
+                        test3 |= act_time_value[ATA_133][pio] << 16;
+                        test3 |= rco_time_value[ATA_133][pio] << 24;
                 } else {
-                        test3 |= (unsigned long)ini_time_value[ATA_100][timing] << 12;
-                        test3 |= (unsigned long)act_time_value[ATA_100][timing] << 16;
-                        test3 |= (unsigned long)rco_time_value[ATA_100][timing] << 24;
+                        test3 |= ini_time_value[ATA_100][pio] << 12;
+                        test3 |= act_time_value[ATA_100][pio] << 16;
+                        test3 |= rco_time_value[ATA_100][pio] << 24;
                 }
                 pci_write_config_dword(dev, drive_pci, test3);
         }
 }
 
-static int config_chipset_for_pio (ide_drive_t *drive, u8 pio)
+static int sis5513_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        if (pio == 255)
-                pio = ide_find_best_mode(drive, XFER_PIO | XFER_EPIO) - XFER_PIO_0;
+        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
         config_art_rwp_pio(drive, pio);
-        return ide_config_drive_speed(drive, XFER_PIO_0 + min_t(u8, pio, 4));
+        return ide_config_drive_speed(drive, XFER_PIO_0 + pio);
+}
+
+static void sis5513_tuneproc(ide_drive_t *drive, u8 pio)
+{
+        (void)sis5513_tune_drive(drive, pio);
 }
 
 static int sis5513_tune_chipset (ide_drive_t *drive, u8 xferspeed)
@@ -563,7 +539,7 @@ static int sis5513_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         u8 drive_pci, reg, speed;
         u32 regdw;
 
-        speed = ide_rate_filter(sis5513_ratemask(drive), xferspeed);
+        speed = ide_rate_filter(drive, xferspeed);
 
         /* See config_art_rwp_pio for drive pci config registers */
         drive_pci = 0x40;
@@ -632,52 +608,34 @@ static int sis5513_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                 case XFER_SW_DMA_1:
                 case XFER_SW_DMA_0:
                         break;
-                case XFER_PIO_4: return((int) config_chipset_for_pio(drive, 4));
-                case XFER_PIO_3: return((int) config_chipset_for_pio(drive, 3));
-                case XFER_PIO_2: return((int) config_chipset_for_pio(drive, 2));
-                case XFER_PIO_1: return((int) config_chipset_for_pio(drive, 1));
+                case XFER_PIO_4:
+                case XFER_PIO_3:
+                case XFER_PIO_2:
+                case XFER_PIO_1:
                 case XFER_PIO_0:
-                default:         return((int) config_chipset_for_pio(drive, 0));        
+                        return sis5513_tune_drive(drive, speed - XFER_PIO_0);
+                default:
+                        BUG();
+                        break;
         }
 
-        return ((int) ide_config_drive_speed(drive, speed));
-}
-
-static void sis5513_tune_drive (ide_drive_t *drive, u8 pio)
-{
-        (void) config_chipset_for_pio(drive, pio);
-}
-
-/*
- * ((id->hw_config & 0x4000|0x2000) && (HWIF(drive)->udma_four))
- */
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-        u8 speed        = ide_dma_speed(drive, sis5513_ratemask(drive));
-
-#ifdef DEBUG
-        printk("SIS5513: config_chipset_for_dma, drive %d, ultra %x\n",
-               drive->dn, drive->id->dma_ultra);
-#endif
-
-        if (!(speed))
-                return 0;
-
-        sis5513_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
+        return ide_config_drive_speed(drive, speed);
 }
 
 static int sis5513_config_xfer_rate(ide_drive_t *drive)
 {
-        config_art_rwp_pio(drive, 5);
+        /*
+         * TODO: always set PIO mode and remove this
+         */
+        sis5513_tuneproc(drive, 255);
 
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                sis5513_tune_drive(drive, 5);
+                sis5513_tuneproc(drive, 255);
 
         return -1;
 }
@@ -826,7 +784,7 @@ static unsigned int __devinit init_chipset_sis5513 (struct pci_dev *dev, const c
                                 break;
                 }
 
-#if defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS)
+#if defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
                 if (!sis_proc) {
                         sis_proc = 1;
                         bmide_dev = dev;
@@ -858,12 +816,14 @@ static unsigned int __devinit ata66_sis5513 (ide_hwif_t *hwif)
 
 static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
 {
+        u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f };
+
         hwif->autodma = 0;
 
         if (!hwif->irq)
                 hwif->irq = hwif->channel ? 15 : 14;
 
-        hwif->tuneproc = &sis5513_tune_drive;
+        hwif->tuneproc = &sis5513_tuneproc;
         hwif->speedproc = &sis5513_tune_chipset;
 
         if (!(hwif->dma_base)) {
@@ -873,7 +833,8 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
         }
 
         hwif->atapi_dma = 1;
-        hwif->ultra_mask = 0x7f;
+
+        hwif->ultra_mask = udma_rates[chipset_family];
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index fe3b4b91f854..7c383d9cc472 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -82,7 +82,14 @@ static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
 
         pio = ide_get_best_pio_mode(drive, pio, 5, &p);
 
-        drive->drive_data = drv_ctrl = get_pio_timings(&p);
+        drv_ctrl = get_pio_timings(&p);
+
+        /*
+         * Store the PIO timings so that we can restore them
+         * in case DMA will be turned off...
+         */
+        drive->drive_data &= 0xffff0000;
+        drive->drive_data |= drv_ctrl;
 
         if (!drive->using_dma) {
                 /*
@@ -100,17 +107,55 @@ static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
 }
 
 /*
- * Configure the drive for DMA.
- * We'll program the chipset only when DMA is actually turned on.
+ * Configure the drive and chipset for a new transfer speed.
  */
-static int config_for_dma(ide_drive_t *drive)
+static int sl82c105_tune_chipset(ide_drive_t *drive, u8 speed)
 {
-        DBG(("config_for_dma(drive:%s)\n", drive->name));
+        static u16 mwdma_timings[] = {0x0707, 0x0201, 0x0200};
+        u16 drv_ctrl;
 
-        if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0)
-                return 0;
+        DBG(("sl82c105_tune_chipset(drive:%s, speed:%s)\n",
+             drive->name, ide_xfer_verbose(speed)));
 
-        return ide_dma_enable(drive);
+        speed = ide_rate_filter(drive, speed);
+
+        switch (speed) {
+        case XFER_MW_DMA_2:
+        case XFER_MW_DMA_1:
+        case XFER_MW_DMA_0:
+                drv_ctrl = mwdma_timings[speed - XFER_MW_DMA_0];
+
+                /*
+                 * Store the DMA timings so that we can actually program
+                 * them when DMA will be turned on...
+                 */
+                drive->drive_data &= 0x0000ffff;
+                drive->drive_data |= (unsigned long)drv_ctrl << 16;
+
+                /*
+                 * If we are already using DMA, we just reprogram
+                 * the drive control register.
+                 */
+                if (drive->using_dma) {
+                        struct pci_dev *dev     = HWIF(drive)->pci_dev;
+                        int reg                 = 0x44 + drive->dn * 4;
+
+                        pci_write_config_word(dev, reg, drv_ctrl);
+                }
+                break;
+        case XFER_PIO_5:
+        case XFER_PIO_4:
+        case XFER_PIO_3:
+        case XFER_PIO_2:
+        case XFER_PIO_1:
+        case XFER_PIO_0:
+                (void) sl82c105_tune_pio(drive, speed - XFER_PIO_0);
+                break;
+        default:
+                return -1;
+        }
+
+        return ide_config_drive_speed(drive, speed);
 }
 
 /*
@@ -120,7 +165,7 @@ static int sl82c105_ide_dma_check(ide_drive_t *drive)
 {
         DBG(("sl82c105_ide_dma_check(drive:%s)\n", drive->name));
 
-        if (ide_use_dma(drive) && config_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         return -1;
@@ -219,7 +264,7 @@ static int sl82c105_ide_dma_on(ide_drive_t *drive)
 
         rc = __ide_dma_on(drive);
         if (rc == 0) {
-                pci_write_config_word(dev, reg, 0x0200);
+                pci_write_config_word(dev, reg, drive->drive_data >> 16);
 
                 printk(KERN_INFO "%s: DMA enabled\n", drive->name);
         }
@@ -304,7 +349,7 @@ static unsigned int sl82c105_bridge_revision(struct pci_dev *dev)
         /*
          * The bridge should be part of the same device, but function 0.
          */
-        bridge = pci_find_slot(dev->bus->number,
+        bridge = pci_get_bus_and_slot(dev->bus->number,
                                PCI_DEVFN(PCI_SLOT(dev->devfn), 0));
         if (!bridge)
                 return -1;
@@ -314,13 +359,15 @@ static unsigned int sl82c105_bridge_revision(struct pci_dev *dev)
          */
         if (bridge->vendor != PCI_VENDOR_ID_WINBOND ||
             bridge->device != PCI_DEVICE_ID_WINBOND_83C553 ||
-            bridge->class >> 8 != PCI_CLASS_BRIDGE_ISA)
+            bridge->class >> 8 != PCI_CLASS_BRIDGE_ISA) {
+                pci_dev_put(bridge);
                 return -1;
-
+        }
         /*
          * We need to find function 0's revision, not function 1
          */
         pci_read_config_byte(bridge, PCI_REVISION_ID, &rev);
+        pci_dev_put(bridge);
 
         return rev;
 }
@@ -357,6 +404,7 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         DBG(("init_hwif_sl82c105(hwif: ide%d)\n", hwif->index));
 
         hwif->tuneproc          = &sl82c105_tune_drive;
+        hwif->speedproc         = &sl82c105_tune_chipset;
         hwif->selectproc        = &sl82c105_selectproc;
         hwif->resetproc         = &sl82c105_resetproc;
 
@@ -388,7 +436,7 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         }
 
         hwif->atapi_dma  = 1;
-        hwif->mwdma_mask = 0x04;
+        hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check             = &sl82c105_ide_dma_check;
         hwif->ide_dma_on                = &sl82c105_ide_dma_on;
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 852ccb36da1d..c40f291f91e0 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -21,15 +21,6 @@
 
 #include <asm/io.h>
 
-static u8 slc90e66_ratemask (ide_drive_t *drive)
-{
-        u8 mode = 2;
-
-        if (!eighty_ninty_three(drive))
-                mode = min_t(u8, mode, 1);
-        return mode;
-}
-
 static u8 slc90e66_dma_2_pio (u8 xfer_rate) {
         switch(xfer_rate) {
                 case XFER_UDMA_4:
@@ -122,7 +113,7 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
         u8 maslave              = hwif->channel ? 0x42 : 0x40;
-        u8 speed        = ide_rate_filter(slc90e66_ratemask(drive), xferspeed);
+        u8 speed                = ide_rate_filter(drive, xferspeed);
         int sitre = 0, a_speed  = 7 << (drive->dn * 4);
         int u_speed = 0, u_flag = 1 << drive->dn;
         u16                     reg4042, reg44, reg48, reg4a;
@@ -169,22 +160,11 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         return ide_config_drive_speed(drive, speed);
 }
 
-static int slc90e66_config_drive_for_dma (ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, slc90e66_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        (void) slc90e66_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
 {
         drive->init_speed = 0;
 
-        if (ide_use_dma(drive) && slc90e66_config_drive_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 0b6d81d6ce48..cee619bb2eaf 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -13,18 +13,13 @@
 #include <linux/pci.h>
 #include <linux/ide.h>
 
-static inline u8 tc86c001_ratemask(ide_drive_t *drive)
-{
-        return eighty_ninty_three(drive) ? 2 : 1;
-}
-
 static int tc86c001_tune_chipset(ide_drive_t *drive, u8 speed)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long scr_port  = hwif->config_data + (drive->dn ? 0x02 : 0x00);
         u16 mode, scr           = hwif->INW(scr_port);
 
-        speed = ide_rate_filter(tc86c001_ratemask(drive), speed);
+        speed = ide_rate_filter(drive, speed);
 
         switch (speed) {
                 case XFER_UDMA_4:       mode = 0x00c0; break;
@@ -172,20 +167,9 @@ static int tc86c001_busproc(ide_drive_t *drive, int state)
         return 0;
 }
 
-static int config_chipset_for_dma(ide_drive_t *drive)
-{
-        u8 speed = ide_dma_speed(drive, tc86c001_ratemask(drive));
-
-        if (!speed)
-                return 0;
-
-        (void) tc86c001_tune_chipset(drive, speed);
-        return ide_dma_enable(drive);
-}
-
 static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         if (ide_use_fast_pio(drive))
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 5e06179c3469..35e8c612638f 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -48,7 +48,7 @@ static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
         u16 timing = 0;
         u32 triflex_timings = 0;
         u8 unit = (drive->select.b.unit & 0x01);
-        u8 speed = ide_rate_filter(0, xferspeed);
+        u8 speed = ide_rate_filter(drive, xferspeed);
         
         pci_read_config_dword(dev, channel_offset, &triflex_timings);
         
@@ -100,20 +100,9 @@ static void triflex_tune_drive(ide_drive_t *drive, u8 pio)
         (void) triflex_tune_chipset(drive, (XFER_PIO_0 + use_pio));
 }
 
-static int triflex_config_drive_for_dma(ide_drive_t *drive)
-{
-        int speed = ide_dma_speed(drive, 0); /* No ultra speeds */
-
-        if (!speed)
-                return 0;
-
-        (void) triflex_tune_chipset(drive, speed);
-         return ide_dma_enable(drive);
-}
-
 static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        if (ide_use_dma(drive) && triflex_config_drive_for_dma(drive))
+        if (ide_tune_dma(drive))
                 return 0;
 
         triflex_tune_drive(drive, 255);
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 071a030ec26e..45fc36f0f219 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1157,32 +1157,32 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 
         pmif->cable_80 = 0;
         pmif->broken_dma = pmif->broken_dma_warn = 0;
-        if (device_is_compatible(np, "shasta-ata"))
+        if (of_device_is_compatible(np, "shasta-ata"))
                 pmif->kind = controller_sh_ata6;
-        else if (device_is_compatible(np, "kauai-ata"))
+        else if (of_device_is_compatible(np, "kauai-ata"))
                 pmif->kind = controller_un_ata6;
-        else if (device_is_compatible(np, "K2-UATA"))
+        else if (of_device_is_compatible(np, "K2-UATA"))
                 pmif->kind = controller_k2_ata6;
-        else if (device_is_compatible(np, "keylargo-ata")) {
+        else if (of_device_is_compatible(np, "keylargo-ata")) {
                 if (strcmp(np->name, "ata-4") == 0)
                         pmif->kind = controller_kl_ata4;
                 else
                         pmif->kind = controller_kl_ata3;
-        } else if (device_is_compatible(np, "heathrow-ata"))
+        } else if (of_device_is_compatible(np, "heathrow-ata"))
                 pmif->kind = controller_heathrow;
         else {
                 pmif->kind = controller_ohare;
                 pmif->broken_dma = 1;
         }
 
-        bidp = get_property(np, "AAPL,bus-id", NULL);
+        bidp = of_get_property(np, "AAPL,bus-id", NULL);
         pmif->aapl_bus_id =  bidp ? *bidp : 0;
 
         /* Get cable type from device-tree */
         if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6
             || pmif->kind == controller_k2_ata6
             || pmif->kind == controller_sh_ata6) {
-                const char* cable = get_property(np, "cable-type", NULL);
+                const char* cable = of_get_property(np, "cable-type", NULL);
                 if (cable && !strncmp(cable, "80-", 3))
                         pmif->cable_80 = 1;
         }
@@ -1190,8 +1190,8 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
          * they have a 80 conductor cable, this seem to be always the case unless
          * the user mucked around
          */
-        if (device_is_compatible(np, "K2-UATA") ||
-            device_is_compatible(np, "shasta-ata"))
+        if (of_device_is_compatible(np, "K2-UATA") ||
+            of_device_is_compatible(np, "shasta-ata"))
                 pmif->cable_80 = 1;
 
         /* On Kauai-type controllers, we make sure the FCR is correct */
@@ -1276,6 +1276,8 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         /* We probe the hwif now */
         probe_hwif_init(hwif);
 
+        ide_proc_register_port(hwif);
+
         return 0;
 }
 
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 118fb3205ca8..67035ba4bf5e 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -702,6 +702,7 @@ out:
 
 int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
 {
+        ide_hwif_t *hwif = NULL, *mate = NULL;
         ata_index_t index_list;
         int ret;
 
@@ -710,11 +711,19 @@ int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
                 goto out;
 
         if ((index_list.b.low & 0xf0) != 0xf0)
-                probe_hwif_init_with_fixup(&ide_hwifs[index_list.b.low], d->fixup);
+                hwif = &ide_hwifs[index_list.b.low];
         if ((index_list.b.high & 0xf0) != 0xf0)
-                probe_hwif_init_with_fixup(&ide_hwifs[index_list.b.high], d->fixup);
+                mate = &ide_hwifs[index_list.b.high];
 
-        create_proc_ide_interfaces();
+        if (hwif)
+                probe_hwif_init_with_fixup(hwif, d->fixup);
+        if (mate)
+                probe_hwif_init_with_fixup(mate, d->fixup);
+
+        if (hwif)
+                ide_proc_register_port(hwif);
+        if (mate)
+                ide_proc_register_port(mate);
 out:
         return ret;
 }
@@ -748,13 +757,22 @@ int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
                 }
         }
 
-        create_proc_ide_interfaces();
+        for (i = 0; i < 2; i++) {
+                u8 idx[2] = { index_list[i].b.low, index_list[i].b.high };
+                int j;
+
+                for (j = 0; j < 2; j++) {
+                        if ((idx[j] & 0xf0) != 0xf0)
+                                ide_proc_register_port(ide_hwifs + idx[j]);
+                }
+        }
 out:
         return ret;
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_pci_devices);
 
+#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
 /*
  *      Module interfaces
  */
@@ -861,3 +879,4 @@ void __init ide_scan_pcibus (int scan_direction)
                 __pci_register_driver(d, d->driver.owner, d->driver.mod_name);
         }
 }
+#endif
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 61d7809a5a26..8012b3b0ce75 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -1,4 +1,7 @@
 menu "IEEE 1394 (FireWire) support"
+        depends on PCI || BROKEN
+
+source "drivers/firewire/Kconfig"
 
 config IEEE1394
         tristate "IEEE 1394 (FireWire) support"
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 026e38face5c..208141377612 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -94,7 +94,6 @@
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 #include <linux/bitops.h>
 #include <asm/byteorder.h>
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 6a1a0572275e..835937e38529 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1702,7 +1702,7 @@ static int nodemgr_host_thread(void *__hi)
                         generation = get_hpsb_generation(host);
 
                         /* If we get a reset before we are done waiting, then
-                         * start the the waiting over again */
+                         * start the waiting over again */
                         if (generation != g)
                                 g = generation, i = 0;
                 }
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index c6aefd9ad0e8..d382500f4210 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -35,7 +35,6 @@
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
 #include <linux/cdev.h>
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 95ca26d75272..87ebd0846c34 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -39,7 +39,6 @@
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 66b36de9fa6f..994decc7bcf2 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -1,4 +1,5 @@
 menu "InfiniBand support"
+        depends on HAS_IOMEM
 
 config INFINIBAND
         depends on PCI || BROKEN
@@ -29,6 +30,11 @@ config INFINIBAND_USER_ACCESS
           libibverbs, libibcm and a hardware driver library from
           <http://www.openib.org>.
 
+config INFINIBAND_USER_MEM
+        bool
+        depends on INFINIBAND_USER_ACCESS != n
+        default y
+
 config INFINIBAND_ADDR_TRANS
         bool
         depends on INFINIBAND && INET
@@ -40,6 +46,8 @@ source "drivers/infiniband/hw/ehca/Kconfig"
 source "drivers/infiniband/hw/amso1100/Kconfig"
 source "drivers/infiniband/hw/cxgb3/Kconfig"
 
+source "drivers/infiniband/hw/mlx4/Kconfig"
+
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
 source "drivers/infiniband/ulp/srp/Kconfig"
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
index da2066c4f22c..75f325e40b54 100644
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_INFINIBAND_IPATH)		+= hw/ipath/
 obj-$(CONFIG_INFINIBAND_EHCA)           += hw/ehca/
 obj-$(CONFIG_INFINIBAND_AMSO1100)       += hw/amso1100/
 obj-$(CONFIG_INFINIBAND_CXGB3)          += hw/cxgb3/
+obj-$(CONFIG_MLX4_INFINIBAND)           += hw/mlx4/
 obj-$(CONFIG_INFINIBAND_IPOIB)          += ulp/ipoib/
 obj-$(CONFIG_INFINIBAND_SRP)            += ulp/srp/
 obj-$(CONFIG_INFINIBAND_ISER)           += ulp/iser/
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 189e5d4b9b17..cb1ab3ea4998 100644
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=	ib_uverbs.o ib_ucm.o \
 
 ib_core-y :=                    packer.o ud_header.o verbs.o sysfs.o \
                                 device.o fmr_pool.o cache.o
+ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o
 
 ib_mad-y :=                     mad.o smi.o agent.o mad_rmpp.o
 
@@ -28,5 +29,4 @@ ib_umad-y :=			user_mad.o
 
 ib_ucm-y :=                     ucm.o
 
-ib_uverbs-y :=                  uverbs_main.o uverbs_cmd.o uverbs_mem.o \
-                                uverbs_marshall.o
+ib_uverbs-y :=                  uverbs_main.o uverbs_cmd.o uverbs_marshall.o
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 558c9a0fc8b9..e85f7013de57 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
+#include <linux/workqueue.h>
 
 #include <rdma/ib_cache.h>
 
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index eff591deeb46..e840434a96d8 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -306,7 +306,9 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
         do {
                 spin_lock_irqsave(&cm.lock, flags);
                 ret = idr_get_new_above(&cm.local_id_table, cm_id_priv,
-                                        next_id++, &id);
+                                        next_id, &id);
+                if (!ret)
+                        next_id = ((unsigned) id + 1) & MAX_ID_MASK;
                 spin_unlock_irqrestore(&cm.lock, flags);
         } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );
 
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index fde92ce45153..2eb52b7a71da 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -346,12 +346,33 @@ static void cma_deref_id(struct rdma_id_private *id_priv)
                 complete(&id_priv->comp);
 }
 
-static void cma_release_remove(struct rdma_id_private *id_priv)
+static int cma_disable_remove(struct rdma_id_private *id_priv,
+                              enum cma_state state)
+{
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&id_priv->lock, flags);
+        if (id_priv->state == state) {
+                atomic_inc(&id_priv->dev_remove);
+                ret = 0;
+        } else
+                ret = -EINVAL;
+        spin_unlock_irqrestore(&id_priv->lock, flags);
+        return ret;
+}
+
+static void cma_enable_remove(struct rdma_id_private *id_priv)
 {
         if (atomic_dec_and_test(&id_priv->dev_remove))
                 wake_up(&id_priv->wait_remove);
 }
 
+static int cma_has_cm_dev(struct rdma_id_private *id_priv)
+{
+        return (id_priv->id.device && id_priv->cm_id.ib);
+}
+
 struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
                                   void *context, enum rdma_port_space ps)
 {
@@ -884,9 +905,8 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
         struct rdma_cm_event event;
         int ret = 0;
 
-        atomic_inc(&id_priv->dev_remove);
-        if (!cma_comp(id_priv, CMA_CONNECT))
-                goto out;
+        if (cma_disable_remove(id_priv, CMA_CONNECT))
+                return 0;
 
         memset(&event, 0, sizeof event);
         switch (ib_event->event) {
@@ -942,12 +962,12 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
                 /* Destroy the CM ID by returning a non-zero value. */
                 id_priv->cm_id.ib = NULL;
                 cma_exch(id_priv, CMA_DESTROYING);
-                cma_release_remove(id_priv);
+                cma_enable_remove(id_priv);
                 rdma_destroy_id(&id_priv->id);
                 return ret;
         }
 out:
-        cma_release_remove(id_priv);
+        cma_enable_remove(id_priv);
         return ret;
 }
 
@@ -1057,11 +1077,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
         int offset, ret;
 
         listen_id = cm_id->context;
-        atomic_inc(&listen_id->dev_remove);
-        if (!cma_comp(listen_id, CMA_LISTEN)) {
-                ret = -ECONNABORTED;
-                goto out;
-        }
+        if (cma_disable_remove(listen_id, CMA_LISTEN))
+                return -ECONNABORTED;
 
         memset(&event, 0, sizeof event);
         offset = cma_user_data_offset(listen_id->id.ps);
@@ -1101,11 +1118,11 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
 
 release_conn_id:
         cma_exch(conn_id, CMA_DESTROYING);
-        cma_release_remove(conn_id);
+        cma_enable_remove(conn_id);
         rdma_destroy_id(&conn_id->id);
 
 out:
-        cma_release_remove(listen_id);
+        cma_enable_remove(listen_id);
         return ret;
 }
 
@@ -1171,9 +1188,10 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
         struct sockaddr_in *sin;
         int ret = 0;
 
-        memset(&event, 0, sizeof event);
-        atomic_inc(&id_priv->dev_remove);
+        if (cma_disable_remove(id_priv, CMA_CONNECT))
+                return 0;
 
+        memset(&event, 0, sizeof event);
         switch (iw_event->event) {
         case IW_CM_EVENT_CLOSE:
                 event.event = RDMA_CM_EVENT_DISCONNECTED;
@@ -1214,12 +1232,12 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
                 /* Destroy the CM ID by returning a non-zero value. */
                 id_priv->cm_id.iw = NULL;
                 cma_exch(id_priv, CMA_DESTROYING);
-                cma_release_remove(id_priv);
+                cma_enable_remove(id_priv);
                 rdma_destroy_id(&id_priv->id);
                 return ret;
         }
 
-        cma_release_remove(id_priv);
+        cma_enable_remove(id_priv);
         return ret;
 }
 
@@ -1234,11 +1252,8 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         int ret;
 
         listen_id = cm_id->context;
-        atomic_inc(&listen_id->dev_remove);
-        if (!cma_comp(listen_id, CMA_LISTEN)) {
-                ret = -ECONNABORTED;
-                goto out;
-        }
+        if (cma_disable_remove(listen_id, CMA_LISTEN))
+                return -ECONNABORTED;
 
         /* Create a new RDMA id for the new IW CM ID */
         new_cm_id = rdma_create_id(listen_id->id.event_handler,
@@ -1255,13 +1270,13 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         dev = ip_dev_find(iw_event->local_addr.sin_addr.s_addr);
         if (!dev) {
                 ret = -EADDRNOTAVAIL;
-                cma_release_remove(conn_id);
+                cma_enable_remove(conn_id);
                 rdma_destroy_id(new_cm_id);
                 goto out;
         }
         ret = rdma_copy_addr(&conn_id->id.route.addr.dev_addr, dev, NULL);
         if (ret) {
-                cma_release_remove(conn_id);
+                cma_enable_remove(conn_id);
                 rdma_destroy_id(new_cm_id);
                 goto out;
         }
@@ -1270,7 +1285,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         ret = cma_acquire_dev(conn_id);
         mutex_unlock(&lock);
         if (ret) {
-                cma_release_remove(conn_id);
+                cma_enable_remove(conn_id);
                 rdma_destroy_id(new_cm_id);
                 goto out;
         }
@@ -1293,14 +1308,14 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
                 /* User wants to destroy the CM ID */
                 conn_id->cm_id.iw = NULL;
                 cma_exch(conn_id, CMA_DESTROYING);
-                cma_release_remove(conn_id);
+                cma_enable_remove(conn_id);
                 rdma_destroy_id(&conn_id->id);
         }
 
 out:
         if (dev)
                 dev_put(dev);
-        cma_release_remove(listen_id);
+        cma_enable_remove(listen_id);
         return ret;
 }
 
@@ -1519,7 +1534,7 @@ static void cma_work_handler(struct work_struct *_work)
                 destroy = 1;
         }
 out:
-        cma_release_remove(id_priv);
+        cma_enable_remove(id_priv);
         cma_deref_id(id_priv);
         if (destroy)
                 rdma_destroy_id(&id_priv->id);
@@ -1711,13 +1726,13 @@ static void addr_handler(int status, struct sockaddr *src_addr,
 
         if (id_priv->id.event_handler(&id_priv->id, &event)) {
                 cma_exch(id_priv, CMA_DESTROYING);
-                cma_release_remove(id_priv);
+                cma_enable_remove(id_priv);
                 cma_deref_id(id_priv);
                 rdma_destroy_id(&id_priv->id);
                 return;
         }
 out:
-        cma_release_remove(id_priv);
+        cma_enable_remove(id_priv);
         cma_deref_id(id_priv);
 }
 
@@ -2042,11 +2057,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
         struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd;
         int ret = 0;
 
-        memset(&event, 0, sizeof event);
-        atomic_inc(&id_priv->dev_remove);
-        if (!cma_comp(id_priv, CMA_CONNECT))
-                goto out;
+        if (cma_disable_remove(id_priv, CMA_CONNECT))
+                return 0;
 
+        memset(&event, 0, sizeof event);
         switch (ib_event->event) {
         case IB_CM_SIDR_REQ_ERROR:
                 event.event = RDMA_CM_EVENT_UNREACHABLE;
@@ -2084,12 +2098,12 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
                 /* Destroy the CM ID by returning a non-zero value. */
                 id_priv->cm_id.ib = NULL;
                 cma_exch(id_priv, CMA_DESTROYING);
-                cma_release_remove(id_priv);
+                cma_enable_remove(id_priv);
                 rdma_destroy_id(&id_priv->id);
                 return ret;
         }
 out:
-        cma_release_remove(id_priv);
+        cma_enable_remove(id_priv);
         return ret;
 }
 
@@ -2413,7 +2427,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
         int ret;
 
         id_priv = container_of(id, struct rdma_id_private, id);
-        if (!cma_comp(id_priv, CMA_CONNECT))
+        if (!cma_has_cm_dev(id_priv))
                 return -EINVAL;
 
         switch (id->device->node_type) {
@@ -2435,7 +2449,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
         int ret;
 
         id_priv = container_of(id, struct rdma_id_private, id);
-        if (!cma_comp(id_priv, CMA_CONNECT))
+        if (!cma_has_cm_dev(id_priv))
                 return -EINVAL;
 
         switch (rdma_node_get_transport(id->device->node_type)) {
@@ -2466,8 +2480,7 @@ int rdma_disconnect(struct rdma_cm_id *id)
         int ret;
 
         id_priv = container_of(id, struct rdma_id_private, id);
-        if (!cma_comp(id_priv, CMA_CONNECT) &&
-            !cma_comp(id_priv, CMA_DISCONNECT))
+        if (!cma_has_cm_dev(id_priv))
                 return -EINVAL;
 
         switch (rdma_node_get_transport(id->device->node_type)) {
@@ -2499,10 +2512,9 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
         int ret;
 
         id_priv = mc->id_priv;
-        atomic_inc(&id_priv->dev_remove);
-        if (!cma_comp(id_priv, CMA_ADDR_BOUND) &&
-            !cma_comp(id_priv, CMA_ADDR_RESOLVED))
-                goto out;
+        if (cma_disable_remove(id_priv, CMA_ADDR_BOUND) &&
+            cma_disable_remove(id_priv, CMA_ADDR_RESOLVED))
+                return 0;
 
         if (!status && id_priv->id.qp)
                 status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
@@ -2524,12 +2536,12 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
         ret = id_priv->id.event_handler(&id_priv->id, &event);
         if (ret) {
                 cma_exch(id_priv, CMA_DESTROYING);
-                cma_release_remove(id_priv);
+                cma_enable_remove(id_priv);
                 rdma_destroy_id(&id_priv->id);
                 return 0;
         }
-out:
-        cma_release_remove(id_priv);
+
+        cma_enable_remove(id_priv);
         return 0;
 }
 
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 7fabb425b033..3ada17c0f239 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -40,6 +40,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
 
 #include "core_priv.h"
 
@@ -149,6 +150,18 @@ static int alloc_name(char *name)
         return 0;
 }
 
+static int start_port(struct ib_device *device)
+{
+        return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;
+}
+
+
+static int end_port(struct ib_device *device)
+{
+        return (device->node_type == RDMA_NODE_IB_SWITCH) ?
+                0 : device->phys_port_cnt;
+}
+
 /**
  * ib_alloc_device - allocate an IB device struct
  * @size:size of structure to allocate
@@ -208,6 +221,45 @@ static int add_client_context(struct ib_device *device, struct ib_client *client
         return 0;
 }
 
+static int read_port_table_lengths(struct ib_device *device)
+{
+        struct ib_port_attr *tprops = NULL;
+        int num_ports, ret = -ENOMEM;
+        u8 port_index;
+
+        tprops = kmalloc(sizeof *tprops, GFP_KERNEL);
+        if (!tprops)
+                goto out;
+
+        num_ports = end_port(device) - start_port(device) + 1;
+
+        device->pkey_tbl_len = kmalloc(sizeof *device->pkey_tbl_len * num_ports,
+                                       GFP_KERNEL);
+        device->gid_tbl_len = kmalloc(sizeof *device->gid_tbl_len * num_ports,
+                                      GFP_KERNEL);
+        if (!device->pkey_tbl_len || !device->gid_tbl_len)
+                goto err;
+
+        for (port_index = 0; port_index < num_ports; ++port_index) {
+                ret = ib_query_port(device, port_index + start_port(device),
+                                        tprops);
+                if (ret)
+                        goto err;
+                device->pkey_tbl_len[port_index] = tprops->pkey_tbl_len;
+                device->gid_tbl_len[port_index]  = tprops->gid_tbl_len;
+        }
+
+        ret = 0;
+        goto out;
+
+err:
+        kfree(device->gid_tbl_len);
+        kfree(device->pkey_tbl_len);
+out:
+        kfree(tprops);
+        return ret;
+}
+
 /**
  * ib_register_device - Register an IB device with IB core
  * @device:Device to register
@@ -239,10 +291,19 @@ int ib_register_device(struct ib_device *device)
         spin_lock_init(&device->event_handler_lock);
         spin_lock_init(&device->client_data_lock);
 
+        ret = read_port_table_lengths(device);
+        if (ret) {
+                printk(KERN_WARNING "Couldn't create table lengths cache for device %s\n",
+                       device->name);
+                goto out;
+        }
+
         ret = ib_device_register_sysfs(device);
         if (ret) {
                 printk(KERN_WARNING "Couldn't register device %s with driver model\n",
                        device->name);
+                kfree(device->gid_tbl_len);
+                kfree(device->pkey_tbl_len);
                 goto out;
         }
 
@@ -284,6 +345,9 @@ void ib_unregister_device(struct ib_device *device)
 
         list_del(&device->core_list);
 
+        kfree(device->gid_tbl_len);
+        kfree(device->pkey_tbl_len);
+
         mutex_unlock(&device_mutex);
 
         spin_lock_irqsave(&device->client_data_lock, flags);
@@ -506,10 +570,7 @@ int ib_query_port(struct ib_device *device,
                   u8 port_num,
                   struct ib_port_attr *port_attr)
 {
-        if (device->node_type == RDMA_NODE_IB_SWITCH) {
-                if (port_num)
-                        return -EINVAL;
-        } else if (port_num < 1 || port_num > device->phys_port_cnt)
+        if (port_num < start_port(device) || port_num > end_port(device))
                 return -EINVAL;
 
         return device->query_port(device, port_num, port_attr);
@@ -581,10 +642,7 @@ int ib_modify_port(struct ib_device *device,
                    u8 port_num, int port_modify_mask,
                    struct ib_port_modify *port_modify)
 {
-        if (device->node_type == RDMA_NODE_IB_SWITCH) {
-                if (port_num)
-                        return -EINVAL;
-        } else if (port_num < 1 || port_num > device->phys_port_cnt)
+        if (port_num < start_port(device) || port_num > end_port(device))
                 return -EINVAL;
 
         return device->modify_port(device, port_num, port_modify_mask,
@@ -592,6 +650,68 @@ int ib_modify_port(struct ib_device *device,
 }
 EXPORT_SYMBOL(ib_modify_port);
 
+/**
+ * ib_find_gid - Returns the port number and GID table index where
+ *   a specified GID value occurs.
+ * @device: The device to query.
+ * @gid: The GID value to search for.
+ * @port_num: The port number of the device where the GID value was found.
+ * @index: The index into the GID table where the GID was found.  This
+ *   parameter may be NULL.
+ */
+int ib_find_gid(struct ib_device *device, union ib_gid *gid,
+                u8 *port_num, u16 *index)
+{
+        union ib_gid tmp_gid;
+        int ret, port, i;
+
+        for (port = start_port(device); port <= end_port(device); ++port) {
+                for (i = 0; i < device->gid_tbl_len[port - start_port(device)]; ++i) {
+                        ret = ib_query_gid(device, port, i, &tmp_gid);
+                        if (ret)
+                                return ret;
+                        if (!memcmp(&tmp_gid, gid, sizeof *gid)) {
+                                *port_num = port;
+                                if (index)
+                                        *index = i;
+                                return 0;
+                        }
+                }
+        }
+
+        return -ENOENT;
+}
+EXPORT_SYMBOL(ib_find_gid);
+
+/**
+ * ib_find_pkey - Returns the PKey table index where a specified
+ *   PKey value occurs.
+ * @device: The device to query.
+ * @port_num: The port number of the device to search for the PKey.
+ * @pkey: The PKey value to search for.
+ * @index: The index into the PKey table where the PKey was found.
+ */
+int ib_find_pkey(struct ib_device *device,
+                 u8 port_num, u16 pkey, u16 *index)
+{
+        int ret, i;
+        u16 tmp_pkey;
+
+        for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) {
+                ret = ib_query_pkey(device, port_num, i, &tmp_pkey);
+                if (ret)
+                        return ret;
+
+                if (pkey == tmp_pkey) {
+                        *index = i;
+                        return 0;
+                }
+        }
+
+        return -ENOENT;
+}
+EXPORT_SYMBOL(ib_find_pkey);
+
 static int __init ib_core_init(void)
 {
         int ret;
@@ -613,6 +733,8 @@ static void __exit ib_core_cleanup(void)
 {
         ib_cache_cleanup();
         ib_sysfs_cleanup();
+        /* Make sure that any pending umem accounting work is done. */
+        flush_scheduled_work();
 }
 
 module_init(ib_core_init);
diff --git a/drivers/infiniband/core/uverbs_mem.c b/drivers/infiniband/core/umem.c
index c95fe952abd5..b4aec5103c99 100644
--- a/drivers/infiniband/core/uverbs_mem.c
+++ b/drivers/infiniband/core/umem.c
@@ -36,16 +36,10 @@
 
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
+#include <linux/sched.h>
 
 #include "uverbs.h"
 
-struct ib_umem_account_work {
-        struct work_struct work;
-        struct mm_struct  *mm;
-        unsigned long      diff;
-};
-
-
 static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dirty)
 {
         struct ib_umem_chunk *chunk, *tmp;
@@ -64,35 +58,56 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d
         }
 }
 
-int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
-                void *addr, size_t size, int write)
+/**
+ * ib_umem_get - Pin and DMA map userspace memory.
+ * @context: userspace context to pin memory for
+ * @addr: userspace virtual address to start at
+ * @size: length of region to pin
+ * @access: IB_ACCESS_xxx flags for memory being pinned
+ */
+struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
+                            size_t size, int access)
 {
+        struct ib_umem *umem;
         struct page **page_list;
         struct ib_umem_chunk *chunk;
         unsigned long locked;
         unsigned long lock_limit;
         unsigned long cur_base;
         unsigned long npages;
-        int ret = 0;
+        int ret;
         int off;
         int i;
 
         if (!can_do_mlock())
-                return -EPERM;
+                return ERR_PTR(-EPERM);
 
-        page_list = (struct page **) __get_free_page(GFP_KERNEL);
-        if (!page_list)
-                return -ENOMEM;
+        umem = kmalloc(sizeof *umem, GFP_KERNEL);
+        if (!umem)
+                return ERR_PTR(-ENOMEM);
 
-        mem->user_base = (unsigned long) addr;
-        mem->length    = size;
-        mem->offset    = (unsigned long) addr & ~PAGE_MASK;
-        mem->page_size = PAGE_SIZE;
-        mem->writable  = write;
+        umem->context   = context;
+        umem->length    = size;
+        umem->offset    = addr & ~PAGE_MASK;
+        umem->page_size = PAGE_SIZE;
+        /*
+         * We ask for writable memory if any access flags other than
+         * "remote read" are set.  "Local write" and "remote write"
+         * obviously require write access.  "Remote atomic" can do
+         * things like fetch and add, which will modify memory, and
+         * "MW bind" can change permissions by binding a window.
+         */
+        umem->writable  = !!(access & ~IB_ACCESS_REMOTE_READ);
 
-        INIT_LIST_HEAD(&mem->chunk_list);
+        INIT_LIST_HEAD(&umem->chunk_list);
 
-        npages = PAGE_ALIGN(size + mem->offset) >> PAGE_SHIFT;
+        page_list = (struct page **) __get_free_page(GFP_KERNEL);
+        if (!page_list) {
+                kfree(umem);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        npages = PAGE_ALIGN(size + umem->offset) >> PAGE_SHIFT;
 
         down_write(&current->mm->mmap_sem);
 
@@ -104,13 +119,13 @@ int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
                 goto out;
         }
 
-        cur_base = (unsigned long) addr & PAGE_MASK;
+        cur_base = addr & PAGE_MASK;
 
         while (npages) {
                 ret = get_user_pages(current, current->mm, cur_base,
                                      min_t(int, npages,
                                            PAGE_SIZE / sizeof (struct page *)),
-                                     1, !write, page_list, NULL);
+                                     1, !umem->writable, page_list, NULL);
 
                 if (ret < 0)
                         goto out;
@@ -136,7 +151,7 @@ int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
                                 chunk->page_list[i].length = PAGE_SIZE;
                         }
 
-                        chunk->nmap = ib_dma_map_sg(dev,
+                        chunk->nmap = ib_dma_map_sg(context->device,
                                                     &chunk->page_list[0],
                                                     chunk->nents,
                                                     DMA_BIDIRECTIONAL);
@@ -151,75 +166,96 @@ int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
 
                         ret -= chunk->nents;
                         off += chunk->nents;
-                        list_add_tail(&chunk->list, &mem->chunk_list);
+                        list_add_tail(&chunk->list, &umem->chunk_list);
                 }
 
                 ret = 0;
         }
 
 out:
-        if (ret < 0)
-                __ib_umem_release(dev, mem, 0);
-        else
+        if (ret < 0) {
+                __ib_umem_release(context->device, umem, 0);
+                kfree(umem);
+        } else
                 current->mm->locked_vm = locked;
 
         up_write(&current->mm->mmap_sem);
         free_page((unsigned long) page_list);
 
-        return ret;
+        return ret < 0 ? ERR_PTR(ret) : umem;
 }
+EXPORT_SYMBOL(ib_umem_get);
 
-void ib_umem_release(struct ib_device *dev, struct ib_umem *umem)
+static void ib_umem_account(struct work_struct *work)
 {
-        __ib_umem_release(dev, umem, 1);
+        struct ib_umem *umem = container_of(work, struct ib_umem, work);
 
-        down_write(&current->mm->mmap_sem);
-        current->mm->locked_vm -=
-                PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;
-        up_write(&current->mm->mmap_sem);
+        down_write(&umem->mm->mmap_sem);
+        umem->mm->locked_vm -= umem->diff;
+        up_write(&umem->mm->mmap_sem);
+        mmput(umem->mm);
+        kfree(umem);
 }
 
-static void ib_umem_account(struct work_struct *_work)
-{
-        struct ib_umem_account_work *work =
-                container_of(_work, struct ib_umem_account_work, work);
-
-        down_write(&work->mm->mmap_sem);
-        work->mm->locked_vm -= work->diff;
-        up_write(&work->mm->mmap_sem);
-        mmput(work->mm);
-        kfree(work);
-}
-
-void ib_umem_release_on_close(struct ib_device *dev, struct ib_umem *umem)
+/**
+ * ib_umem_release - release memory pinned with ib_umem_get
+ * @umem: umem struct to release
+ */
+void ib_umem_release(struct ib_umem *umem)
 {
-        struct ib_umem_account_work *work;
+        struct ib_ucontext *context = umem->context;
         struct mm_struct *mm;
+        unsigned long diff;
 
-        __ib_umem_release(dev, umem, 1);
+        __ib_umem_release(umem->context->device, umem, 1);
 
         mm = get_task_mm(current);
-        if (!mm)
+        if (!mm) {
+                kfree(umem);
                 return;
+        }
+
+        diff = PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;
 
         /*
          * We may be called with the mm's mmap_sem already held.  This
          * can happen when a userspace munmap() is the call that drops
          * the last reference to our file and calls our release
          * method.  If there are memory regions to destroy, we'll end
-         * up here and not be able to take the mmap_sem.  Therefore we
-         * defer the vm_locked accounting to the system workqueue.
+         * up here and not be able to take the mmap_sem.  In that case
+         * we defer the vm_locked accounting to the system workqueue.
          */
+        if (context->closing && !down_write_trylock(&mm->mmap_sem)) {
+                INIT_WORK(&umem->work, ib_umem_account);
+                umem->mm   = mm;
+                umem->diff = diff;
 
-        work = kmalloc(sizeof *work, GFP_KERNEL);
-        if (!work) {
-                mmput(mm);
+                schedule_work(&umem->work);
                 return;
-        }
+        } else
+                down_write(&mm->mmap_sem);
+
+        current->mm->locked_vm -= diff;
+        up_write(&mm->mmap_sem);
+        mmput(mm);
+        kfree(umem);
+}
+EXPORT_SYMBOL(ib_umem_release);
+
+int ib_umem_page_count(struct ib_umem *umem)
+{
+        struct ib_umem_chunk *chunk;
+        int shift;
+        int i;
+        int n;
+
+        shift = ilog2(umem->page_size);
 
-        INIT_WORK(&work->work, ib_umem_account);
-        work->mm   = mm;
-        work->diff = PAGE_ALIGN(umem->length + umem->offset) >> PAGE_SHIFT;
+        n = 0;
+        list_for_each_entry(chunk, &umem->chunk_list, list)
+                for (i = 0; i < chunk->nmap; ++i)
+                        n += sg_dma_len(&chunk->page_list[i]) >> shift;
 
-        schedule_work(&work->work);
+        return n;
 }
+EXPORT_SYMBOL(ib_umem_page_count);
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index 102a59c033ff..c33546f9e961 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -45,6 +45,7 @@
 #include <linux/completion.h>
 
 #include <rdma/ib_verbs.h>
+#include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 
 /*
@@ -163,11 +164,6 @@ void ib_uverbs_srq_event_handler(struct ib_event *event, void *context_ptr);
 void ib_uverbs_event_handler(struct ib_event_handler *handler,
                              struct ib_event *event);
 
-int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
-                void *addr, size_t size, int write);
-void ib_umem_release(struct ib_device *dev, struct ib_umem *umem);
-void ib_umem_release_on_close(struct ib_device *dev, struct ib_umem *umem);
-
 #define IB_UVERBS_DECLARE_CMD(name)                                     \
         ssize_t ib_uverbs_##name(struct ib_uverbs_file *file,           \
                                  const char __user *buf, int in_len,    \
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index bab66769be14..01d70084aebe 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 PathScale, Inc.  All rights reserved.
  * Copyright (c) 2006 Mellanox Technologies.  All rights reserved.
  *
@@ -295,6 +295,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
         INIT_LIST_HEAD(&ucontext->qp_list);
         INIT_LIST_HEAD(&ucontext->srq_list);
         INIT_LIST_HEAD(&ucontext->ah_list);
+        ucontext->closing = 0;
 
         resp.num_comp_vectors = file->device->num_comp_vectors;
 
@@ -573,7 +574,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
         struct ib_uverbs_reg_mr      cmd;
         struct ib_uverbs_reg_mr_resp resp;
         struct ib_udata              udata;
-        struct ib_umem_object       *obj;
+        struct ib_uobject           *uobj;
         struct ib_pd                *pd;
         struct ib_mr                *mr;
         int                          ret;
@@ -599,35 +600,21 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
             !(cmd.access_flags & IB_ACCESS_LOCAL_WRITE))
                 return -EINVAL;
 
-        obj = kmalloc(sizeof *obj, GFP_KERNEL);
-        if (!obj)
+        uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
+        if (!uobj)
                 return -ENOMEM;
 
-        init_uobj(&obj->uobject, 0, file->ucontext, &mr_lock_key);
-        down_write(&obj->uobject.mutex);
-
-        /*
-         * We ask for writable memory if any access flags other than
-         * "remote read" are set.  "Local write" and "remote write"
-         * obviously require write access.  "Remote atomic" can do
-         * things like fetch and add, which will modify memory, and
-         * "MW bind" can change permissions by binding a window.
-         */
-        ret = ib_umem_get(file->device->ib_dev, &obj->umem,
-                          (void *) (unsigned long) cmd.start, cmd.length,
-                          !!(cmd.access_flags & ~IB_ACCESS_REMOTE_READ));
-        if (ret)
-                goto err_free;
-
-        obj->umem.virt_base = cmd.hca_va;
+        init_uobj(uobj, 0, file->ucontext, &mr_lock_key);
+        down_write(&uobj->mutex);
 
         pd = idr_read_pd(cmd.pd_handle, file->ucontext);
         if (!pd) {
                 ret = -EINVAL;
-                goto err_release;
+                goto err_free;
         }
 
-        mr = pd->device->reg_user_mr(pd, &obj->umem, cmd.access_flags, &udata);
+        mr = pd->device->reg_user_mr(pd, cmd.start, cmd.length, cmd.hca_va,
+                                     cmd.access_flags, &udata);
         if (IS_ERR(mr)) {
                 ret = PTR_ERR(mr);
                 goto err_put;
@@ -635,19 +622,19 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
 
         mr->device  = pd->device;
         mr->pd      = pd;
-        mr->uobject = &obj->uobject;
+        mr->uobject = uobj;
         atomic_inc(&pd->usecnt);
         atomic_set(&mr->usecnt, 0);
 
-        obj->uobject.object = mr;
-        ret = idr_add_uobj(&ib_uverbs_mr_idr, &obj->uobject);
+        uobj->object = mr;
+        ret = idr_add_uobj(&ib_uverbs_mr_idr, uobj);
         if (ret)
                 goto err_unreg;
 
         memset(&resp, 0, sizeof resp);
         resp.lkey      = mr->lkey;
         resp.rkey      = mr->rkey;
-        resp.mr_handle = obj->uobject.id;
+        resp.mr_handle = uobj->id;
 
         if (copy_to_user((void __user *) (unsigned long) cmd.response,
                          &resp, sizeof resp)) {
@@ -658,17 +645,17 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
         put_pd_read(pd);
 
         mutex_lock(&file->mutex);
-        list_add_tail(&obj->uobject.list, &file->ucontext->mr_list);
+        list_add_tail(&uobj->list, &file->ucontext->mr_list);
         mutex_unlock(&file->mutex);
 
-        obj->uobject.live = 1;
+        uobj->live = 1;
 
-        up_write(&obj->uobject.mutex);
+        up_write(&uobj->mutex);
 
         return in_len;
 
 err_copy:
-        idr_remove_uobj(&ib_uverbs_mr_idr, &obj->uobject);
+        idr_remove_uobj(&ib_uverbs_mr_idr, uobj);
 
 err_unreg:
         ib_dereg_mr(mr);
@@ -676,11 +663,8 @@ err_unreg:
 err_put:
         put_pd_read(pd);
 
-err_release:
-        ib_umem_release(file->device->ib_dev, &obj->umem);
-
 err_free:
-        put_uobj_write(&obj->uobject);
+        put_uobj_write(uobj);
         return ret;
 }
 
@@ -691,7 +675,6 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file,
         struct ib_uverbs_dereg_mr cmd;
         struct ib_mr             *mr;
         struct ib_uobject        *uobj;
-        struct ib_umem_object    *memobj;
         int                       ret = -EINVAL;
 
         if (copy_from_user(&cmd, buf, sizeof cmd))
@@ -701,8 +684,7 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file,
         if (!uobj)
                 return -EINVAL;
 
-        memobj = container_of(uobj, struct ib_umem_object, uobject);
-        mr     = uobj->object;
+        mr = uobj->object;
 
         ret = ib_dereg_mr(mr);
         if (!ret)
@@ -719,8 +701,6 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file,
         list_del(&uobj->list);
         mutex_unlock(&file->mutex);
 
-        ib_umem_release(file->device->ib_dev, &memobj->umem);
-
         put_uobj(uobj);
 
         return in_len;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index d44e54799651..14d7ccd89195 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -183,6 +183,8 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
         if (!context)
                 return 0;
 
+        context->closing = 1;
+
         list_for_each_entry_safe(uobj, tmp, &context->ah_list, list) {
                 struct ib_ah *ah = uobj->object;
 
@@ -230,16 +232,10 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
 
         list_for_each_entry_safe(uobj, tmp, &context->mr_list, list) {
                 struct ib_mr *mr = uobj->object;
-                struct ib_device *mrdev = mr->device;
-                struct ib_umem_object *memobj;
 
                 idr_remove_uobj(&ib_uverbs_mr_idr, uobj);
                 ib_dereg_mr(mr);
-
-                memobj = container_of(uobj, struct ib_umem_object, uobject);
-                ib_umem_release_on_close(mrdev, &memobj->umem);
-
-                kfree(memobj);
+                kfree(uobj);
         }
 
         list_for_each_entry_safe(uobj, tmp, &context->pd_list, list) {
@@ -906,7 +902,6 @@ 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/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 109166223c09..997cf1530762 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -56,6 +56,7 @@
 #include <asm/byteorder.h>
 
 #include <rdma/ib_smi.h>
+#include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 #include "c2.h"
 #include "c2_provider.h"
@@ -396,6 +397,7 @@ static struct ib_mr *c2_reg_phys_mr(struct ib_pd *ib_pd,
         }
 
         mr->pd = to_c2pd(ib_pd);
+        mr->umem = NULL;
         pr_debug("%s - page shift %d, pbl_depth %d, total_len %u, "
                 "*iova_start %llx, first pa %llx, last pa %llx\n",
                 __FUNCTION__, page_shift, pbl_depth, total_len,
@@ -428,8 +430,8 @@ static struct ib_mr *c2_get_dma_mr(struct ib_pd *pd, int acc)
         return c2_reg_phys_mr(pd, &bl, 1, acc, &kva);
 }
 
-static struct ib_mr *c2_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
-                                    int acc, struct ib_udata *udata)
+static struct ib_mr *c2_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                    u64 virt, int acc, struct ib_udata *udata)
 {
         u64 *pages;
         u64 kva = 0;
@@ -441,15 +443,23 @@ static struct ib_mr *c2_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         struct c2_mr *c2mr;
 
         pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
-        shift = ffs(region->page_size) - 1;
 
         c2mr = kmalloc(sizeof(*c2mr), GFP_KERNEL);
         if (!c2mr)
                 return ERR_PTR(-ENOMEM);
         c2mr->pd = c2pd;
 
+        c2mr->umem = ib_umem_get(pd->uobject->context, start, length, acc);
+        if (IS_ERR(c2mr->umem)) {
+                err = PTR_ERR(c2mr->umem);
+                kfree(c2mr);
+                return ERR_PTR(err);
+        }
+
+        shift = ffs(c2mr->umem->page_size) - 1;
+
         n = 0;
-        list_for_each_entry(chunk, &region->chunk_list, list)
+        list_for_each_entry(chunk, &c2mr->umem->chunk_list, list)
                 n += chunk->nents;
 
         pages = kmalloc(n * sizeof(u64), GFP_KERNEL);
@@ -459,35 +469,34 @@ static struct ib_mr *c2_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         }
 
         i = 0;
-        list_for_each_entry(chunk, &region->chunk_list, list) {
+        list_for_each_entry(chunk, &c2mr->umem->chunk_list, list) {
                 for (j = 0; j < chunk->nmap; ++j) {
                         len = sg_dma_len(&chunk->page_list[j]) >> shift;
                         for (k = 0; k < len; ++k) {
                                 pages[i++] =
                                         sg_dma_address(&chunk->page_list[j]) +
-                                        (region->page_size * k);
+                                        (c2mr->umem->page_size * k);
                         }
                 }
         }
 
-        kva = (u64)region->virt_base;
+        kva = virt;
         err = c2_nsmr_register_phys_kern(to_c2dev(pd->device),
                                          pages,
-                                         region->page_size,
+                                         c2mr->umem->page_size,
                                          i,
-                                         region->length,
-                                         region->offset,
+                                         length,
+                                         c2mr->umem->offset,
                                          &kva,
                                          c2_convert_access(acc),
                                          c2mr);
         kfree(pages);
-        if (err) {
-                kfree(c2mr);
-                return ERR_PTR(err);
-        }
+        if (err)
+                goto err;
         return &c2mr->ibmr;
 
 err:
+        ib_umem_release(c2mr->umem);
         kfree(c2mr);
         return ERR_PTR(err);
 }
@@ -502,8 +511,11 @@ static int c2_dereg_mr(struct ib_mr *ib_mr)
         err = c2_stag_dealloc(to_c2dev(ib_mr->device), ib_mr->lkey);
         if (err)
                 pr_debug("c2_stag_dealloc failed: %d\n", err);
-        else
+        else {
+                if (mr->umem)
+                        ib_umem_release(mr->umem);
                 kfree(mr);
+        }
 
         return err;
 }
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.h b/drivers/infiniband/hw/amso1100/c2_provider.h
index fc906223220f..1076df2ee96a 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.h
+++ b/drivers/infiniband/hw/amso1100/c2_provider.h
@@ -73,6 +73,7 @@ struct c2_pd {
 struct c2_mr {
         struct ib_mr ibmr;
         struct c2_pd *pd;
+        struct ib_umem *umem;
 };
 
 struct c2_av;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index a891493fd340..e7c2c3948037 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -47,6 +47,7 @@
 #include <rdma/iw_cm.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_smi.h>
+#include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 
 #include "cxio_hal.h"
@@ -443,6 +444,8 @@ static int iwch_dereg_mr(struct ib_mr *ib_mr)
         remove_handle(rhp, &rhp->mmidr, mmid);
         if (mhp->kva)
                 kfree((void *) (unsigned long) mhp->kva);
+        if (mhp->umem)
+                ib_umem_release(mhp->umem);
         PDBG("%s mmid 0x%x ptr %p\n", __FUNCTION__, mmid, mhp);
         kfree(mhp);
         return 0;
@@ -577,8 +580,8 @@ static int iwch_reregister_phys_mem(struct ib_mr *mr,
 }
 
 
-static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
-                                      int acc, struct ib_udata *udata)
+static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                      u64 virt, int acc, struct ib_udata *udata)
 {
         __be64 *pages;
         int shift, n, len;
@@ -591,7 +594,6 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         struct iwch_reg_user_mr_resp uresp;
 
         PDBG("%s ib_pd %p\n", __FUNCTION__, pd);
-        shift = ffs(region->page_size) - 1;
 
         php = to_iwch_pd(pd);
         rhp = php->rhp;
@@ -599,8 +601,17 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         if (!mhp)
                 return ERR_PTR(-ENOMEM);
 
+        mhp->umem = ib_umem_get(pd->uobject->context, start, length, acc);
+        if (IS_ERR(mhp->umem)) {
+                err = PTR_ERR(mhp->umem);
+                kfree(mhp);
+                return ERR_PTR(err);
+        }
+
+        shift = ffs(mhp->umem->page_size) - 1;
+
         n = 0;
-        list_for_each_entry(chunk, &region->chunk_list, list)
+        list_for_each_entry(chunk, &mhp->umem->chunk_list, list)
                 n += chunk->nents;
 
         pages = kmalloc(n * sizeof(u64), GFP_KERNEL);
@@ -611,13 +622,13 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
 
         i = n = 0;
 
-        list_for_each_entry(chunk, &region->chunk_list, list)
+        list_for_each_entry(chunk, &mhp->umem->chunk_list, list)
                 for (j = 0; j < chunk->nmap; ++j) {
                         len = sg_dma_len(&chunk->page_list[j]) >> shift;
                         for (k = 0; k < len; ++k) {
                                 pages[i++] = cpu_to_be64(sg_dma_address(
                                         &chunk->page_list[j]) +
-                                        region->page_size * k);
+                                        mhp->umem->page_size * k);
                         }
                 }
 
@@ -625,9 +636,9 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         mhp->attr.pdid = php->pdid;
         mhp->attr.zbva = 0;
         mhp->attr.perms = iwch_ib_to_tpt_access(acc);
-        mhp->attr.va_fbo = region->virt_base;
+        mhp->attr.va_fbo = virt;
         mhp->attr.page_size = shift - 12;
-        mhp->attr.len = (u32) region->length;
+        mhp->attr.len = (u32) length;
         mhp->attr.pbl_size = i;
         err = iwch_register_mem(rhp, php, mhp, shift, pages);
         kfree(pages);
@@ -650,6 +661,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         return &mhp->ibmr;
 
 err:
+        ib_umem_release(mhp->umem);
         kfree(mhp);
         return ERR_PTR(err);
 }
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.h b/drivers/infiniband/hw/cxgb3/iwch_provider.h
index 93bcc56756bd..48833f3f3bd0 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.h
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.h
@@ -73,6 +73,7 @@ struct tpt_attributes {
 
 struct iwch_mr {
         struct ib_mr ibmr;
+        struct ib_umem *umem;
         struct iwch_dev *rhp;
         u64 kva;
         struct tpt_attributes attr;
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index 10fb8fbafa0c..1d286d3cc2d5 100644
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -176,6 +176,7 @@ struct ehca_mr {
                 struct ib_mr ib_mr;     /* must always be first in ehca_mr */
                 struct ib_fmr ib_fmr;   /* must always be first in ehca_mr */
         } ib;
+        struct ib_umem *umem;
         spinlock_t mrlock;
 
         enum ehca_mr_flag flags;
@@ -276,6 +277,7 @@ void ehca_cleanup_mrmw_cache(void);
 
 extern spinlock_t ehca_qp_idr_lock;
 extern spinlock_t ehca_cq_idr_lock;
+extern spinlock_t hcall_lock;
 extern struct idr ehca_qp_idr;
 extern struct idr ehca_cq_idr;
 
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index f284be1c9166..100329ba3343 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -517,12 +517,11 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
                         else {
                                 struct ehca_cq *cq = eq->eqe_cache[i].cq;
                                 comp_event_callback(cq);
-                                spin_lock_irqsave(&ehca_cq_idr_lock, flags);
+                                spin_lock(&ehca_cq_idr_lock);
                                 cq->nr_events--;
                                 if (!cq->nr_events)
                                         wake_up(&cq->wait_completion);
-                                spin_unlock_irqrestore(&ehca_cq_idr_lock,
-                                                       flags);
+                                spin_unlock(&ehca_cq_idr_lock);
                         }
                 } else {
                         ehca_dbg(&shca->ib_device, "Got non completion event");
@@ -711,6 +710,7 @@ static void destroy_comp_task(struct ehca_comp_pool *pool,
                 kthread_stop(task);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void take_over_work(struct ehca_comp_pool *pool,
                            int cpu)
 {
@@ -735,7 +735,6 @@ static void take_over_work(struct ehca_comp_pool *pool,
 
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static int comp_pool_callback(struct notifier_block *nfb,
                               unsigned long action,
                               void *hcpu)
@@ -745,6 +744,7 @@ static int comp_pool_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_PREPARE)", cpu);
                 if(!create_comp_task(pool, cpu)) {
                         ehca_gen_err("Can't create comp_task for cpu: %x", cpu);
@@ -752,24 +752,29 @@ static int comp_pool_callback(struct notifier_block *nfb,
                 }
                 break;
         case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_CANCELED)", cpu);
                 cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu);
                 kthread_bind(cct->task, any_online_cpu(cpu_online_map));
                 destroy_comp_task(pool, cpu);
                 break;
         case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_ONLINE)", cpu);
                 cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu);
                 kthread_bind(cct->task, cpu);
                 wake_up_process(cct->task);
                 break;
         case CPU_DOWN_PREPARE:
+        case CPU_DOWN_PREPARE_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_DOWN_PREPARE)", cpu);
                 break;
         case CPU_DOWN_FAILED:
+        case CPU_DOWN_FAILED_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_DOWN_FAILED)", cpu);
                 break;
         case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_DEAD)", cpu);
                 destroy_comp_task(pool, cpu);
                 take_over_work(pool, cpu);
diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h b/drivers/infiniband/hw/ehca/ehca_iverbs.h
index e14b029332c8..37e7fe0908cf 100644
--- a/drivers/infiniband/hw/ehca/ehca_iverbs.h
+++ b/drivers/infiniband/hw/ehca/ehca_iverbs.h
@@ -78,8 +78,7 @@ struct ib_mr *ehca_reg_phys_mr(struct ib_pd *pd,
                                int num_phys_buf,
                                int mr_access_flags, u64 *iova_start);
 
-struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd,
-                               struct ib_umem *region,
+struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, u64 virt,
                                int mr_access_flags, struct ib_udata *udata);
 
 int ehca_rereg_phys_mr(struct ib_mr *mr,
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 2d370543e96d..c3f99f33b49c 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -52,7 +52,7 @@
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");
 MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");
-MODULE_VERSION("SVNEHCA_0022");
+MODULE_VERSION("SVNEHCA_0023");
 
 int ehca_open_aqp1     = 0;
 int ehca_debug_level   = 0;
@@ -62,7 +62,7 @@ int ehca_use_hp_mr     = 0;
 int ehca_port_act_time = 30;
 int ehca_poll_all_eqs  = 1;
 int ehca_static_rate   = -1;
-int ehca_scaling_code  = 1;
+int ehca_scaling_code  = 0;
 
 module_param_named(open_aqp1,     ehca_open_aqp1,     int, 0);
 module_param_named(debug_level,   ehca_debug_level,   int, 0);
@@ -98,6 +98,7 @@ MODULE_PARM_DESC(scaling_code,
 
 spinlock_t ehca_qp_idr_lock;
 spinlock_t ehca_cq_idr_lock;
+spinlock_t hcall_lock;
 DEFINE_IDR(ehca_qp_idr);
 DEFINE_IDR(ehca_cq_idr);
 
@@ -453,15 +454,14 @@ static ssize_t ehca_store_debug_level(struct device_driver *ddp,
 DRIVER_ATTR(debug_level, S_IRUSR | S_IWUSR,
             ehca_show_debug_level, ehca_store_debug_level);
 
-void ehca_create_driver_sysfs(struct ibmebus_driver *drv)
-{
-        driver_create_file(&drv->driver, &driver_attr_debug_level);
-}
+static struct attribute *ehca_drv_attrs[] = {
+        &driver_attr_debug_level.attr,
+        NULL
+};
 
-void ehca_remove_driver_sysfs(struct ibmebus_driver *drv)
-{
-        driver_remove_file(&drv->driver, &driver_attr_debug_level);
-}
+static struct attribute_group ehca_drv_attr_grp = {
+        .attrs = ehca_drv_attrs
+};
 
 #define EHCA_RESOURCE_ATTR(name)                                           \
 static ssize_t  ehca_show_##name(struct device *dev,                       \
@@ -523,44 +523,28 @@ static ssize_t ehca_show_adapter_handle(struct device *dev,
 }
 static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);
 
+static struct attribute *ehca_dev_attrs[] = {
+        &dev_attr_adapter_handle.attr,
+        &dev_attr_num_ports.attr,
+        &dev_attr_hw_ver.attr,
+        &dev_attr_max_eq.attr,
+        &dev_attr_cur_eq.attr,
+        &dev_attr_max_cq.attr,
+        &dev_attr_cur_cq.attr,
+        &dev_attr_max_qp.attr,
+        &dev_attr_cur_qp.attr,
+        &dev_attr_max_mr.attr,
+        &dev_attr_cur_mr.attr,
+        &dev_attr_max_mw.attr,
+        &dev_attr_cur_mw.attr,
+        &dev_attr_max_pd.attr,
+        &dev_attr_max_ah.attr,
+        NULL
+};
 
-void ehca_create_device_sysfs(struct ibmebus_dev *dev)
-{
-        device_create_file(&dev->ofdev.dev, &dev_attr_adapter_handle);
-        device_create_file(&dev->ofdev.dev, &dev_attr_num_ports);
-        device_create_file(&dev->ofdev.dev, &dev_attr_hw_ver);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_eq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_eq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_cq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_cq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_qp);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_qp);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_mr);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_mr);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_mw);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_mw);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_pd);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_ah);
-}
-
-void ehca_remove_device_sysfs(struct ibmebus_dev *dev)
-{
-        device_remove_file(&dev->ofdev.dev, &dev_attr_adapter_handle);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_num_ports);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_hw_ver);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_eq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_eq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_cq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_cq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_qp);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_qp);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_mr);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_mr);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_mw);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_mw);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_pd);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_ah);
-}
+static struct attribute_group ehca_dev_attr_grp = {
+        .attrs = ehca_dev_attrs
+};
 
 static int __devinit ehca_probe(struct ibmebus_dev *dev,
                                 const struct of_device_id *id)
@@ -570,7 +554,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
         struct ib_pd *ibpd;
         int ret;
 
-        handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
+        handle = of_get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
         if (!handle) {
                 ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
                              dev->ofdev.node->full_name);
@@ -668,7 +652,10 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                 }
         }
 
-        ehca_create_device_sysfs(dev);
+        ret = sysfs_create_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
+        if (ret) /* only complain; we can live without attributes */
+                ehca_err(&shca->ib_device,
+                         "Cannot create device attributes  ret=%d", ret);
 
         spin_lock(&shca_list_lock);
         list_add(&shca->shca_list, &shca_list);
@@ -720,7 +707,7 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev)
         struct ehca_shca *shca = dev->ofdev.dev.driver_data;
         int ret;
 
-        ehca_remove_device_sysfs(dev);
+        sysfs_remove_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
 
         if (ehca_open_aqp1 == 1) {
                 int i;
@@ -812,11 +799,12 @@ int __init ehca_module_init(void)
         int ret;
 
         printk(KERN_INFO "eHCA Infiniband Device Driver "
-               "(Rel.: SVNEHCA_0022)\n");
+               "(Rel.: SVNEHCA_0023)\n");
         idr_init(&ehca_qp_idr);
         idr_init(&ehca_cq_idr);
         spin_lock_init(&ehca_qp_idr_lock);
         spin_lock_init(&ehca_cq_idr_lock);
+        spin_lock_init(&hcall_lock);
 
         INIT_LIST_HEAD(&shca_list);
         spin_lock_init(&shca_list_lock);
@@ -838,7 +826,9 @@ int __init ehca_module_init(void)
                 goto module_init2;
         }
 
-        ehca_create_driver_sysfs(&ehca_driver);
+        ret = sysfs_create_group(&ehca_driver.driver.kobj, &ehca_drv_attr_grp);
+        if (ret) /* only complain; we can live without attributes */
+                ehca_gen_err("Cannot create driver attributes  ret=%d", ret);
 
         if (ehca_poll_all_eqs != 1) {
                 ehca_gen_err("WARNING!!!");
@@ -865,7 +855,7 @@ void __exit ehca_module_exit(void)
         if (ehca_poll_all_eqs == 1)
                 del_timer_sync(&poll_eqs_timer);
 
-        ehca_remove_driver_sysfs(&ehca_driver);
+        sysfs_remove_group(&ehca_driver.driver.kobj, &ehca_drv_attr_grp);
         ibmebus_unregister_driver(&ehca_driver);
 
         ehca_destroy_slab_caches();
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index d22ab563633f..add79bd44e39 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -39,6 +39,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <rdma/ib_umem.h>
+
 #include <asm/current.h>
 
 #include "ehca_iverbs.h"
@@ -238,10 +240,8 @@ reg_phys_mr_exit0:
 
 /*----------------------------------------------------------------------*/
 
-struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd,
-                               struct ib_umem *region,
-                               int mr_access_flags,
-                               struct ib_udata *udata)
+struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, u64 virt,
+                               int mr_access_flags, struct ib_udata *udata)
 {
         struct ib_mr *ib_mr;
         struct ehca_mr *e_mr;
@@ -257,11 +257,7 @@ struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd,
                 ehca_gen_err("bad pd=%p", pd);
                 return ERR_PTR(-EFAULT);
         }
-        if (!region) {
-                ehca_err(pd->device, "bad input values: region=%p", region);
-                ib_mr = ERR_PTR(-EINVAL);
-                goto reg_user_mr_exit0;
-        }
+
         if (((mr_access_flags & IB_ACCESS_REMOTE_WRITE) &&
              !(mr_access_flags & IB_ACCESS_LOCAL_WRITE)) ||
             ((mr_access_flags & IB_ACCESS_REMOTE_ATOMIC) &&
@@ -275,17 +271,10 @@ struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd,
                 ib_mr = ERR_PTR(-EINVAL);
                 goto reg_user_mr_exit0;
         }
-        if (region->page_size != PAGE_SIZE) {
-                ehca_err(pd->device, "page size not supported, "
-                         "region->page_size=%x", region->page_size);
-                ib_mr = ERR_PTR(-EINVAL);
-                goto reg_user_mr_exit0;
-        }
 
-        if ((region->length == 0) ||
-            ((region->virt_base + region->length) < region->virt_base)) {
+        if (length == 0 || virt + length < virt) {
                 ehca_err(pd->device, "bad input values: length=%lx "
-                         "virt_base=%lx", region->length, region->virt_base);
+                         "virt_base=%lx", length, virt);
                 ib_mr = ERR_PTR(-EINVAL);
                 goto reg_user_mr_exit0;
         }
@@ -297,40 +286,55 @@ struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd,
                 goto reg_user_mr_exit0;
         }
 
+        e_mr->umem = ib_umem_get(pd->uobject->context, start, length,
+                                 mr_access_flags);
+        if (IS_ERR(e_mr->umem)) {
+                ib_mr = (void *) e_mr->umem;
+                goto reg_user_mr_exit1;
+        }
+
+        if (e_mr->umem->page_size != PAGE_SIZE) {
+                ehca_err(pd->device, "page size not supported, "
+                         "e_mr->umem->page_size=%x", e_mr->umem->page_size);
+                ib_mr = ERR_PTR(-EINVAL);
+                goto reg_user_mr_exit2;
+        }
+
         /* determine number of MR pages */
-        num_pages_mr = (((region->virt_base % PAGE_SIZE) + region->length +
-                         PAGE_SIZE - 1) / PAGE_SIZE);
-        num_pages_4k = (((region->virt_base % EHCA_PAGESIZE) + region->length +
-                         EHCA_PAGESIZE - 1) / EHCA_PAGESIZE);
+        num_pages_mr = (((virt % PAGE_SIZE) + length + PAGE_SIZE - 1) /
+                        PAGE_SIZE);
+        num_pages_4k = (((virt % EHCA_PAGESIZE) + length + EHCA_PAGESIZE - 1) /
+                        EHCA_PAGESIZE);
 
         /* register MR on HCA */
         pginfo.type       = EHCA_MR_PGI_USER;
         pginfo.num_pages  = num_pages_mr;
         pginfo.num_4k     = num_pages_4k;
-        pginfo.region     = region;
-        pginfo.next_4k    = region->offset / EHCA_PAGESIZE;
+        pginfo.region     = e_mr->umem;
+        pginfo.next_4k    = e_mr->umem->offset / EHCA_PAGESIZE;
         pginfo.next_chunk = list_prepare_entry(pginfo.next_chunk,
-                                               (&region->chunk_list),
+                                               (&e_mr->umem->chunk_list),
                                                list);
 
-        ret = ehca_reg_mr(shca, e_mr, (u64*)region->virt_base,
-                          region->length, mr_access_flags, e_pd, &pginfo,
-                          &e_mr->ib.ib_mr.lkey, &e_mr->ib.ib_mr.rkey);
+        ret = ehca_reg_mr(shca, e_mr, (u64*) virt, length, mr_access_flags, e_pd,
+                          &pginfo, &e_mr->ib.ib_mr.lkey, &e_mr->ib.ib_mr.rkey);
         if (ret) {
                 ib_mr = ERR_PTR(ret);
-                goto reg_user_mr_exit1;
+                goto reg_user_mr_exit2;
         }
 
         /* successful registration of all pages */
         return &e_mr->ib.ib_mr;
 
+reg_user_mr_exit2:
+        ib_umem_release(e_mr->umem);
 reg_user_mr_exit1:
         ehca_mr_delete(e_mr);
 reg_user_mr_exit0:
         if (IS_ERR(ib_mr))
-                ehca_err(pd->device, "rc=%lx pd=%p region=%p mr_access_flags=%x"
+                ehca_err(pd->device, "rc=%lx pd=%p mr_access_flags=%x"
                          " udata=%p",
-                         PTR_ERR(ib_mr), pd, region, mr_access_flags, udata);
+                         PTR_ERR(ib_mr), pd, mr_access_flags, udata);
         return ib_mr;
 } /* end ehca_reg_user_mr() */
 
@@ -596,6 +600,9 @@ int ehca_dereg_mr(struct ib_mr *mr)
                 goto dereg_mr_exit0;
         }
 
+        if (e_mr->umem)
+                ib_umem_release(e_mr->umem);
+
         /* successful deregistration */
         ehca_mr_delete(e_mr);
 
@@ -2043,13 +2050,10 @@ int ehca_mrmw_map_hrc_alloc(const u64 hipz_rc)
         switch (hipz_rc) {
         case H_SUCCESS:              /* successful completion */
                 return 0;
-        case H_ADAPTER_PARM:         /* invalid adapter handle */
-        case H_RT_PARM:              /* invalid resource type */
         case H_NOT_ENOUGH_RESOURCES: /* insufficient resources */
-        case H_MLENGTH_PARM:         /* invalid memory length */
-        case H_MEM_ACCESS_PARM:      /* invalid access controls */
         case H_CONSTRAINED:          /* resource constraint */
-                return -EINVAL;
+        case H_NO_MEM:
+                return -ENOMEM;
         case H_BUSY:                 /* long busy */
                 return -EBUSY;
         default:
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index df0516f24379..b5bc787c77b6 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -523,6 +523,8 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
                 goto create_qp_exit1;
         }
 
+        my_qp->ib_qp.qp_num = my_qp->real_qp_num;
+
         switch (init_attr->qp_type) {
         case IB_QPT_RC:
                 if (isdaqp == 0) {
@@ -568,7 +570,7 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
                         parms.act_nr_recv_wqes = init_attr->cap.max_recv_wr;
                         parms.act_nr_send_sges = init_attr->cap.max_send_sge;
                         parms.act_nr_recv_sges = init_attr->cap.max_recv_sge;
-                        my_qp->real_qp_num =
+                        my_qp->ib_qp.qp_num =
                                 (init_attr->qp_type == IB_QPT_SMI) ? 0 : 1;
                 }
 
@@ -595,7 +597,6 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
         my_qp->ib_qp.recv_cq = init_attr->recv_cq;
         my_qp->ib_qp.send_cq = init_attr->send_cq;
 
-        my_qp->ib_qp.qp_num = my_qp->real_qp_num;
         my_qp->ib_qp.qp_type = init_attr->qp_type;
 
         my_qp->qp_type = init_attr->qp_type;
@@ -968,17 +969,21 @@ static int internal_modify_qp(struct ib_qp *ibqp,
                         ((ehca_mult - 1) / ah_mult) : 0;
                 else
                         mqpcb->max_static_rate = 0;
-
                 update_mask |= EHCA_BMASK_SET(MQPCB_MASK_MAX_STATIC_RATE, 1);
 
                 /*
+                 * Always supply the GRH flag, even if it's zero, to give the
+                 * hypervisor a clear "yes" or "no" instead of a "perhaps"
+                 */
+                update_mask |= EHCA_BMASK_SET(MQPCB_MASK_SEND_GRH_FLAG, 1);
+
+                /*
                  * only if GRH is TRUE we might consider SOURCE_GID_IDX
                  * and DEST_GID otherwise phype will return H_ATTR_PARM!!!
                  */
                 if (attr->ah_attr.ah_flags == IB_AH_GRH) {
-                        mqpcb->send_grh_flag = 1 << 31;
-                        update_mask |=
-                                EHCA_BMASK_SET(MQPCB_MASK_SEND_GRH_FLAG, 1);
+                        mqpcb->send_grh_flag = 1;
+
                         mqpcb->source_gid_idx = attr->ah_attr.grh.sgid_index;
                         update_mask |=
                                 EHCA_BMASK_SET(MQPCB_MASK_SOURCE_GID_IDX, 1);
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c
index b564fcd3b282..7f0beec74f70 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
@@ -154,7 +154,8 @@ static long ehca_plpar_hcall9(unsigned long opcode,
                               unsigned long arg9)
 {
         long ret;
-        int i, sleep_msecs;
+        int i, sleep_msecs, lock_is_set = 0;
+        unsigned long flags;
 
         ehca_gen_dbg("opcode=%lx arg1=%lx arg2=%lx arg3=%lx arg4=%lx "
                      "arg5=%lx arg6=%lx arg7=%lx arg8=%lx arg9=%lx",
@@ -162,10 +163,18 @@ static long ehca_plpar_hcall9(unsigned long opcode,
                      arg8, arg9);
 
         for (i = 0; i < 5; i++) {
+                if ((opcode == H_ALLOC_RESOURCE) && (arg2 == 5)) {
+                        spin_lock_irqsave(&hcall_lock, flags);
+                        lock_is_set = 1;
+                }
+
                 ret = plpar_hcall9(opcode, outs,
                                    arg1, arg2, arg3, arg4, arg5,
                                    arg6, arg7, arg8, arg9);
 
+                if (lock_is_set)
+                        spin_unlock_irqrestore(&hcall_lock, flags);
+
                 if (H_IS_LONG_BUSY(ret)) {
                         sleep_msecs = get_longbusy_msecs(ret);
                         msleep_interruptible(sleep_msecs);
@@ -193,11 +202,11 @@ static long ehca_plpar_hcall9(unsigned long opcode,
                              opcode, ret, outs[0], outs[1], outs[2], outs[3],
                              outs[4], outs[5], outs[6], outs[7], outs[8]);
                 return ret;
-
         }
 
         return H_BUSY;
 }
+
 u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle,
                              struct ehca_pfeq *pfeq,
                              const u32 neq_control,
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 036ed1ef1796..ebd5c7bd2cdb 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -523,7 +523,7 @@ static int ipathfs_fill_super(struct super_block *sb, void *data,
         int ret;
 
         static struct tree_descr files[] = {
-                [1] = {"atomic_stats", &atomic_stats_ops, S_IRUGO},
+                [2] = {"atomic_stats", &atomic_stats_ops, S_IRUGO},
                 {""},
         };
 
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 1b9c30857754..4e2e3dfeb2c8 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -747,7 +747,6 @@ static void ipath_pe_quiet_serdes(struct ipath_devdata *dd)
 
 static int ipath_pe_intconfig(struct ipath_devdata *dd)
 {
-        u64 val;
         u32 chiprev;
 
         /*
@@ -760,9 +759,9 @@ static int ipath_pe_intconfig(struct ipath_devdata *dd)
         if ((chiprev & INFINIPATH_R_CHIPREVMINOR_MASK) > 1) {
                 /* Rev2+ reports extra errors via internal GPIO pins */
                 dd->ipath_flags |= IPATH_GPIO_ERRINTRS;
-                val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_gpio_mask);
-                val |= IPATH_GPIO_ERRINTR_MASK;
-                ipath_write_kreg( dd, dd->ipath_kregs->kr_gpio_mask, val);
+                dd->ipath_gpio_mask |= IPATH_GPIO_ERRINTR_MASK;
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
+                                 dd->ipath_gpio_mask);
         }
         return 0;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index 45d033169c6e..a90d3b5699c4 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -1056,7 +1056,7 @@ irqreturn_t ipath_intr(int irq, void *data)
                         gpiostatus &= ~(1 << IPATH_GPIO_PORT0_BIT);
                         chk0rcv = 1;
                 }
-                if (unlikely(gpiostatus)) {
+                if (gpiostatus) {
                         /*
                          * Some unexpected bits remain. If they could have
                          * caused the interrupt, complain and clear.
@@ -1065,9 +1065,8 @@ irqreturn_t ipath_intr(int irq, void *data)
                          * GPIO interrupts, possibly on a "three strikes"
                          * basis.
                          */
-                        u32 mask;
-                        mask = ipath_read_kreg32(
-                                dd, dd->ipath_kregs->kr_gpio_mask);
+                        const u32 mask = (u32) dd->ipath_gpio_mask;
+
                         if (mask & gpiostatus) {
                                 ipath_dbg("Unexpected GPIO IRQ bits %x\n",
                                   gpiostatus & mask);
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index e900c2593f44..12194f3dd8cc 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -397,6 +397,8 @@ struct ipath_devdata {
         unsigned long ipath_pioavailshadow[8];
         /* shadow of kr_gpio_out, for rmw ops */
         u64 ipath_gpio_out;
+        /* shadow the gpio mask register */
+        u64 ipath_gpio_mask;
         /* kr_revision shadow */
         u64 ipath_revision;
         /*
diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/infiniband/hw/ipath/ipath_mr.c
index 31e70732e369..bdeef8d4f279 100644
--- a/drivers/infiniband/hw/ipath/ipath_mr.c
+++ b/drivers/infiniband/hw/ipath/ipath_mr.c
@@ -31,6 +31,7 @@
  * SOFTWARE.
  */
 
+#include <rdma/ib_umem.h>
 #include <rdma/ib_pack.h>
 #include <rdma/ib_smi.h>
 
@@ -147,6 +148,7 @@ struct ib_mr *ipath_reg_phys_mr(struct ib_pd *pd,
         mr->mr.offset = 0;
         mr->mr.access_flags = acc;
         mr->mr.max_segs = num_phys_buf;
+        mr->umem = NULL;
 
         m = 0;
         n = 0;
@@ -170,46 +172,56 @@ bail:
 /**
  * ipath_reg_user_mr - register a userspace memory region
  * @pd: protection domain for this memory region
- * @region: the user memory region
+ * @start: starting userspace address
+ * @length: length of region to register
+ * @virt_addr: virtual address to use (from HCA's point of view)
  * @mr_access_flags: access flags for this memory region
  * @udata: unused by the InfiniPath driver
  *
  * Returns the memory region on success, otherwise returns an errno.
  */
-struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
-                                int mr_access_flags, struct ib_udata *udata)
+struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                u64 virt_addr, int mr_access_flags,
+                                struct ib_udata *udata)
 {
         struct ipath_mr *mr;
+        struct ib_umem *umem;
         struct ib_umem_chunk *chunk;
         int n, m, i;
         struct ib_mr *ret;
 
-        if (region->length == 0) {
+        if (length == 0) {
                 ret = ERR_PTR(-EINVAL);
                 goto bail;
         }
 
+        umem = ib_umem_get(pd->uobject->context, start, length, mr_access_flags);
+        if (IS_ERR(umem))
+                return (void *) umem;
+
         n = 0;
-        list_for_each_entry(chunk, &region->chunk_list, list)
+        list_for_each_entry(chunk, &umem->chunk_list, list)
                 n += chunk->nents;
 
         mr = alloc_mr(n, &to_idev(pd->device)->lk_table);
         if (!mr) {
                 ret = ERR_PTR(-ENOMEM);
+                ib_umem_release(umem);
                 goto bail;
         }
 
         mr->mr.pd = pd;
-        mr->mr.user_base = region->user_base;
-        mr->mr.iova = region->virt_base;
-        mr->mr.length = region->length;
-        mr->mr.offset = region->offset;
+        mr->mr.user_base = start;
+        mr->mr.iova = virt_addr;
+        mr->mr.length = length;
+        mr->mr.offset = umem->offset;
         mr->mr.access_flags = mr_access_flags;
         mr->mr.max_segs = n;
+        mr->umem = umem;
 
         m = 0;
         n = 0;
-        list_for_each_entry(chunk, &region->chunk_list, list) {
+        list_for_each_entry(chunk, &umem->chunk_list, list) {
                 for (i = 0; i < chunk->nents; i++) {
                         void *vaddr;
 
@@ -219,7 +231,7 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
                                 goto bail;
                         }
                         mr->mr.map[m]->segs[n].vaddr = vaddr;
-                        mr->mr.map[m]->segs[n].length = region->page_size;
+                        mr->mr.map[m]->segs[n].length = umem->page_size;
                         n++;
                         if (n == IPATH_SEGSZ) {
                                 m++;
@@ -253,6 +265,10 @@ int ipath_dereg_mr(struct ib_mr *ibmr)
                 i--;
                 kfree(mr->mr.map[i]);
         }
+
+        if (mr->umem)
+                ib_umem_release(mr->umem);
+
         kfree(mr);
         return 0;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 12933e77c7e9..bb70845279b8 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1387,13 +1387,12 @@ static int enable_timer(struct ipath_devdata *dd)
          * processing.
          */
         if (dd->ipath_flags & IPATH_GPIO_INTR) {
-                u64 val;
                 ipath_write_kreg(dd, dd->ipath_kregs->kr_debugportselect,
                                  0x2074076542310ULL);
                 /* Enable GPIO bit 2 interrupt */
-                val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_gpio_mask);
-                val |= (u64) (1 << IPATH_GPIO_PORT0_BIT);
-                ipath_write_kreg( dd, dd->ipath_kregs->kr_gpio_mask, val);
+                dd->ipath_gpio_mask |= (u64) (1 << IPATH_GPIO_PORT0_BIT);
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
+                                 dd->ipath_gpio_mask);
         }
 
         init_timer(&dd->verbs_timer);
@@ -1412,8 +1411,9 @@ static int disable_timer(struct ipath_devdata *dd)
                 u64 val;
                 /* Disable GPIO bit 2 interrupt */
                 val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_gpio_mask);
-                val &= ~((u64) (1 << IPATH_GPIO_PORT0_BIT));
-                ipath_write_kreg( dd, dd->ipath_kregs->kr_gpio_mask, val);
+                dd->ipath_gpio_mask &= ~((u64) (1 << IPATH_GPIO_PORT0_BIT));
+                ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
+                                 dd->ipath_gpio_mask);
                 /*
                  * We might want to undo changes to debugportselect,
                  * but how?
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index 7064fc222727..088b837ebea8 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -251,6 +251,7 @@ struct ipath_sge {
 /* Memory region */
 struct ipath_mr {
         struct ib_mr ibmr;
+        struct ib_umem *umem;
         struct ipath_mregion mr;        /* must be last */
 };
 
@@ -751,8 +752,8 @@ struct ib_mr *ipath_reg_phys_mr(struct ib_pd *pd,
                                 struct ib_phys_buf *buffer_list,
                                 int num_phys_buf, int acc, u64 *iova_start);
 
-struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
-                                int mr_access_flags,
+struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                u64 virt_addr, int mr_access_flags,
                                 struct ib_udata *udata);
 
 int ipath_dereg_mr(struct ib_mr *ibmr);
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
index 085e28b939ec..dd691cfa5079 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
@@ -165,10 +165,9 @@ static int ipath_mcast_add(struct ipath_ibdev *dev,
 {
         struct rb_node **n = &mcast_tree.rb_node;
         struct rb_node *pn = NULL;
-        unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&mcast_lock, flags);
+        spin_lock_irq(&mcast_lock);
 
         while (*n) {
                 struct ipath_mcast *tmcast;
@@ -228,7 +227,7 @@ static int ipath_mcast_add(struct ipath_ibdev *dev,
         ret = 0;
 
 bail:
-        spin_unlock_irqrestore(&mcast_lock, flags);
+        spin_unlock_irq(&mcast_lock);
 
         return ret;
 }
@@ -289,17 +288,16 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         struct ipath_mcast *mcast = NULL;
         struct ipath_mcast_qp *p, *tmp;
         struct rb_node *n;
-        unsigned long flags;
         int last = 0;
         int ret;
 
-        spin_lock_irqsave(&mcast_lock, flags);
+        spin_lock_irq(&mcast_lock);
 
         /* Find the GID in the mcast table. */
         n = mcast_tree.rb_node;
         while (1) {
                 if (n == NULL) {
-                        spin_unlock_irqrestore(&mcast_lock, flags);
+                        spin_unlock_irq(&mcast_lock);
                         ret = -EINVAL;
                         goto bail;
                 }
@@ -334,7 +332,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 break;
         }
 
-        spin_unlock_irqrestore(&mcast_lock, flags);
+        spin_unlock_irq(&mcast_lock);
 
         if (p) {
                 /*
@@ -348,9 +346,9 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 atomic_dec(&mcast->refcount);
                 wait_event(mcast->wait, !atomic_read(&mcast->refcount));
                 ipath_mcast_free(mcast);
-                spin_lock(&dev->n_mcast_grps_lock);
+                spin_lock_irq(&dev->n_mcast_grps_lock);
                 dev->n_mcast_grps_allocated--;
-                spin_unlock(&dev->n_mcast_grps_lock);
+                spin_unlock_irq(&dev->n_mcast_grps_lock);
         }
 
         ret = 0;
diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
new file mode 100644
index 000000000000..b8912cdb9663
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@ -0,0 +1,9 @@
+config MLX4_INFINIBAND
+        tristate "Mellanox ConnectX HCA support"
+        depends on INFINIBAND
+        select MLX4_CORE
+        ---help---
+          This driver provides low-level InfiniBand support for
+          Mellanox ConnectX PCI Express host channel adapters (HCAs).
+          This is required to use InfiniBand protocols such as
+          IP-over-IB or SRP with these devices.
diff --git a/drivers/infiniband/hw/mlx4/Makefile b/drivers/infiniband/hw/mlx4/Makefile
new file mode 100644
index 000000000000..70f09c7826da
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_MLX4_INFINIBAND)   += mlx4_ib.o
+
+mlx4_ib-y :=    ah.o cq.o doorbell.o mad.o main.o mr.o qp.o srq.o
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c
new file mode 100644
index 000000000000..c75ac9463e20
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/ah.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "mlx4_ib.h"
+
+struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
+{
+        struct mlx4_dev *dev = to_mdev(pd->device)->dev;
+        struct mlx4_ib_ah *ah;
+
+        ah = kmalloc(sizeof *ah, GFP_ATOMIC);
+        if (!ah)
+                return ERR_PTR(-ENOMEM);
+
+        memset(&ah->av, 0, sizeof ah->av);
+
+        ah->av.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));
+        ah->av.g_slid  = ah_attr->src_path_bits;
+        ah->av.dlid    = cpu_to_be16(ah_attr->dlid);
+        if (ah_attr->static_rate) {
+                ah->av.stat_rate = ah_attr->static_rate + MLX4_STAT_RATE_OFFSET;
+                while (ah->av.stat_rate > IB_RATE_2_5_GBPS + MLX4_STAT_RATE_OFFSET &&
+                       !(1 << ah->av.stat_rate & dev->caps.stat_rate_support))
+                        --ah->av.stat_rate;
+        }
+        ah->av.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);
+        if (ah_attr->ah_flags & IB_AH_GRH) {
+                ah->av.g_slid   |= 0x80;
+                ah->av.gid_index = ah_attr->grh.sgid_index;
+                ah->av.hop_limit = ah_attr->grh.hop_limit;
+                ah->av.sl_tclass_flowlabel |=
+                        cpu_to_be32((ah_attr->grh.traffic_class << 20) |
+                                    ah_attr->grh.flow_label);
+                memcpy(ah->av.dgid, ah_attr->grh.dgid.raw, 16);
+        }
+
+        return &ah->ibah;
+}
+
+int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr)
+{
+        struct mlx4_ib_ah *ah = to_mah(ibah);
+
+        memset(ah_attr, 0, sizeof *ah_attr);
+        ah_attr->dlid          = be16_to_cpu(ah->av.dlid);
+        ah_attr->sl            = be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 28;
+        ah_attr->port_num      = be32_to_cpu(ah->av.port_pd) >> 24;
+        if (ah->av.stat_rate)
+                ah_attr->static_rate = ah->av.stat_rate - MLX4_STAT_RATE_OFFSET;
+        ah_attr->src_path_bits = ah->av.g_slid & 0x7F;
+
+        if (mlx4_ib_ah_grh_present(ah)) {
+                ah_attr->ah_flags = IB_AH_GRH;
+
+                ah_attr->grh.traffic_class =
+                        be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 20;
+                ah_attr->grh.flow_label =
+                        be32_to_cpu(ah->av.sl_tclass_flowlabel) & 0xfffff;
+                ah_attr->grh.hop_limit  = ah->av.hop_limit;
+                ah_attr->grh.sgid_index = ah->av.gid_index;
+                memcpy(ah_attr->grh.dgid.raw, ah->av.dgid, 16);
+        }
+
+        return 0;
+}
+
+int mlx4_ib_destroy_ah(struct ib_ah *ah)
+{
+        kfree(to_mah(ah));
+        return 0;
+}
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
new file mode 100644
index 000000000000..b2a290c6703a
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -0,0 +1,525 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/mlx4/cq.h>
+#include <linux/mlx4/qp.h>
+
+#include "mlx4_ib.h"
+#include "user.h"
+
+static void mlx4_ib_cq_comp(struct mlx4_cq *cq)
+{
+        struct ib_cq *ibcq = &to_mibcq(cq)->ibcq;
+        ibcq->comp_handler(ibcq, ibcq->cq_context);
+}
+
+static void mlx4_ib_cq_event(struct mlx4_cq *cq, enum mlx4_event type)
+{
+        struct ib_event event;
+        struct ib_cq *ibcq;
+
+        if (type != MLX4_EVENT_TYPE_CQ_ERROR) {
+                printk(KERN_WARNING "mlx4_ib: Unexpected event type %d "
+                       "on CQ %06x\n", type, cq->cqn);
+                return;
+        }
+
+        ibcq = &to_mibcq(cq)->ibcq;
+        if (ibcq->event_handler) {
+                event.device     = ibcq->device;
+                event.event      = IB_EVENT_CQ_ERR;
+                event.element.cq = ibcq;
+                ibcq->event_handler(&event, ibcq->cq_context);
+        }
+}
+
+static void *get_cqe_from_buf(struct mlx4_ib_cq_buf *buf, int n)
+{
+        int offset = n * sizeof (struct mlx4_cqe);
+
+        if (buf->buf.nbufs == 1)
+                return buf->buf.u.direct.buf + offset;
+        else
+                return buf->buf.u.page_list[offset >> PAGE_SHIFT].buf +
+                        (offset & (PAGE_SIZE - 1));
+}
+
+static void *get_cqe(struct mlx4_ib_cq *cq, int n)
+{
+        return get_cqe_from_buf(&cq->buf, n);
+}
+
+static void *get_sw_cqe(struct mlx4_ib_cq *cq, int n)
+{
+        struct mlx4_cqe *cqe = get_cqe(cq, n & cq->ibcq.cqe);
+
+        return (!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^
+                !!(n & (cq->ibcq.cqe + 1))) ? NULL : cqe;
+}
+
+static struct mlx4_cqe *next_cqe_sw(struct mlx4_ib_cq *cq)
+{
+        return get_sw_cqe(cq, cq->mcq.cons_index);
+}
+
+struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector,
+                                struct ib_ucontext *context,
+                                struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(ibdev);
+        struct mlx4_ib_cq *cq;
+        struct mlx4_uar *uar;
+        int buf_size;
+        int err;
+
+        if (entries < 1 || entries > dev->dev->caps.max_cqes)
+                return ERR_PTR(-EINVAL);
+
+        cq = kmalloc(sizeof *cq, GFP_KERNEL);
+        if (!cq)
+                return ERR_PTR(-ENOMEM);
+
+        entries      = roundup_pow_of_two(entries + 1);
+        cq->ibcq.cqe = entries - 1;
+        buf_size     = entries * sizeof (struct mlx4_cqe);
+        spin_lock_init(&cq->lock);
+
+        if (context) {
+                struct mlx4_ib_create_cq ucmd;
+
+                if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+                        err = -EFAULT;
+                        goto err_cq;
+                }
+
+                cq->umem = ib_umem_get(context, ucmd.buf_addr, buf_size,
+                                       IB_ACCESS_LOCAL_WRITE);
+                if (IS_ERR(cq->umem)) {
+                        err = PTR_ERR(cq->umem);
+                        goto err_cq;
+                }
+
+                err = mlx4_mtt_init(dev->dev, ib_umem_page_count(cq->umem),
+                                    ilog2(cq->umem->page_size), &cq->buf.mtt);
+                if (err)
+                        goto err_buf;
+
+                err = mlx4_ib_umem_write_mtt(dev, &cq->buf.mtt, cq->umem);
+                if (err)
+                        goto err_mtt;
+
+                err = mlx4_ib_db_map_user(to_mucontext(context), ucmd.db_addr,
+                                          &cq->db);
+                if (err)
+                        goto err_mtt;
+
+                uar = &to_mucontext(context)->uar;
+        } else {
+                err = mlx4_ib_db_alloc(dev, &cq->db, 1);
+                if (err)
+                        goto err_cq;
+
+                cq->mcq.set_ci_db  = cq->db.db;
+                cq->mcq.arm_db     = cq->db.db + 1;
+                *cq->mcq.set_ci_db = 0;
+                *cq->mcq.arm_db    = 0;
+
+                if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2, &cq->buf.buf)) {
+                        err = -ENOMEM;
+                        goto err_db;
+                }
+
+                err = mlx4_mtt_init(dev->dev, cq->buf.buf.npages, cq->buf.buf.page_shift,
+                                    &cq->buf.mtt);
+                if (err)
+                        goto err_buf;
+
+                err = mlx4_buf_write_mtt(dev->dev, &cq->buf.mtt, &cq->buf.buf);
+                if (err)
+                        goto err_mtt;
+
+                uar = &dev->priv_uar;
+        }
+
+        err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar,
+                            cq->db.dma, &cq->mcq);
+        if (err)
+                goto err_dbmap;
+
+        cq->mcq.comp  = mlx4_ib_cq_comp;
+        cq->mcq.event = mlx4_ib_cq_event;
+
+        if (context)
+                if (ib_copy_to_udata(udata, &cq->mcq.cqn, sizeof (__u32))) {
+                        err = -EFAULT;
+                        goto err_dbmap;
+                }
+
+        return &cq->ibcq;
+
+err_dbmap:
+        if (context)
+                mlx4_ib_db_unmap_user(to_mucontext(context), &cq->db);
+
+err_mtt:
+        mlx4_mtt_cleanup(dev->dev, &cq->buf.mtt);
+
+err_buf:
+        if (context)
+                ib_umem_release(cq->umem);
+        else
+                mlx4_buf_free(dev->dev, entries * sizeof (struct mlx4_cqe),
+                              &cq->buf.buf);
+
+err_db:
+        if (!context)
+                mlx4_ib_db_free(dev, &cq->db);
+
+err_cq:
+        kfree(cq);
+
+        return ERR_PTR(err);
+}
+
+int mlx4_ib_destroy_cq(struct ib_cq *cq)
+{
+        struct mlx4_ib_dev *dev = to_mdev(cq->device);
+        struct mlx4_ib_cq *mcq = to_mcq(cq);
+
+        mlx4_cq_free(dev->dev, &mcq->mcq);
+        mlx4_mtt_cleanup(dev->dev, &mcq->buf.mtt);
+
+        if (cq->uobject) {
+                mlx4_ib_db_unmap_user(to_mucontext(cq->uobject->context), &mcq->db);
+                ib_umem_release(mcq->umem);
+        } else {
+                mlx4_buf_free(dev->dev, (cq->cqe + 1) * sizeof (struct mlx4_cqe),
+                              &mcq->buf.buf);
+                mlx4_ib_db_free(dev, &mcq->db);
+        }
+
+        kfree(mcq);
+
+        return 0;
+}
+
+static void dump_cqe(void *cqe)
+{
+        __be32 *buf = cqe;
+
+        printk(KERN_DEBUG "CQE contents %08x %08x %08x %08x %08x %08x %08x %08x\n",
+               be32_to_cpu(buf[0]), be32_to_cpu(buf[1]), be32_to_cpu(buf[2]),
+               be32_to_cpu(buf[3]), be32_to_cpu(buf[4]), be32_to_cpu(buf[5]),
+               be32_to_cpu(buf[6]), be32_to_cpu(buf[7]));
+}
+
+static void mlx4_ib_handle_error_cqe(struct mlx4_err_cqe *cqe,
+                                     struct ib_wc *wc)
+{
+        if (cqe->syndrome == MLX4_CQE_SYNDROME_LOCAL_QP_OP_ERR) {
+                printk(KERN_DEBUG "local QP operation err "
+                       "(QPN %06x, WQE index %x, vendor syndrome %02x, "
+                       "opcode = %02x)\n",
+                       be32_to_cpu(cqe->my_qpn), be16_to_cpu(cqe->wqe_index),
+                       cqe->vendor_err_syndrome,
+                       cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK);
+                dump_cqe(cqe);
+        }
+
+        switch (cqe->syndrome) {
+        case MLX4_CQE_SYNDROME_LOCAL_LENGTH_ERR:
+                wc->status = IB_WC_LOC_LEN_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_LOCAL_QP_OP_ERR:
+                wc->status = IB_WC_LOC_QP_OP_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_LOCAL_PROT_ERR:
+                wc->status = IB_WC_LOC_PROT_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_WR_FLUSH_ERR:
+                wc->status = IB_WC_WR_FLUSH_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_MW_BIND_ERR:
+                wc->status = IB_WC_MW_BIND_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_BAD_RESP_ERR:
+                wc->status = IB_WC_BAD_RESP_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_LOCAL_ACCESS_ERR:
+                wc->status = IB_WC_LOC_ACCESS_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_REMOTE_INVAL_REQ_ERR:
+                wc->status = IB_WC_REM_INV_REQ_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_REMOTE_ACCESS_ERR:
+                wc->status = IB_WC_REM_ACCESS_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_REMOTE_OP_ERR:
+                wc->status = IB_WC_REM_OP_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_TRANSPORT_RETRY_EXC_ERR:
+                wc->status = IB_WC_RETRY_EXC_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_RNR_RETRY_EXC_ERR:
+                wc->status = IB_WC_RNR_RETRY_EXC_ERR;
+                break;
+        case MLX4_CQE_SYNDROME_REMOTE_ABORTED_ERR:
+                wc->status = IB_WC_REM_ABORT_ERR;
+                break;
+        default:
+                wc->status = IB_WC_GENERAL_ERR;
+                break;
+        }
+
+        wc->vendor_err = cqe->vendor_err_syndrome;
+}
+
+static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,
+                            struct mlx4_ib_qp **cur_qp,
+                            struct ib_wc *wc)
+{
+        struct mlx4_cqe *cqe;
+        struct mlx4_qp *mqp;
+        struct mlx4_ib_wq *wq;
+        struct mlx4_ib_srq *srq;
+        int is_send;
+        int is_error;
+        u16 wqe_ctr;
+
+        cqe = next_cqe_sw(cq);
+        if (!cqe)
+                return -EAGAIN;
+
+        ++cq->mcq.cons_index;
+
+        /*
+         * Make sure we read CQ entry contents after we've checked the
+         * ownership bit.
+         */
+        rmb();
+
+        is_send  = cqe->owner_sr_opcode & MLX4_CQE_IS_SEND_MASK;
+        is_error = (cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) ==
+                MLX4_CQE_OPCODE_ERROR;
+
+        if (!*cur_qp ||
+            (be32_to_cpu(cqe->my_qpn) & 0xffffff) != (*cur_qp)->mqp.qpn) {
+                /*
+                 * We do not have to take the QP table lock here,
+                 * because CQs will be locked while QPs are removed
+                 * from the table.
+                 */
+                mqp = __mlx4_qp_lookup(to_mdev(cq->ibcq.device)->dev,
+                                       be32_to_cpu(cqe->my_qpn));
+                if (unlikely(!mqp)) {
+                        printk(KERN_WARNING "CQ %06x with entry for unknown QPN %06x\n",
+                               cq->mcq.cqn, be32_to_cpu(cqe->my_qpn) & 0xffffff);
+                        return -EINVAL;
+                }
+
+                *cur_qp = to_mibqp(mqp);
+        }
+
+        wc->qp = &(*cur_qp)->ibqp;
+
+        if (is_send) {
+                wq = &(*cur_qp)->sq;
+                wqe_ctr = be16_to_cpu(cqe->wqe_index);
+                wq->tail += wqe_ctr - (u16) wq->tail;
+                wc->wr_id = wq->wrid[wq->tail & (wq->max - 1)];
+                ++wq->tail;
+        } else if ((*cur_qp)->ibqp.srq) {
+                srq = to_msrq((*cur_qp)->ibqp.srq);
+                wqe_ctr = be16_to_cpu(cqe->wqe_index);
+                wc->wr_id = srq->wrid[wqe_ctr];
+                mlx4_ib_free_srq_wqe(srq, wqe_ctr);
+        } else {
+                wq        = &(*cur_qp)->rq;
+                wc->wr_id = wq->wrid[wq->tail & (wq->max - 1)];
+                ++wq->tail;
+        }
+
+        if (unlikely(is_error)) {
+                mlx4_ib_handle_error_cqe((struct mlx4_err_cqe *) cqe, wc);
+                return 0;
+        }
+
+        wc->status = IB_WC_SUCCESS;
+
+        if (is_send) {
+                wc->wc_flags = 0;
+                switch (cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) {
+                case MLX4_OPCODE_RDMA_WRITE_IMM:
+                        wc->wc_flags |= IB_WC_WITH_IMM;
+                case MLX4_OPCODE_RDMA_WRITE:
+                        wc->opcode    = IB_WC_RDMA_WRITE;
+                        break;
+                case MLX4_OPCODE_SEND_IMM:
+                        wc->wc_flags |= IB_WC_WITH_IMM;
+                case MLX4_OPCODE_SEND:
+                        wc->opcode    = IB_WC_SEND;
+                        break;
+                case MLX4_OPCODE_RDMA_READ:
+                        wc->opcode    = IB_WC_SEND;
+                        wc->byte_len  = be32_to_cpu(cqe->byte_cnt);
+                        break;
+                case MLX4_OPCODE_ATOMIC_CS:
+                        wc->opcode    = IB_WC_COMP_SWAP;
+                        wc->byte_len  = 8;
+                        break;
+                case MLX4_OPCODE_ATOMIC_FA:
+                        wc->opcode    = IB_WC_FETCH_ADD;
+                        wc->byte_len  = 8;
+                        break;
+                case MLX4_OPCODE_BIND_MW:
+                        wc->opcode    = IB_WC_BIND_MW;
+                        break;
+                }
+        } else {
+                wc->byte_len = be32_to_cpu(cqe->byte_cnt);
+
+                switch (cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) {
+                case MLX4_RECV_OPCODE_RDMA_WRITE_IMM:
+                        wc->opcode   = IB_WC_RECV_RDMA_WITH_IMM;
+                        wc->wc_flags = IB_WC_WITH_IMM;
+                        wc->imm_data = cqe->immed_rss_invalid;
+                        break;
+                case MLX4_RECV_OPCODE_SEND:
+                        wc->opcode   = IB_WC_RECV;
+                        wc->wc_flags = 0;
+                        break;
+                case MLX4_RECV_OPCODE_SEND_IMM:
+                        wc->opcode   = IB_WC_RECV;
+                        wc->wc_flags = IB_WC_WITH_IMM;
+                        wc->imm_data = cqe->immed_rss_invalid;
+                        break;
+                }
+
+                wc->slid           = be16_to_cpu(cqe->rlid);
+                wc->sl             = cqe->sl >> 4;
+                wc->src_qp         = be32_to_cpu(cqe->g_mlpath_rqpn) & 0xffffff;
+                wc->dlid_path_bits = (be32_to_cpu(cqe->g_mlpath_rqpn) >> 24) & 0x7f;
+                wc->wc_flags      |= be32_to_cpu(cqe->g_mlpath_rqpn) & 0x80000000 ?
+                        IB_WC_GRH : 0;
+                wc->pkey_index     = be32_to_cpu(cqe->immed_rss_invalid) >> 16;
+        }
+
+        return 0;
+}
+
+int mlx4_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
+{
+        struct mlx4_ib_cq *cq = to_mcq(ibcq);
+        struct mlx4_ib_qp *cur_qp = NULL;
+        unsigned long flags;
+        int npolled;
+        int err = 0;
+
+        spin_lock_irqsave(&cq->lock, flags);
+
+        for (npolled = 0; npolled < num_entries; ++npolled) {
+                err = mlx4_ib_poll_one(cq, &cur_qp, wc + npolled);
+                if (err)
+                        break;
+        }
+
+        if (npolled)
+                mlx4_cq_set_ci(&cq->mcq);
+
+        spin_unlock_irqrestore(&cq->lock, flags);
+
+        if (err == 0 || err == -EAGAIN)
+                return npolled;
+        else
+                return err;
+}
+
+int mlx4_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
+{
+        mlx4_cq_arm(&to_mcq(ibcq)->mcq,
+                    (flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED ?
+                    MLX4_CQ_DB_REQ_NOT_SOL : MLX4_CQ_DB_REQ_NOT,
+                    to_mdev(ibcq->device)->uar_map,
+                    MLX4_GET_DOORBELL_LOCK(&to_mdev(ibcq->device)->uar_lock));
+
+        return 0;
+}
+
+void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq)
+{
+        u32 prod_index;
+        int nfreed = 0;
+        struct mlx4_cqe *cqe;
+
+        /*
+         * First we need to find the current producer index, so we
+         * know where to start cleaning from.  It doesn't matter if HW
+         * adds new entries after this loop -- the QP we're worried
+         * about is already in RESET, so the new entries won't come
+         * from our QP and therefore don't need to be checked.
+         */
+        for (prod_index = cq->mcq.cons_index; get_sw_cqe(cq, prod_index); ++prod_index)
+                if (prod_index == cq->mcq.cons_index + cq->ibcq.cqe)
+                        break;
+
+        /*
+         * Now sweep backwards through the CQ, removing CQ entries
+         * that match our QP by copying older entries on top of them.
+         */
+        while ((int) --prod_index - (int) cq->mcq.cons_index >= 0) {
+                cqe = get_cqe(cq, prod_index & cq->ibcq.cqe);
+                if ((be32_to_cpu(cqe->my_qpn) & 0xffffff) == qpn) {
+                        if (srq && !(cqe->owner_sr_opcode & MLX4_CQE_IS_SEND_MASK))
+                                mlx4_ib_free_srq_wqe(srq, be16_to_cpu(cqe->wqe_index));
+                        ++nfreed;
+                } else if (nfreed)
+                        memcpy(get_cqe(cq, (prod_index + nfreed) & cq->ibcq.cqe),
+                               cqe, sizeof *cqe);
+        }
+
+        if (nfreed) {
+                cq->mcq.cons_index += nfreed;
+                /*
+                 * Make sure update of buffer contents is done before
+                 * updating consumer index.
+                 */
+                wmb();
+                mlx4_cq_set_ci(&cq->mcq);
+        }
+}
+
+void mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq)
+{
+        spin_lock_irq(&cq->lock);
+        __mlx4_ib_cq_clean(cq, qpn, srq);
+        spin_unlock_irq(&cq->lock);
+}
diff --git a/drivers/infiniband/hw/mlx4/doorbell.c b/drivers/infiniband/hw/mlx4/doorbell.c
new file mode 100644
index 000000000000..1c36087aef14
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/doorbell.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/slab.h>
+
+#include "mlx4_ib.h"
+
+struct mlx4_ib_db_pgdir {
+        struct list_head        list;
+        DECLARE_BITMAP(order0, MLX4_IB_DB_PER_PAGE);
+        DECLARE_BITMAP(order1, MLX4_IB_DB_PER_PAGE / 2);
+        unsigned long          *bits[2];
+        __be32                 *db_page;
+        dma_addr_t              db_dma;
+};
+
+static struct mlx4_ib_db_pgdir *mlx4_ib_alloc_db_pgdir(struct mlx4_ib_dev *dev)
+{
+        struct mlx4_ib_db_pgdir *pgdir;
+
+        pgdir = kzalloc(sizeof *pgdir, GFP_KERNEL);
+        if (!pgdir)
+                return NULL;
+
+        bitmap_fill(pgdir->order1, MLX4_IB_DB_PER_PAGE / 2);
+        pgdir->bits[0] = pgdir->order0;
+        pgdir->bits[1] = pgdir->order1;
+        pgdir->db_page = dma_alloc_coherent(dev->ib_dev.dma_device,
+                                            PAGE_SIZE, &pgdir->db_dma,
+                                            GFP_KERNEL);
+        if (!pgdir->db_page) {
+                kfree(pgdir);
+                return NULL;
+        }
+
+        return pgdir;
+}
+
+static int mlx4_ib_alloc_db_from_pgdir(struct mlx4_ib_db_pgdir *pgdir,
+                                       struct mlx4_ib_db *db, int order)
+{
+        int o;
+        int i;
+
+        for (o = order; o <= 1; ++o) {
+                i = find_first_bit(pgdir->bits[o], MLX4_IB_DB_PER_PAGE >> o);
+                if (i < MLX4_IB_DB_PER_PAGE >> o)
+                        goto found;
+        }
+
+        return -ENOMEM;
+
+found:
+        clear_bit(i, pgdir->bits[o]);
+
+        i <<= o;
+
+        if (o > order)
+                set_bit(i ^ 1, pgdir->bits[order]);
+
+        db->u.pgdir = pgdir;
+        db->index   = i;
+        db->db      = pgdir->db_page + db->index;
+        db->dma     = pgdir->db_dma  + db->index * 4;
+        db->order   = order;
+
+        return 0;
+}
+
+int mlx4_ib_db_alloc(struct mlx4_ib_dev *dev, struct mlx4_ib_db *db, int order)
+{
+        struct mlx4_ib_db_pgdir *pgdir;
+        int ret = 0;
+
+        mutex_lock(&dev->pgdir_mutex);
+
+        list_for_each_entry(pgdir, &dev->pgdir_list, list)
+                if (!mlx4_ib_alloc_db_from_pgdir(pgdir, db, order))
+                        goto out;
+
+        pgdir = mlx4_ib_alloc_db_pgdir(dev);
+        if (!pgdir) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        list_add(&pgdir->list, &dev->pgdir_list);
+
+        /* This should never fail -- we just allocated an empty page: */
+        WARN_ON(mlx4_ib_alloc_db_from_pgdir(pgdir, db, order));
+
+out:
+        mutex_unlock(&dev->pgdir_mutex);
+
+        return ret;
+}
+
+void mlx4_ib_db_free(struct mlx4_ib_dev *dev, struct mlx4_ib_db *db)
+{
+        int o;
+        int i;
+
+        mutex_lock(&dev->pgdir_mutex);
+
+        o = db->order;
+        i = db->index;
+
+        if (db->order == 0 && test_bit(i ^ 1, db->u.pgdir->order0)) {
+                clear_bit(i ^ 1, db->u.pgdir->order0);
+                ++o;
+        }
+
+        i >>= o;
+        set_bit(i, db->u.pgdir->bits[o]);
+
+        if (bitmap_full(db->u.pgdir->order1, MLX4_IB_DB_PER_PAGE / 2)) {
+                dma_free_coherent(dev->ib_dev.dma_device, PAGE_SIZE,
+                                  db->u.pgdir->db_page, db->u.pgdir->db_dma);
+                list_del(&db->u.pgdir->list);
+                kfree(db->u.pgdir);
+        }
+
+        mutex_unlock(&dev->pgdir_mutex);
+}
+
+struct mlx4_ib_user_db_page {
+        struct list_head        list;
+        struct ib_umem         *umem;
+        unsigned long           user_virt;
+        int                     refcnt;
+};
+
+int mlx4_ib_db_map_user(struct mlx4_ib_ucontext *context, unsigned long virt,
+                        struct mlx4_ib_db *db)
+{
+        struct mlx4_ib_user_db_page *page;
+        struct ib_umem_chunk *chunk;
+        int err = 0;
+
+        mutex_lock(&context->db_page_mutex);
+
+        list_for_each_entry(page, &context->db_page_list, list)
+                if (page->user_virt == (virt & PAGE_MASK))
+                        goto found;
+
+        page = kmalloc(sizeof *page, GFP_KERNEL);
+        if (!page) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        page->user_virt = (virt & PAGE_MASK);
+        page->refcnt    = 0;
+        page->umem      = ib_umem_get(&context->ibucontext, virt & PAGE_MASK,
+                                      PAGE_SIZE, 0);
+        if (IS_ERR(page->umem)) {
+                err = PTR_ERR(page->umem);
+                kfree(page);
+                goto out;
+        }
+
+        list_add(&page->list, &context->db_page_list);
+
+found:
+        chunk = list_entry(page->umem->chunk_list.next, struct ib_umem_chunk, list);
+        db->dma         = sg_dma_address(chunk->page_list) + (virt & ~PAGE_MASK);
+        db->u.user_page = page;
+        ++page->refcnt;
+
+out:
+        mutex_unlock(&context->db_page_mutex);
+
+        return err;
+}
+
+void mlx4_ib_db_unmap_user(struct mlx4_ib_ucontext *context, struct mlx4_ib_db *db)
+{
+        mutex_lock(&context->db_page_mutex);
+
+        if (!--db->u.user_page->refcnt) {
+                list_del(&db->u.user_page->list);
+                ib_umem_release(db->u.user_page->umem);
+                kfree(db->u.user_page);
+        }
+
+        mutex_unlock(&context->db_page_mutex);
+}
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
new file mode 100644
index 000000000000..333091787c5f
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <rdma/ib_mad.h>
+#include <rdma/ib_smi.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4_ib.h"
+
+enum {
+        MLX4_IB_VENDOR_CLASS1 = 0x9,
+        MLX4_IB_VENDOR_CLASS2 = 0xa
+};
+
+int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
+                 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
+                 void *in_mad, void *response_mad)
+{
+        struct mlx4_cmd_mailbox *inmailbox, *outmailbox;
+        void *inbox;
+        int err;
+        u32 in_modifier = port;
+        u8 op_modifier = 0;
+
+        inmailbox = mlx4_alloc_cmd_mailbox(dev->dev);
+        if (IS_ERR(inmailbox))
+                return PTR_ERR(inmailbox);
+        inbox = inmailbox->buf;
+
+        outmailbox = mlx4_alloc_cmd_mailbox(dev->dev);
+        if (IS_ERR(outmailbox)) {
+                mlx4_free_cmd_mailbox(dev->dev, inmailbox);
+                return PTR_ERR(outmailbox);
+        }
+
+        memcpy(inbox, in_mad, 256);
+
+        /*
+         * Key check traps can't be generated unless we have in_wc to
+         * tell us where to send the trap.
+         */
+        if (ignore_mkey || !in_wc)
+                op_modifier |= 0x1;
+        if (ignore_bkey || !in_wc)
+                op_modifier |= 0x2;
+
+        if (in_wc) {
+                struct {
+                        __be32          my_qpn;
+                        u32             reserved1;
+                        __be32          rqpn;
+                        u8              sl;
+                        u8              g_path;
+                        u16             reserved2[2];
+                        __be16          pkey;
+                        u32             reserved3[11];
+                        u8              grh[40];
+                } *ext_info;
+
+                memset(inbox + 256, 0, 256);
+                ext_info = inbox + 256;
+
+                ext_info->my_qpn = cpu_to_be32(in_wc->qp->qp_num);
+                ext_info->rqpn   = cpu_to_be32(in_wc->src_qp);
+                ext_info->sl     = in_wc->sl << 4;
+                ext_info->g_path = in_wc->dlid_path_bits |
+                        (in_wc->wc_flags & IB_WC_GRH ? 0x80 : 0);
+                ext_info->pkey   = cpu_to_be16(in_wc->pkey_index);
+
+                if (in_grh)
+                        memcpy(ext_info->grh, in_grh, 40);
+
+                op_modifier |= 0x4;
+
+                in_modifier |= in_wc->slid << 16;
+        }
+
+        err = mlx4_cmd_box(dev->dev, inmailbox->dma, outmailbox->dma,
+                           in_modifier, op_modifier,
+                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);
+
+        if (!err);
+                memcpy(response_mad, outmailbox->buf, 256);
+
+        mlx4_free_cmd_mailbox(dev->dev, inmailbox);
+        mlx4_free_cmd_mailbox(dev->dev, outmailbox);
+
+        return err;
+}
+
+static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
+{
+        struct ib_ah *new_ah;
+        struct ib_ah_attr ah_attr;
+
+        if (!dev->send_agent[port_num - 1][0])
+                return;
+
+        memset(&ah_attr, 0, sizeof ah_attr);
+        ah_attr.dlid     = lid;
+        ah_attr.sl       = sl;
+        ah_attr.port_num = port_num;
+
+        new_ah = ib_create_ah(dev->send_agent[port_num - 1][0]->qp->pd,
+                              &ah_attr);
+        if (IS_ERR(new_ah))
+                return;
+
+        spin_lock(&dev->sm_lock);
+        if (dev->sm_ah[port_num - 1])
+                ib_destroy_ah(dev->sm_ah[port_num - 1]);
+        dev->sm_ah[port_num - 1] = new_ah;
+        spin_unlock(&dev->sm_lock);
+}
+
+/*
+ * Snoop SM MADs for port info and P_Key table sets, so we can
+ * synthesize LID change and P_Key change events.
+ */
+static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad)
+{
+        struct ib_event event;
+
+        if ((mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||
+             mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &&
+            mad->mad_hdr.method == IB_MGMT_METHOD_SET) {
+                if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO) {
+                        struct ib_port_info *pinfo =
+                                (struct ib_port_info *) ((struct ib_smp *) mad)->data;
+
+                        update_sm_ah(to_mdev(ibdev), port_num,
+                                     be16_to_cpu(pinfo->sm_lid),
+                                     pinfo->neighbormtu_mastersmsl & 0xf);
+
+                        event.device           = ibdev;
+                        event.element.port_num = port_num;
+
+                        if(pinfo->clientrereg_resv_subnetto & 0x80)
+                                event.event    = IB_EVENT_CLIENT_REREGISTER;
+                        else
+                                event.event    = IB_EVENT_LID_CHANGE;
+
+                        ib_dispatch_event(&event);
+                }
+
+                if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PKEY_TABLE) {
+                        event.device           = ibdev;
+                        event.event            = IB_EVENT_PKEY_CHANGE;
+                        event.element.port_num = port_num;
+                        ib_dispatch_event(&event);
+                }
+        }
+}
+
+static void node_desc_override(struct ib_device *dev,
+                               struct ib_mad *mad)
+{
+        if ((mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||
+             mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &&
+            mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP &&
+            mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) {
+                spin_lock(&to_mdev(dev)->sm_lock);
+                memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64);
+                spin_unlock(&to_mdev(dev)->sm_lock);
+        }
+}
+
+static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *mad)
+{
+        int qpn = mad->mad_hdr.mgmt_class != IB_MGMT_CLASS_SUBN_LID_ROUTED;
+        struct ib_mad_send_buf *send_buf;
+        struct ib_mad_agent *agent = dev->send_agent[port_num - 1][qpn];
+        int ret;
+
+        if (agent) {
+                send_buf = ib_create_send_mad(agent, qpn, 0, 0, IB_MGMT_MAD_HDR,
+                                              IB_MGMT_MAD_DATA, GFP_ATOMIC);
+                /*
+                 * We rely here on the fact that MLX QPs don't use the
+                 * address handle after the send is posted (this is
+                 * wrong following the IB spec strictly, but we know
+                 * it's OK for our devices).
+                 */
+                spin_lock(&dev->sm_lock);
+                memcpy(send_buf->mad, mad, sizeof *mad);
+                if ((send_buf->ah = dev->sm_ah[port_num - 1]))
+                        ret = ib_post_send_mad(send_buf, NULL);
+                else
+                        ret = -EINVAL;
+                spin_unlock(&dev->sm_lock);
+
+                if (ret)
+                        ib_free_send_mad(send_buf);
+        }
+}
+
+int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
+                        struct ib_wc *in_wc, struct ib_grh *in_grh,
+                        struct ib_mad *in_mad, struct ib_mad *out_mad)
+{
+        u16 slid;
+        int err;
+
+        slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);
+
+        if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP && slid == 0) {
+                forward_trap(to_mdev(ibdev), port_num, in_mad);
+                return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED;
+        }
+
+        if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||
+            in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) {
+                if (in_mad->mad_hdr.method   != IB_MGMT_METHOD_GET &&
+                    in_mad->mad_hdr.method   != IB_MGMT_METHOD_SET &&
+                    in_mad->mad_hdr.method   != IB_MGMT_METHOD_TRAP_REPRESS)
+                        return IB_MAD_RESULT_SUCCESS;
+
+                /*
+                 * Don't process SMInfo queries or vendor-specific
+                 * MADs -- the SMA can't handle them.
+                 */
+                if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO ||
+                    ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) ==
+                     IB_SMP_ATTR_VENDOR_MASK))
+                        return IB_MAD_RESULT_SUCCESS;
+        } else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT ||
+                   in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1   ||
+                   in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS2) {
+                if (in_mad->mad_hdr.method  != IB_MGMT_METHOD_GET &&
+                    in_mad->mad_hdr.method  != IB_MGMT_METHOD_SET)
+                        return IB_MAD_RESULT_SUCCESS;
+        } else
+                return IB_MAD_RESULT_SUCCESS;
+
+        err = mlx4_MAD_IFC(to_mdev(ibdev),
+                           mad_flags & IB_MAD_IGNORE_MKEY,
+                           mad_flags & IB_MAD_IGNORE_BKEY,
+                           port_num, in_wc, in_grh, in_mad, out_mad);
+        if (err)
+                return IB_MAD_RESULT_FAILURE;
+
+        if (!out_mad->mad_hdr.status) {
+                smp_snoop(ibdev, port_num, in_mad);
+                node_desc_override(ibdev, out_mad);
+        }
+
+        /* set return bit in status of directed route responses */
+        if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
+                out_mad->mad_hdr.status |= cpu_to_be16(1 << 15);
+
+        if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP_REPRESS)
+                /* no response for trap repress */
+                return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED;
+
+        return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY;
+}
+
+static void send_handler(struct ib_mad_agent *agent,
+                         struct ib_mad_send_wc *mad_send_wc)
+{
+        ib_free_send_mad(mad_send_wc->send_buf);
+}
+
+int mlx4_ib_mad_init(struct mlx4_ib_dev *dev)
+{
+        struct ib_mad_agent *agent;
+        int p, q;
+        int ret;
+
+        for (p = 0; p < dev->dev->caps.num_ports; ++p)
+                for (q = 0; q <= 1; ++q) {
+                        agent = ib_register_mad_agent(&dev->ib_dev, p + 1,
+                                                      q ? IB_QPT_GSI : IB_QPT_SMI,
+                                                      NULL, 0, send_handler,
+                                                      NULL, NULL);
+                        if (IS_ERR(agent)) {
+                                ret = PTR_ERR(agent);
+                                goto err;
+                        }
+                        dev->send_agent[p][q] = agent;
+                }
+
+        return 0;
+
+err:
+        for (p = 0; p < dev->dev->caps.num_ports; ++p)
+                for (q = 0; q <= 1; ++q)
+                        if (dev->send_agent[p][q])
+                                ib_unregister_mad_agent(dev->send_agent[p][q]);
+
+        return ret;
+}
+
+void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev)
+{
+        struct ib_mad_agent *agent;
+        int p, q;
+
+        for (p = 0; p < dev->dev->caps.num_ports; ++p) {
+                for (q = 0; q <= 1; ++q) {
+                        agent = dev->send_agent[p][q];
+                        dev->send_agent[p][q] = NULL;
+                        ib_unregister_mad_agent(agent);
+                }
+
+                if (dev->sm_ah[p])
+                        ib_destroy_ah(dev->sm_ah[p]);
+        }
+}
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
new file mode 100644
index 000000000000..402f3a20ec0a
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -0,0 +1,652 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+
+#include <rdma/ib_smi.h>
+#include <rdma/ib_user_verbs.h>
+
+#include <linux/mlx4/driver.h>
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4_ib.h"
+#include "user.h"
+
+#define DRV_NAME        "mlx4_ib"
+#define DRV_VERSION     "0.01"
+#define DRV_RELDATE     "May 1, 2006"
+
+MODULE_AUTHOR("Roland Dreier");
+MODULE_DESCRIPTION("Mellanox ConnectX HCA InfiniBand driver");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(DRV_VERSION);
+
+static const char mlx4_ib_version[] __devinitdata =
+        DRV_NAME ": Mellanox ConnectX InfiniBand driver v"
+        DRV_VERSION " (" DRV_RELDATE ")\n";
+
+static void init_query_mad(struct ib_smp *mad)
+{
+        mad->base_version  = 1;
+        mad->mgmt_class    = IB_MGMT_CLASS_SUBN_LID_ROUTED;
+        mad->class_version = 1;
+        mad->method        = IB_MGMT_METHOD_GET;
+}
+
+static int mlx4_ib_query_device(struct ib_device *ibdev,
+                                struct ib_device_attr *props)
+{
+        struct mlx4_ib_dev *dev = to_mdev(ibdev);
+        struct ib_smp *in_mad  = NULL;
+        struct ib_smp *out_mad = NULL;
+        int err = -ENOMEM;
+
+        in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
+        out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+        if (!in_mad || !out_mad)
+                goto out;
+
+        init_query_mad(in_mad);
+        in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;
+
+        err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, 1, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        memset(props, 0, sizeof *props);
+
+        props->fw_ver = dev->dev->caps.fw_ver;
+        props->device_cap_flags    = IB_DEVICE_CHANGE_PHY_PORT |
+                IB_DEVICE_PORT_ACTIVE_EVENT             |
+                IB_DEVICE_SYS_IMAGE_GUID                |
+                IB_DEVICE_RC_RNR_NAK_GEN;
+        if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR)
+                props->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;
+        if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR)
+                props->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;
+        if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_APM)
+                props->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;
+        if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_UD_AV_PORT)
+                props->device_cap_flags |= IB_DEVICE_UD_AV_PORT_ENFORCE;
+
+        props->vendor_id           = be32_to_cpup((__be32 *) (out_mad->data + 36)) &
+                0xffffff;
+        props->vendor_part_id      = be16_to_cpup((__be16 *) (out_mad->data + 30));
+        props->hw_ver              = be32_to_cpup((__be32 *) (out_mad->data + 32));
+        memcpy(&props->sys_image_guid, out_mad->data +  4, 8);
+
+        props->max_mr_size         = ~0ull;
+        props->page_size_cap       = dev->dev->caps.page_size_cap;
+        props->max_qp              = dev->dev->caps.num_qps - dev->dev->caps.reserved_qps;
+        props->max_qp_wr           = dev->dev->caps.max_wqes;
+        props->max_sge             = min(dev->dev->caps.max_sq_sg,
+                                         dev->dev->caps.max_rq_sg);
+        props->max_cq              = dev->dev->caps.num_cqs - dev->dev->caps.reserved_cqs;
+        props->max_cqe             = dev->dev->caps.max_cqes;
+        props->max_mr              = dev->dev->caps.num_mpts - dev->dev->caps.reserved_mrws;
+        props->max_pd              = dev->dev->caps.num_pds - dev->dev->caps.reserved_pds;
+        props->max_qp_rd_atom      = dev->dev->caps.max_qp_dest_rdma;
+        props->max_qp_init_rd_atom = dev->dev->caps.max_qp_init_rdma;
+        props->max_res_rd_atom     = props->max_qp_rd_atom * props->max_qp;
+        props->max_srq             = dev->dev->caps.num_srqs - dev->dev->caps.reserved_srqs;
+        props->max_srq_wr          = dev->dev->caps.max_srq_wqes;
+        props->max_srq_sge         = dev->dev->caps.max_srq_sge;
+        props->local_ca_ack_delay  = dev->dev->caps.local_ca_ack_delay;
+        props->atomic_cap          = dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_ATOMIC ?
+                IB_ATOMIC_HCA : IB_ATOMIC_NONE;
+        props->max_pkeys           = dev->dev->caps.pkey_table_len;
+        props->max_mcast_grp       = dev->dev->caps.num_mgms + dev->dev->caps.num_amgms;
+        props->max_mcast_qp_attach = dev->dev->caps.num_qp_per_mgm;
+        props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
+                                           props->max_mcast_grp;
+        props->max_map_per_fmr = (1 << (32 - ilog2(dev->dev->caps.num_mpts))) - 1;
+
+out:
+        kfree(in_mad);
+        kfree(out_mad);
+
+        return err;
+}
+
+static int mlx4_ib_query_port(struct ib_device *ibdev, u8 port,
+                              struct ib_port_attr *props)
+{
+        struct ib_smp *in_mad  = NULL;
+        struct ib_smp *out_mad = NULL;
+        int err = -ENOMEM;
+
+        in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
+        out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+        if (!in_mad || !out_mad)
+                goto out;
+
+        memset(props, 0, sizeof *props);
+
+        init_query_mad(in_mad);
+        in_mad->attr_id  = IB_SMP_ATTR_PORT_INFO;
+        in_mad->attr_mod = cpu_to_be32(port);
+
+        err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        props->lid              = be16_to_cpup((__be16 *) (out_mad->data + 16));
+        props->lmc              = out_mad->data[34] & 0x7;
+        props->sm_lid           = be16_to_cpup((__be16 *) (out_mad->data + 18));
+        props->sm_sl            = out_mad->data[36] & 0xf;
+        props->state            = out_mad->data[32] & 0xf;
+        props->phys_state       = out_mad->data[33] >> 4;
+        props->port_cap_flags   = be32_to_cpup((__be32 *) (out_mad->data + 20));
+        props->gid_tbl_len      = to_mdev(ibdev)->dev->caps.gid_table_len;
+        props->max_msg_sz       = 0x80000000;
+        props->pkey_tbl_len     = to_mdev(ibdev)->dev->caps.pkey_table_len;
+        props->bad_pkey_cntr    = be16_to_cpup((__be16 *) (out_mad->data + 46));
+        props->qkey_viol_cntr   = be16_to_cpup((__be16 *) (out_mad->data + 48));
+        props->active_width     = out_mad->data[31] & 0xf;
+        props->active_speed     = out_mad->data[35] >> 4;
+        props->max_mtu          = out_mad->data[41] & 0xf;
+        props->active_mtu       = out_mad->data[36] >> 4;
+        props->subnet_timeout   = out_mad->data[51] & 0x1f;
+        props->max_vl_num       = out_mad->data[37] >> 4;
+        props->init_type_reply  = out_mad->data[41] >> 4;
+
+out:
+        kfree(in_mad);
+        kfree(out_mad);
+
+        return err;
+}
+
+static int mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
+                             union ib_gid *gid)
+{
+        struct ib_smp *in_mad  = NULL;
+        struct ib_smp *out_mad = NULL;
+        int err = -ENOMEM;
+
+        in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
+        out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+        if (!in_mad || !out_mad)
+                goto out;
+
+        init_query_mad(in_mad);
+        in_mad->attr_id  = IB_SMP_ATTR_PORT_INFO;
+        in_mad->attr_mod = cpu_to_be32(port);
+
+        err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        memcpy(gid->raw, out_mad->data + 8, 8);
+
+        init_query_mad(in_mad);
+        in_mad->attr_id  = IB_SMP_ATTR_GUID_INFO;
+        in_mad->attr_mod = cpu_to_be32(index / 8);
+
+        err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        memcpy(gid->raw + 8, out_mad->data + (index % 8) * 8, 8);
+
+out:
+        kfree(in_mad);
+        kfree(out_mad);
+        return err;
+}
+
+static int mlx4_ib_query_pkey(struct ib_device *ibdev, u8 port, u16 index,
+                              u16 *pkey)
+{
+        struct ib_smp *in_mad  = NULL;
+        struct ib_smp *out_mad = NULL;
+        int err = -ENOMEM;
+
+        in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
+        out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+        if (!in_mad || !out_mad)
+                goto out;
+
+        init_query_mad(in_mad);
+        in_mad->attr_id  = IB_SMP_ATTR_PKEY_TABLE;
+        in_mad->attr_mod = cpu_to_be32(index / 32);
+
+        err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        *pkey = be16_to_cpu(((__be16 *) out_mad->data)[index % 32]);
+
+out:
+        kfree(in_mad);
+        kfree(out_mad);
+        return err;
+}
+
+static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask,
+                                 struct ib_device_modify *props)
+{
+        if (mask & ~IB_DEVICE_MODIFY_NODE_DESC)
+                return -EOPNOTSUPP;
+
+        if (mask & IB_DEVICE_MODIFY_NODE_DESC) {
+                spin_lock(&to_mdev(ibdev)->sm_lock);
+                memcpy(ibdev->node_desc, props->node_desc, 64);
+                spin_unlock(&to_mdev(ibdev)->sm_lock);
+        }
+
+        return 0;
+}
+
+static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols,
+                         u32 cap_mask)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        int err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev->dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+
+        memset(mailbox->buf, 0, 256);
+        *(u8 *) mailbox->buf         = !!reset_qkey_viols << 6;
+        ((__be32 *) mailbox->buf)[2] = cpu_to_be32(cap_mask);
+
+        err = mlx4_cmd(dev->dev, mailbox->dma, port, 0, MLX4_CMD_SET_PORT,
+                       MLX4_CMD_TIME_CLASS_B);
+
+        mlx4_free_cmd_mailbox(dev->dev, mailbox);
+        return err;
+}
+
+static int mlx4_ib_modify_port(struct ib_device *ibdev, u8 port, int mask,
+                               struct ib_port_modify *props)
+{
+        struct ib_port_attr attr;
+        u32 cap_mask;
+        int err;
+
+        mutex_lock(&to_mdev(ibdev)->cap_mask_mutex);
+
+        err = mlx4_ib_query_port(ibdev, port, &attr);
+        if (err)
+                goto out;
+
+        cap_mask = (attr.port_cap_flags | props->set_port_cap_mask) &
+                ~props->clr_port_cap_mask;
+
+        err = mlx4_SET_PORT(to_mdev(ibdev), port,
+                            !!(mask & IB_PORT_RESET_QKEY_CNTR),
+                            cap_mask);
+
+out:
+        mutex_unlock(&to_mdev(ibdev)->cap_mask_mutex);
+        return err;
+}
+
+static struct ib_ucontext *mlx4_ib_alloc_ucontext(struct ib_device *ibdev,
+                                                  struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(ibdev);
+        struct mlx4_ib_ucontext *context;
+        struct mlx4_ib_alloc_ucontext_resp resp;
+        int err;
+
+        resp.qp_tab_size      = dev->dev->caps.num_qps;
+        resp.bf_reg_size      = dev->dev->caps.bf_reg_size;
+        resp.bf_regs_per_page = dev->dev->caps.bf_regs_per_page;
+
+        context = kmalloc(sizeof *context, GFP_KERNEL);
+        if (!context)
+                return ERR_PTR(-ENOMEM);
+
+        err = mlx4_uar_alloc(to_mdev(ibdev)->dev, &context->uar);
+        if (err) {
+                kfree(context);
+                return ERR_PTR(err);
+        }
+
+        INIT_LIST_HEAD(&context->db_page_list);
+        mutex_init(&context->db_page_mutex);
+
+        err = ib_copy_to_udata(udata, &resp, sizeof resp);
+        if (err) {
+                mlx4_uar_free(to_mdev(ibdev)->dev, &context->uar);
+                kfree(context);
+                return ERR_PTR(-EFAULT);
+        }
+
+        return &context->ibucontext;
+}
+
+static int mlx4_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)
+{
+        struct mlx4_ib_ucontext *context = to_mucontext(ibcontext);
+
+        mlx4_uar_free(to_mdev(ibcontext->device)->dev, &context->uar);
+        kfree(context);
+
+        return 0;
+}
+
+static int mlx4_ib_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
+{
+        struct mlx4_ib_dev *dev = to_mdev(context->device);
+
+        if (vma->vm_end - vma->vm_start != PAGE_SIZE)
+                return -EINVAL;
+
+        if (vma->vm_pgoff == 0) {
+                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+                if (io_remap_pfn_range(vma, vma->vm_start,
+                                       to_mucontext(context)->uar.pfn,
+                                       PAGE_SIZE, vma->vm_page_prot))
+                        return -EAGAIN;
+        } else if (vma->vm_pgoff == 1 && dev->dev->caps.bf_reg_size != 0) {
+                /* FIXME want pgprot_writecombine() for BlueFlame pages */
+                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+                if (io_remap_pfn_range(vma, vma->vm_start,
+                                       to_mucontext(context)->uar.pfn +
+                                       dev->dev->caps.num_uars,
+                                       PAGE_SIZE, vma->vm_page_prot))
+                        return -EAGAIN;
+        } else
+                return -EINVAL;
+
+        return 0;
+}
+
+static struct ib_pd *mlx4_ib_alloc_pd(struct ib_device *ibdev,
+                                      struct ib_ucontext *context,
+                                      struct ib_udata *udata)
+{
+        struct mlx4_ib_pd *pd;
+        int err;
+
+        pd = kmalloc(sizeof *pd, GFP_KERNEL);
+        if (!pd)
+                return ERR_PTR(-ENOMEM);
+
+        err = mlx4_pd_alloc(to_mdev(ibdev)->dev, &pd->pdn);
+        if (err) {
+                kfree(pd);
+                return ERR_PTR(err);
+        }
+
+        if (context)
+                if (ib_copy_to_udata(udata, &pd->pdn, sizeof (__u32))) {
+                        mlx4_pd_free(to_mdev(ibdev)->dev, pd->pdn);
+                        kfree(pd);
+                        return ERR_PTR(-EFAULT);
+                }
+
+        return &pd->ibpd;
+}
+
+static int mlx4_ib_dealloc_pd(struct ib_pd *pd)
+{
+        mlx4_pd_free(to_mdev(pd->device)->dev, to_mpd(pd)->pdn);
+        kfree(pd);
+
+        return 0;
+}
+
+static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
+{
+        return mlx4_multicast_attach(to_mdev(ibqp->device)->dev,
+                                     &to_mqp(ibqp)->mqp, gid->raw);
+}
+
+static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
+{
+        return mlx4_multicast_detach(to_mdev(ibqp->device)->dev,
+                                     &to_mqp(ibqp)->mqp, gid->raw);
+}
+
+static int init_node_data(struct mlx4_ib_dev *dev)
+{
+        struct ib_smp *in_mad  = NULL;
+        struct ib_smp *out_mad = NULL;
+        int err = -ENOMEM;
+
+        in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
+        out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+        if (!in_mad || !out_mad)
+                goto out;
+
+        init_query_mad(in_mad);
+        in_mad->attr_id = IB_SMP_ATTR_NODE_DESC;
+
+        err = mlx4_MAD_IFC(dev, 1, 1, 1, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        memcpy(dev->ib_dev.node_desc, out_mad->data, 64);
+
+        in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;
+
+        err = mlx4_MAD_IFC(dev, 1, 1, 1, NULL, NULL, in_mad, out_mad);
+        if (err)
+                goto out;
+
+        memcpy(&dev->ib_dev.node_guid, out_mad->data + 12, 8);
+
+out:
+        kfree(in_mad);
+        kfree(out_mad);
+        return err;
+}
+
+static void *mlx4_ib_add(struct mlx4_dev *dev)
+{
+        struct mlx4_ib_dev *ibdev;
+
+        ibdev = (struct mlx4_ib_dev *) ib_alloc_device(sizeof *ibdev);
+        if (!ibdev) {
+                dev_err(&dev->pdev->dev, "Device struct alloc failed\n");
+                return NULL;
+        }
+
+        if (mlx4_pd_alloc(dev, &ibdev->priv_pdn))
+                goto err_dealloc;
+
+        if (mlx4_uar_alloc(dev, &ibdev->priv_uar))
+                goto err_pd;
+
+        ibdev->uar_map = ioremap(ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        if (!ibdev->uar_map)
+                goto err_uar;
+        MLX4_INIT_DOORBELL_LOCK(&ibdev->uar_lock);
+
+        INIT_LIST_HEAD(&ibdev->pgdir_list);
+        mutex_init(&ibdev->pgdir_mutex);
+
+        ibdev->dev = dev;
+
+        strlcpy(ibdev->ib_dev.name, "mlx4_%d", IB_DEVICE_NAME_MAX);
+        ibdev->ib_dev.owner             = THIS_MODULE;
+        ibdev->ib_dev.node_type         = RDMA_NODE_IB_CA;
+        ibdev->ib_dev.phys_port_cnt     = dev->caps.num_ports;
+        ibdev->ib_dev.num_comp_vectors  = 1;
+        ibdev->ib_dev.dma_device        = &dev->pdev->dev;
+
+        ibdev->ib_dev.uverbs_abi_ver    = MLX4_IB_UVERBS_ABI_VERSION;
+        ibdev->ib_dev.uverbs_cmd_mask   =
+                (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
+                (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
+                (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
+                (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
+                (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
+                (1ull << IB_USER_VERBS_CMD_REG_MR)              |
+                (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
+                (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
+                (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
+                (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
+                (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
+                (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
+                (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
+                (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)        |
+                (1ull << IB_USER_VERBS_CMD_DETACH_MCAST)        |
+                (1ull << IB_USER_VERBS_CMD_CREATE_SRQ)          |
+                (1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)          |
+                (1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);
+
+        ibdev->ib_dev.query_device      = mlx4_ib_query_device;
+        ibdev->ib_dev.query_port        = mlx4_ib_query_port;
+        ibdev->ib_dev.query_gid         = mlx4_ib_query_gid;
+        ibdev->ib_dev.query_pkey        = mlx4_ib_query_pkey;
+        ibdev->ib_dev.modify_device     = mlx4_ib_modify_device;
+        ibdev->ib_dev.modify_port       = mlx4_ib_modify_port;
+        ibdev->ib_dev.alloc_ucontext    = mlx4_ib_alloc_ucontext;
+        ibdev->ib_dev.dealloc_ucontext  = mlx4_ib_dealloc_ucontext;
+        ibdev->ib_dev.mmap              = mlx4_ib_mmap;
+        ibdev->ib_dev.alloc_pd          = mlx4_ib_alloc_pd;
+        ibdev->ib_dev.dealloc_pd        = mlx4_ib_dealloc_pd;
+        ibdev->ib_dev.create_ah         = mlx4_ib_create_ah;
+        ibdev->ib_dev.query_ah          = mlx4_ib_query_ah;
+        ibdev->ib_dev.destroy_ah        = mlx4_ib_destroy_ah;
+        ibdev->ib_dev.create_srq        = mlx4_ib_create_srq;
+        ibdev->ib_dev.modify_srq        = mlx4_ib_modify_srq;
+        ibdev->ib_dev.destroy_srq       = mlx4_ib_destroy_srq;
+        ibdev->ib_dev.post_srq_recv     = mlx4_ib_post_srq_recv;
+        ibdev->ib_dev.create_qp         = mlx4_ib_create_qp;
+        ibdev->ib_dev.modify_qp         = mlx4_ib_modify_qp;
+        ibdev->ib_dev.destroy_qp        = mlx4_ib_destroy_qp;
+        ibdev->ib_dev.post_send         = mlx4_ib_post_send;
+        ibdev->ib_dev.post_recv         = mlx4_ib_post_recv;
+        ibdev->ib_dev.create_cq         = mlx4_ib_create_cq;
+        ibdev->ib_dev.destroy_cq        = mlx4_ib_destroy_cq;
+        ibdev->ib_dev.poll_cq           = mlx4_ib_poll_cq;
+        ibdev->ib_dev.req_notify_cq     = mlx4_ib_arm_cq;
+        ibdev->ib_dev.get_dma_mr        = mlx4_ib_get_dma_mr;
+        ibdev->ib_dev.reg_user_mr       = mlx4_ib_reg_user_mr;
+        ibdev->ib_dev.dereg_mr          = mlx4_ib_dereg_mr;
+        ibdev->ib_dev.attach_mcast      = mlx4_ib_mcg_attach;
+        ibdev->ib_dev.detach_mcast      = mlx4_ib_mcg_detach;
+        ibdev->ib_dev.process_mad       = mlx4_ib_process_mad;
+
+        if (init_node_data(ibdev))
+                goto err_map;
+
+        spin_lock_init(&ibdev->sm_lock);
+        mutex_init(&ibdev->cap_mask_mutex);
+
+        if (ib_register_device(&ibdev->ib_dev))
+                goto err_map;
+
+        if (mlx4_ib_mad_init(ibdev))
+                goto err_reg;
+
+        return ibdev;
+
+err_reg:
+        ib_unregister_device(&ibdev->ib_dev);
+
+err_map:
+        iounmap(ibdev->uar_map);
+
+err_uar:
+        mlx4_uar_free(dev, &ibdev->priv_uar);
+
+err_pd:
+        mlx4_pd_free(dev, ibdev->priv_pdn);
+
+err_dealloc:
+        ib_dealloc_device(&ibdev->ib_dev);
+
+        return NULL;
+}
+
+static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
+{
+        struct mlx4_ib_dev *ibdev = ibdev_ptr;
+        int p;
+
+        for (p = 1; p <= dev->caps.num_ports; ++p)
+                mlx4_CLOSE_PORT(dev, p);
+
+        mlx4_ib_mad_cleanup(ibdev);
+        ib_unregister_device(&ibdev->ib_dev);
+        iounmap(ibdev->uar_map);
+        mlx4_uar_free(dev, &ibdev->priv_uar);
+        mlx4_pd_free(dev, ibdev->priv_pdn);
+        ib_dealloc_device(&ibdev->ib_dev);
+}
+
+static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,
+                          enum mlx4_dev_event event, int subtype,
+                          int port)
+{
+        struct ib_event ibev;
+
+        switch (event) {
+        case MLX4_EVENT_TYPE_PORT_CHANGE:
+                ibev.event = subtype == MLX4_PORT_CHANGE_SUBTYPE_ACTIVE ?
+                        IB_EVENT_PORT_ACTIVE : IB_EVENT_PORT_ERR;
+                break;
+
+        case MLX4_EVENT_TYPE_LOCAL_CATAS_ERROR:
+                ibev.event = IB_EVENT_DEVICE_FATAL;
+                break;
+
+        default:
+                return;
+        }
+
+        ibev.device           = ibdev_ptr;
+        ibev.element.port_num = port;
+
+        ib_dispatch_event(&ibev);
+}
+
+static struct mlx4_interface mlx4_ib_interface = {
+        .add    = mlx4_ib_add,
+        .remove = mlx4_ib_remove,
+        .event  = mlx4_ib_event
+};
+
+static int __init mlx4_ib_init(void)
+{
+        return mlx4_register_interface(&mlx4_ib_interface);
+}
+
+static void __exit mlx4_ib_cleanup(void)
+{
+        mlx4_unregister_interface(&mlx4_ib_interface);
+}
+
+module_init(mlx4_ib_init);
+module_exit(mlx4_ib_cleanup);
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
new file mode 100644
index 000000000000..93dac71f3230
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX4_IB_H
+#define MLX4_IB_H
+
+#include <linux/compiler.h>
+#include <linux/list.h>
+
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_umem.h>
+
+#include <linux/mlx4/device.h>
+#include <linux/mlx4/doorbell.h>
+
+enum {
+        MLX4_IB_DB_PER_PAGE     = PAGE_SIZE / 4
+};
+
+struct mlx4_ib_db_pgdir;
+struct mlx4_ib_user_db_page;
+
+struct mlx4_ib_db {
+        __be32                 *db;
+        union {
+                struct mlx4_ib_db_pgdir        *pgdir;
+                struct mlx4_ib_user_db_page    *user_page;
+        }                       u;
+        dma_addr_t              dma;
+        int                     index;
+        int                     order;
+};
+
+struct mlx4_ib_ucontext {
+        struct ib_ucontext      ibucontext;
+        struct mlx4_uar         uar;
+        struct list_head        db_page_list;
+        struct mutex            db_page_mutex;
+};
+
+struct mlx4_ib_pd {
+        struct ib_pd            ibpd;
+        u32                     pdn;
+};
+
+struct mlx4_ib_cq_buf {
+        struct mlx4_buf         buf;
+        struct mlx4_mtt         mtt;
+};
+
+struct mlx4_ib_cq {
+        struct ib_cq            ibcq;
+        struct mlx4_cq          mcq;
+        struct mlx4_ib_cq_buf   buf;
+        struct mlx4_ib_db       db;
+        spinlock_t              lock;
+        struct ib_umem         *umem;
+};
+
+struct mlx4_ib_mr {
+        struct ib_mr            ibmr;
+        struct mlx4_mr          mmr;
+        struct ib_umem         *umem;
+};
+
+struct mlx4_ib_wq {
+        u64                    *wrid;
+        spinlock_t              lock;
+        int                     max;
+        int                     max_gs;
+        int                     offset;
+        int                     wqe_shift;
+        unsigned                head;
+        unsigned                tail;
+};
+
+struct mlx4_ib_qp {
+        struct ib_qp            ibqp;
+        struct mlx4_qp          mqp;
+        struct mlx4_buf         buf;
+
+        struct mlx4_ib_db       db;
+        struct mlx4_ib_wq       rq;
+
+        u32                     doorbell_qpn;
+        __be32                  sq_signal_bits;
+        struct mlx4_ib_wq       sq;
+
+        struct ib_umem         *umem;
+        struct mlx4_mtt         mtt;
+        int                     buf_size;
+        struct mutex            mutex;
+        u8                      port;
+        u8                      alt_port;
+        u8                      atomic_rd_en;
+        u8                      resp_depth;
+        u8                      state;
+};
+
+struct mlx4_ib_srq {
+        struct ib_srq           ibsrq;
+        struct mlx4_srq         msrq;
+        struct mlx4_buf         buf;
+        struct mlx4_ib_db       db;
+        u64                    *wrid;
+        spinlock_t              lock;
+        int                     head;
+        int                     tail;
+        u16                     wqe_ctr;
+        struct ib_umem         *umem;
+        struct mlx4_mtt         mtt;
+        struct mutex            mutex;
+};
+
+struct mlx4_ib_ah {
+        struct ib_ah            ibah;
+        struct mlx4_av          av;
+};
+
+struct mlx4_ib_dev {
+        struct ib_device        ib_dev;
+        struct mlx4_dev        *dev;
+        void __iomem           *uar_map;
+
+        struct list_head        pgdir_list;
+        struct mutex            pgdir_mutex;
+
+        struct mlx4_uar         priv_uar;
+        u32                     priv_pdn;
+        MLX4_DECLARE_DOORBELL_LOCK(uar_lock);
+
+        struct ib_mad_agent    *send_agent[MLX4_MAX_PORTS][2];
+        struct ib_ah           *sm_ah[MLX4_MAX_PORTS];
+        spinlock_t              sm_lock;
+
+        struct mutex            cap_mask_mutex;
+};
+
+static inline struct mlx4_ib_dev *to_mdev(struct ib_device *ibdev)
+{
+        return container_of(ibdev, struct mlx4_ib_dev, ib_dev);
+}
+
+static inline struct mlx4_ib_ucontext *to_mucontext(struct ib_ucontext *ibucontext)
+{
+        return container_of(ibucontext, struct mlx4_ib_ucontext, ibucontext);
+}
+
+static inline struct mlx4_ib_pd *to_mpd(struct ib_pd *ibpd)
+{
+        return container_of(ibpd, struct mlx4_ib_pd, ibpd);
+}
+
+static inline struct mlx4_ib_cq *to_mcq(struct ib_cq *ibcq)
+{
+        return container_of(ibcq, struct mlx4_ib_cq, ibcq);
+}
+
+static inline struct mlx4_ib_cq *to_mibcq(struct mlx4_cq *mcq)
+{
+        return container_of(mcq, struct mlx4_ib_cq, mcq);
+}
+
+static inline struct mlx4_ib_mr *to_mmr(struct ib_mr *ibmr)
+{
+        return container_of(ibmr, struct mlx4_ib_mr, ibmr);
+}
+
+static inline struct mlx4_ib_qp *to_mqp(struct ib_qp *ibqp)
+{
+        return container_of(ibqp, struct mlx4_ib_qp, ibqp);
+}
+
+static inline struct mlx4_ib_qp *to_mibqp(struct mlx4_qp *mqp)
+{
+        return container_of(mqp, struct mlx4_ib_qp, mqp);
+}
+
+static inline struct mlx4_ib_srq *to_msrq(struct ib_srq *ibsrq)
+{
+        return container_of(ibsrq, struct mlx4_ib_srq, ibsrq);
+}
+
+static inline struct mlx4_ib_srq *to_mibsrq(struct mlx4_srq *msrq)
+{
+        return container_of(msrq, struct mlx4_ib_srq, msrq);
+}
+
+static inline struct mlx4_ib_ah *to_mah(struct ib_ah *ibah)
+{
+        return container_of(ibah, struct mlx4_ib_ah, ibah);
+}
+
+int mlx4_ib_db_alloc(struct mlx4_ib_dev *dev, struct mlx4_ib_db *db, int order);
+void mlx4_ib_db_free(struct mlx4_ib_dev *dev, struct mlx4_ib_db *db);
+int mlx4_ib_db_map_user(struct mlx4_ib_ucontext *context, unsigned long virt,
+                        struct mlx4_ib_db *db);
+void mlx4_ib_db_unmap_user(struct mlx4_ib_ucontext *context, struct mlx4_ib_db *db);
+
+struct ib_mr *mlx4_ib_get_dma_mr(struct ib_pd *pd, int acc);
+int mlx4_ib_umem_write_mtt(struct mlx4_ib_dev *dev, struct mlx4_mtt *mtt,
+                           struct ib_umem *umem);
+struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                  u64 virt_addr, int access_flags,
+                                  struct ib_udata *udata);
+int mlx4_ib_dereg_mr(struct ib_mr *mr);
+
+struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector,
+                                struct ib_ucontext *context,
+                                struct ib_udata *udata);
+int mlx4_ib_destroy_cq(struct ib_cq *cq);
+int mlx4_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc);
+int mlx4_ib_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags);
+void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq);
+void mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq);
+
+struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
+int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr);
+int mlx4_ib_destroy_ah(struct ib_ah *ah);
+
+struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
+                                  struct ib_srq_init_attr *init_attr,
+                                  struct ib_udata *udata);
+int mlx4_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
+                       enum ib_srq_attr_mask attr_mask, struct ib_udata *udata);
+int mlx4_ib_destroy_srq(struct ib_srq *srq);
+void mlx4_ib_free_srq_wqe(struct mlx4_ib_srq *srq, int wqe_index);
+int mlx4_ib_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
+                          struct ib_recv_wr **bad_wr);
+
+struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
+                                struct ib_qp_init_attr *init_attr,
+                                struct ib_udata *udata);
+int mlx4_ib_destroy_qp(struct ib_qp *qp);
+int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
+                      int attr_mask, struct ib_udata *udata);
+int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
+                      struct ib_send_wr **bad_wr);
+int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr,
+                      struct ib_recv_wr **bad_wr);
+
+int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
+                 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
+                 void *in_mad, void *response_mad);
+int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
+                        struct ib_wc *in_wc, struct ib_grh *in_grh,
+                        struct ib_mad *in_mad, struct ib_mad *out_mad);
+int mlx4_ib_mad_init(struct mlx4_ib_dev *dev);
+void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev);
+
+static inline int mlx4_ib_ah_grh_present(struct mlx4_ib_ah *ah)
+{
+        return !!(ah->av.g_slid & 0x80);
+}
+
+#endif /* MLX4_IB_H */
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
new file mode 100644
index 000000000000..85ae906f1d12
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "mlx4_ib.h"
+
+static u32 convert_access(int acc)
+{
+        return (acc & IB_ACCESS_REMOTE_ATOMIC ? MLX4_PERM_ATOMIC       : 0) |
+               (acc & IB_ACCESS_REMOTE_WRITE  ? MLX4_PERM_REMOTE_WRITE : 0) |
+               (acc & IB_ACCESS_REMOTE_READ   ? MLX4_PERM_REMOTE_READ  : 0) |
+               (acc & IB_ACCESS_LOCAL_WRITE   ? MLX4_PERM_LOCAL_WRITE  : 0) |
+               MLX4_PERM_LOCAL_READ;
+}
+
+struct ib_mr *mlx4_ib_get_dma_mr(struct ib_pd *pd, int acc)
+{
+        struct mlx4_ib_mr *mr;
+        int err;
+
+        mr = kmalloc(sizeof *mr, GFP_KERNEL);
+        if (!mr)
+                return ERR_PTR(-ENOMEM);
+
+        err = mlx4_mr_alloc(to_mdev(pd->device)->dev, to_mpd(pd)->pdn, 0,
+                            ~0ull, convert_access(acc), 0, 0, &mr->mmr);
+        if (err)
+                goto err_free;
+
+        err = mlx4_mr_enable(to_mdev(pd->device)->dev, &mr->mmr);
+        if (err)
+                goto err_mr;
+
+        mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;
+        mr->umem = NULL;
+
+        return &mr->ibmr;
+
+err_mr:
+        mlx4_mr_free(to_mdev(pd->device)->dev, &mr->mmr);
+
+err_free:
+        kfree(mr);
+
+        return ERR_PTR(err);
+}
+
+int mlx4_ib_umem_write_mtt(struct mlx4_ib_dev *dev, struct mlx4_mtt *mtt,
+                           struct ib_umem *umem)
+{
+        u64 *pages;
+        struct ib_umem_chunk *chunk;
+        int i, j, k;
+        int n;
+        int len;
+        int err = 0;
+
+        pages = (u64 *) __get_free_page(GFP_KERNEL);
+        if (!pages)
+                return -ENOMEM;
+
+        i = n = 0;
+
+        list_for_each_entry(chunk, &umem->chunk_list, list)
+                for (j = 0; j < chunk->nmap; ++j) {
+                        len = sg_dma_len(&chunk->page_list[j]) >> mtt->page_shift;
+                        for (k = 0; k < len; ++k) {
+                                pages[i++] = sg_dma_address(&chunk->page_list[j]) +
+                                        umem->page_size * k;
+                                /*
+                                 * Be friendly to WRITE_MTT firmware
+                                 * command, and pass it chunks of
+                                 * appropriate size.
+                                 */
+                                if (i == PAGE_SIZE / sizeof (u64) - 2) {
+                                        err = mlx4_write_mtt(dev->dev, mtt, n,
+                                                             i, pages);
+                                        if (err)
+                                                goto out;
+                                        n += i;
+                                        i = 0;
+                                }
+                        }
+                }
+
+        if (i)
+                err = mlx4_write_mtt(dev->dev, mtt, n, i, pages);
+
+out:
+        free_page((unsigned long) pages);
+        return err;
+}
+
+struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                  u64 virt_addr, int access_flags,
+                                  struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(pd->device);
+        struct mlx4_ib_mr *mr;
+        int shift;
+        int err;
+        int n;
+
+        mr = kmalloc(sizeof *mr, GFP_KERNEL);
+        if (!mr)
+                return ERR_PTR(-ENOMEM);
+
+        mr->umem = ib_umem_get(pd->uobject->context, start, length, access_flags);
+        if (IS_ERR(mr->umem)) {
+                err = PTR_ERR(mr->umem);
+                goto err_free;
+        }
+
+        n = ib_umem_page_count(mr->umem);
+        shift = ilog2(mr->umem->page_size);
+
+        err = mlx4_mr_alloc(dev->dev, to_mpd(pd)->pdn, virt_addr, length,
+                            convert_access(access_flags), n, shift, &mr->mmr);
+        if (err)
+                goto err_umem;
+
+        err = mlx4_ib_umem_write_mtt(dev, &mr->mmr.mtt, mr->umem);
+        if (err)
+                goto err_mr;
+
+        err = mlx4_mr_enable(dev->dev, &mr->mmr);
+        if (err)
+                goto err_mr;
+
+        mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;
+
+        return &mr->ibmr;
+
+err_mr:
+        mlx4_mr_free(to_mdev(pd->device)->dev, &mr->mmr);
+
+err_umem:
+        ib_umem_release(mr->umem);
+
+err_free:
+        kfree(mr);
+
+        return ERR_PTR(err);
+}
+
+int mlx4_ib_dereg_mr(struct ib_mr *ibmr)
+{
+        struct mlx4_ib_mr *mr = to_mmr(ibmr);
+
+        mlx4_mr_free(to_mdev(ibmr->device)->dev, &mr->mmr);
+        if (mr->umem)
+                ib_umem_release(mr->umem);
+        kfree(mr);
+
+        return 0;
+}
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
new file mode 100644
index 000000000000..a824bc5f79fd
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -0,0 +1,1371 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <rdma/ib_cache.h>
+#include <rdma/ib_pack.h>
+
+#include <linux/mlx4/qp.h>
+
+#include "mlx4_ib.h"
+#include "user.h"
+
+enum {
+        MLX4_IB_ACK_REQ_FREQ    = 8,
+};
+
+enum {
+        MLX4_IB_DEFAULT_SCHED_QUEUE     = 0x83,
+        MLX4_IB_DEFAULT_QP0_SCHED_QUEUE = 0x3f
+};
+
+enum {
+        /*
+         * Largest possible UD header: send with GRH and immediate data.
+         */
+        MLX4_IB_UD_HEADER_SIZE          = 72
+};
+
+struct mlx4_ib_sqp {
+        struct mlx4_ib_qp       qp;
+        int                     pkey_index;
+        u32                     qkey;
+        u32                     send_psn;
+        struct ib_ud_header     ud_header;
+        u8                      header_buf[MLX4_IB_UD_HEADER_SIZE];
+};
+
+static const __be32 mlx4_ib_opcode[] = {
+        [IB_WR_SEND]                    = __constant_cpu_to_be32(MLX4_OPCODE_SEND),
+        [IB_WR_SEND_WITH_IMM]           = __constant_cpu_to_be32(MLX4_OPCODE_SEND_IMM),
+        [IB_WR_RDMA_WRITE]              = __constant_cpu_to_be32(MLX4_OPCODE_RDMA_WRITE),
+        [IB_WR_RDMA_WRITE_WITH_IMM]     = __constant_cpu_to_be32(MLX4_OPCODE_RDMA_WRITE_IMM),
+        [IB_WR_RDMA_READ]               = __constant_cpu_to_be32(MLX4_OPCODE_RDMA_READ),
+        [IB_WR_ATOMIC_CMP_AND_SWP]      = __constant_cpu_to_be32(MLX4_OPCODE_ATOMIC_CS),
+        [IB_WR_ATOMIC_FETCH_AND_ADD]    = __constant_cpu_to_be32(MLX4_OPCODE_ATOMIC_FA),
+};
+
+static struct mlx4_ib_sqp *to_msqp(struct mlx4_ib_qp *mqp)
+{
+        return container_of(mqp, struct mlx4_ib_sqp, qp);
+}
+
+static int is_sqp(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp)
+{
+        return qp->mqp.qpn >= dev->dev->caps.sqp_start &&
+                qp->mqp.qpn <= dev->dev->caps.sqp_start + 3;
+}
+
+static int is_qp0(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp)
+{
+        return qp->mqp.qpn >= dev->dev->caps.sqp_start &&
+                qp->mqp.qpn <= dev->dev->caps.sqp_start + 1;
+}
+
+static void *get_wqe(struct mlx4_ib_qp *qp, int offset)
+{
+        if (qp->buf.nbufs == 1)
+                return qp->buf.u.direct.buf + offset;
+        else
+                return qp->buf.u.page_list[offset >> PAGE_SHIFT].buf +
+                        (offset & (PAGE_SIZE - 1));
+}
+
+static void *get_recv_wqe(struct mlx4_ib_qp *qp, int n)
+{
+        return get_wqe(qp, qp->rq.offset + (n << qp->rq.wqe_shift));
+}
+
+static void *get_send_wqe(struct mlx4_ib_qp *qp, int n)
+{
+        return get_wqe(qp, qp->sq.offset + (n << qp->sq.wqe_shift));
+}
+
+static void mlx4_ib_qp_event(struct mlx4_qp *qp, enum mlx4_event type)
+{
+        struct ib_event event;
+        struct ib_qp *ibqp = &to_mibqp(qp)->ibqp;
+
+        if (type == MLX4_EVENT_TYPE_PATH_MIG)
+                to_mibqp(qp)->port = to_mibqp(qp)->alt_port;
+
+        if (ibqp->event_handler) {
+                event.device     = ibqp->device;
+                event.element.qp = ibqp;
+                switch (type) {
+                case MLX4_EVENT_TYPE_PATH_MIG:
+                        event.event = IB_EVENT_PATH_MIG;
+                        break;
+                case MLX4_EVENT_TYPE_COMM_EST:
+                        event.event = IB_EVENT_COMM_EST;
+                        break;
+                case MLX4_EVENT_TYPE_SQ_DRAINED:
+                        event.event = IB_EVENT_SQ_DRAINED;
+                        break;
+                case MLX4_EVENT_TYPE_SRQ_QP_LAST_WQE:
+                        event.event = IB_EVENT_QP_LAST_WQE_REACHED;
+                        break;
+                case MLX4_EVENT_TYPE_WQ_CATAS_ERROR:
+                        event.event = IB_EVENT_QP_FATAL;
+                        break;
+                case MLX4_EVENT_TYPE_PATH_MIG_FAILED:
+                        event.event = IB_EVENT_PATH_MIG_ERR;
+                        break;
+                case MLX4_EVENT_TYPE_WQ_INVAL_REQ_ERROR:
+                        event.event = IB_EVENT_QP_REQ_ERR;
+                        break;
+                case MLX4_EVENT_TYPE_WQ_ACCESS_ERROR:
+                        event.event = IB_EVENT_QP_ACCESS_ERR;
+                        break;
+                default:
+                        printk(KERN_WARNING "mlx4_ib: Unexpected event type %d "
+                               "on QP %06x\n", type, qp->qpn);
+                        return;
+                }
+
+                ibqp->event_handler(&event, ibqp->qp_context);
+        }
+}
+
+static int send_wqe_overhead(enum ib_qp_type type)
+{
+        /*
+         * UD WQEs must have a datagram segment.
+         * RC and UC WQEs might have a remote address segment.
+         * MLX WQEs need two extra inline data segments (for the UD
+         * header and space for the ICRC).
+         */
+        switch (type) {
+        case IB_QPT_UD:
+                return sizeof (struct mlx4_wqe_ctrl_seg) +
+                        sizeof (struct mlx4_wqe_datagram_seg);
+        case IB_QPT_UC:
+                return sizeof (struct mlx4_wqe_ctrl_seg) +
+                        sizeof (struct mlx4_wqe_raddr_seg);
+        case IB_QPT_RC:
+                return sizeof (struct mlx4_wqe_ctrl_seg) +
+                        sizeof (struct mlx4_wqe_atomic_seg) +
+                        sizeof (struct mlx4_wqe_raddr_seg);
+        case IB_QPT_SMI:
+        case IB_QPT_GSI:
+                return sizeof (struct mlx4_wqe_ctrl_seg) +
+                        ALIGN(MLX4_IB_UD_HEADER_SIZE +
+                              sizeof (struct mlx4_wqe_inline_seg),
+                              sizeof (struct mlx4_wqe_data_seg)) +
+                        ALIGN(4 +
+                              sizeof (struct mlx4_wqe_inline_seg),
+                              sizeof (struct mlx4_wqe_data_seg));
+        default:
+                return sizeof (struct mlx4_wqe_ctrl_seg);
+        }
+}
+
+static int set_rq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
+                       struct mlx4_ib_qp *qp)
+{
+        /* Sanity check RQ size before proceeding */
+        if (cap->max_recv_wr  > dev->dev->caps.max_wqes  ||
+            cap->max_recv_sge > dev->dev->caps.max_rq_sg)
+                return -EINVAL;
+
+        qp->rq.max = cap->max_recv_wr ? roundup_pow_of_two(cap->max_recv_wr) : 0;
+
+        qp->rq.wqe_shift = ilog2(roundup_pow_of_two(cap->max_recv_sge *
+                                                    sizeof (struct mlx4_wqe_data_seg)));
+        qp->rq.max_gs    = (1 << qp->rq.wqe_shift) / sizeof (struct mlx4_wqe_data_seg);
+
+        cap->max_recv_wr  = qp->rq.max;
+        cap->max_recv_sge = qp->rq.max_gs;
+
+        return 0;
+}
+
+static int set_kernel_sq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
+                              enum ib_qp_type type, struct mlx4_ib_qp *qp)
+{
+        /* Sanity check SQ size before proceeding */
+        if (cap->max_send_wr     > dev->dev->caps.max_wqes  ||
+            cap->max_send_sge    > dev->dev->caps.max_sq_sg ||
+            cap->max_inline_data + send_wqe_overhead(type) +
+            sizeof (struct mlx4_wqe_inline_seg) > dev->dev->caps.max_sq_desc_sz)
+                return -EINVAL;
+
+        /*
+         * For MLX transport we need 2 extra S/G entries:
+         * one for the header and one for the checksum at the end
+         */
+        if ((type == IB_QPT_SMI || type == IB_QPT_GSI) &&
+            cap->max_send_sge + 2 > dev->dev->caps.max_sq_sg)
+                return -EINVAL;
+
+        qp->sq.max = cap->max_send_wr ? roundup_pow_of_two(cap->max_send_wr) : 1;
+
+        qp->sq.wqe_shift = ilog2(roundup_pow_of_two(max(cap->max_send_sge *
+                                                        sizeof (struct mlx4_wqe_data_seg),
+                                                        cap->max_inline_data +
+                                                        sizeof (struct mlx4_wqe_inline_seg)) +
+                                                    send_wqe_overhead(type)));
+        qp->sq.max_gs    = ((1 << qp->sq.wqe_shift) - send_wqe_overhead(type)) /
+                sizeof (struct mlx4_wqe_data_seg);
+
+        qp->buf_size = (qp->rq.max << qp->rq.wqe_shift) +
+                (qp->sq.max << qp->sq.wqe_shift);
+        if (qp->rq.wqe_shift > qp->sq.wqe_shift) {
+                qp->rq.offset = 0;
+                qp->sq.offset = qp->rq.max << qp->rq.wqe_shift;
+        } else {
+                qp->rq.offset = qp->sq.max << qp->sq.wqe_shift;
+                qp->sq.offset = 0;
+        }
+
+        cap->max_send_wr     = qp->sq.max;
+        cap->max_send_sge    = qp->sq.max_gs;
+        cap->max_inline_data = (1 << qp->sq.wqe_shift) - send_wqe_overhead(type) -
+                sizeof (struct mlx4_wqe_inline_seg);
+
+        return 0;
+}
+
+static int set_user_sq_size(struct mlx4_ib_qp *qp,
+                            struct mlx4_ib_create_qp *ucmd)
+{
+        qp->sq.max       = 1 << ucmd->log_sq_bb_count;
+        qp->sq.wqe_shift = ucmd->log_sq_stride;
+
+        qp->buf_size = (qp->rq.max << qp->rq.wqe_shift) +
+                (qp->sq.max << qp->sq.wqe_shift);
+
+        return 0;
+}
+
+static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
+                            struct ib_qp_init_attr *init_attr,
+                            struct ib_udata *udata, int sqpn, struct mlx4_ib_qp *qp)
+{
+        struct mlx4_wqe_ctrl_seg *ctrl;
+        int err;
+        int i;
+
+        mutex_init(&qp->mutex);
+        spin_lock_init(&qp->sq.lock);
+        spin_lock_init(&qp->rq.lock);
+
+        qp->state        = IB_QPS_RESET;
+        qp->atomic_rd_en = 0;
+        qp->resp_depth   = 0;
+
+        qp->rq.head         = 0;
+        qp->rq.tail         = 0;
+        qp->sq.head         = 0;
+        qp->sq.tail         = 0;
+
+        err = set_rq_size(dev, &init_attr->cap, qp);
+        if (err)
+                goto err;
+
+        if (pd->uobject) {
+                struct mlx4_ib_create_qp ucmd;
+
+                if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+                        err = -EFAULT;
+                        goto err;
+                }
+
+                err = set_user_sq_size(qp, &ucmd);
+                if (err)
+                        goto err;
+
+                qp->umem = ib_umem_get(pd->uobject->context, ucmd.buf_addr,
+                                       qp->buf_size, 0);
+                if (IS_ERR(qp->umem)) {
+                        err = PTR_ERR(qp->umem);
+                        goto err;
+                }
+
+                err = mlx4_mtt_init(dev->dev, ib_umem_page_count(qp->umem),
+                                    ilog2(qp->umem->page_size), &qp->mtt);
+                if (err)
+                        goto err_buf;
+
+                err = mlx4_ib_umem_write_mtt(dev, &qp->mtt, qp->umem);
+                if (err)
+                        goto err_mtt;
+
+                err = mlx4_ib_db_map_user(to_mucontext(pd->uobject->context),
+                                          ucmd.db_addr, &qp->db);
+                if (err)
+                        goto err_mtt;
+        } else {
+                err = set_kernel_sq_size(dev, &init_attr->cap, init_attr->qp_type, qp);
+                if (err)
+                        goto err;
+
+                err = mlx4_ib_db_alloc(dev, &qp->db, 0);
+                if (err)
+                        goto err;
+
+                *qp->db.db = 0;
+
+                if (mlx4_buf_alloc(dev->dev, qp->buf_size, PAGE_SIZE * 2, &qp->buf)) {
+                        err = -ENOMEM;
+                        goto err_db;
+                }
+
+                err = mlx4_mtt_init(dev->dev, qp->buf.npages, qp->buf.page_shift,
+                                    &qp->mtt);
+                if (err)
+                        goto err_buf;
+
+                err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf);
+                if (err)
+                        goto err_mtt;
+
+                for (i = 0; i < qp->sq.max; ++i) {
+                        ctrl = get_send_wqe(qp, i);
+                        ctrl->owner_opcode = cpu_to_be32(1 << 31);
+                }
+
+                qp->sq.wrid  = kmalloc(qp->sq.max * sizeof (u64), GFP_KERNEL);
+                qp->rq.wrid  = kmalloc(qp->rq.max * sizeof (u64), GFP_KERNEL);
+
+                if (!qp->sq.wrid || !qp->rq.wrid) {
+                        err = -ENOMEM;
+                        goto err_wrid;
+                }
+
+                /* We don't support inline sends for kernel QPs (yet) */
+                init_attr->cap.max_inline_data = 0;
+        }
+
+        err = mlx4_qp_alloc(dev->dev, sqpn, &qp->mqp);
+        if (err)
+                goto err_wrid;
+
+        /*
+         * Hardware wants QPN written in big-endian order (after
+         * shifting) for send doorbell.  Precompute this value to save
+         * a little bit when posting sends.
+         */
+        qp->doorbell_qpn = swab32(qp->mqp.qpn << 8);
+
+        if (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR)
+                qp->sq_signal_bits = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE);
+        else
+                qp->sq_signal_bits = 0;
+
+        qp->mqp.event = mlx4_ib_qp_event;
+
+        return 0;
+
+err_wrid:
+        if (pd->uobject)
+                mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &qp->db);
+        else {
+                kfree(qp->sq.wrid);
+                kfree(qp->rq.wrid);
+        }
+
+err_mtt:
+        mlx4_mtt_cleanup(dev->dev, &qp->mtt);
+
+err_buf:
+        if (pd->uobject)
+                ib_umem_release(qp->umem);
+        else
+                mlx4_buf_free(dev->dev, qp->buf_size, &qp->buf);
+
+err_db:
+        if (!pd->uobject)
+                mlx4_ib_db_free(dev, &qp->db);
+
+err:
+        return err;
+}
+
+static enum mlx4_qp_state to_mlx4_state(enum ib_qp_state state)
+{
+        switch (state) {
+        case IB_QPS_RESET:      return MLX4_QP_STATE_RST;
+        case IB_QPS_INIT:       return MLX4_QP_STATE_INIT;
+        case IB_QPS_RTR:        return MLX4_QP_STATE_RTR;
+        case IB_QPS_RTS:        return MLX4_QP_STATE_RTS;
+        case IB_QPS_SQD:        return MLX4_QP_STATE_SQD;
+        case IB_QPS_SQE:        return MLX4_QP_STATE_SQER;
+        case IB_QPS_ERR:        return MLX4_QP_STATE_ERR;
+        default:                return -1;
+        }
+}
+
+static void mlx4_ib_lock_cqs(struct mlx4_ib_cq *send_cq, struct mlx4_ib_cq *recv_cq)
+{
+        if (send_cq == recv_cq)
+                spin_lock_irq(&send_cq->lock);
+        else if (send_cq->mcq.cqn < recv_cq->mcq.cqn) {
+                spin_lock_irq(&send_cq->lock);
+                spin_lock_nested(&recv_cq->lock, SINGLE_DEPTH_NESTING);
+        } else {
+                spin_lock_irq(&recv_cq->lock);
+                spin_lock_nested(&send_cq->lock, SINGLE_DEPTH_NESTING);
+        }
+}
+
+static void mlx4_ib_unlock_cqs(struct mlx4_ib_cq *send_cq, struct mlx4_ib_cq *recv_cq)
+{
+        if (send_cq == recv_cq)
+                spin_unlock_irq(&send_cq->lock);
+        else if (send_cq->mcq.cqn < recv_cq->mcq.cqn) {
+                spin_unlock(&recv_cq->lock);
+                spin_unlock_irq(&send_cq->lock);
+        } else {
+                spin_unlock(&send_cq->lock);
+                spin_unlock_irq(&recv_cq->lock);
+        }
+}
+
+static void destroy_qp_common(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp,
+                              int is_user)
+{
+        struct mlx4_ib_cq *send_cq, *recv_cq;
+
+        if (qp->state != IB_QPS_RESET)
+                if (mlx4_qp_modify(dev->dev, NULL, to_mlx4_state(qp->state),
+                                   MLX4_QP_STATE_RST, NULL, 0, 0, &qp->mqp))
+                        printk(KERN_WARNING "mlx4_ib: modify QP %06x to RESET failed.\n",
+                               qp->mqp.qpn);
+
+        send_cq = to_mcq(qp->ibqp.send_cq);
+        recv_cq = to_mcq(qp->ibqp.recv_cq);
+
+        mlx4_ib_lock_cqs(send_cq, recv_cq);
+
+        if (!is_user) {
+                __mlx4_ib_cq_clean(recv_cq, qp->mqp.qpn,
+                                 qp->ibqp.srq ? to_msrq(qp->ibqp.srq): NULL);
+                if (send_cq != recv_cq)
+                        __mlx4_ib_cq_clean(send_cq, qp->mqp.qpn, NULL);
+        }
+
+        mlx4_qp_remove(dev->dev, &qp->mqp);
+
+        mlx4_ib_unlock_cqs(send_cq, recv_cq);
+
+        mlx4_qp_free(dev->dev, &qp->mqp);
+        mlx4_mtt_cleanup(dev->dev, &qp->mtt);
+
+        if (is_user) {
+                mlx4_ib_db_unmap_user(to_mucontext(qp->ibqp.uobject->context),
+                                      &qp->db);
+                ib_umem_release(qp->umem);
+        } else {
+                kfree(qp->sq.wrid);
+                kfree(qp->rq.wrid);
+                mlx4_buf_free(dev->dev, qp->buf_size, &qp->buf);
+                mlx4_ib_db_free(dev, &qp->db);
+        }
+}
+
+struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
+                                struct ib_qp_init_attr *init_attr,
+                                struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(pd->device);
+        struct mlx4_ib_sqp *sqp;
+        struct mlx4_ib_qp *qp;
+        int err;
+
+        switch (init_attr->qp_type) {
+        case IB_QPT_RC:
+        case IB_QPT_UC:
+        case IB_QPT_UD:
+        {
+                qp = kmalloc(sizeof *qp, GFP_KERNEL);
+                if (!qp)
+                        return ERR_PTR(-ENOMEM);
+
+                err = create_qp_common(dev, pd, init_attr, udata, 0, qp);
+                if (err) {
+                        kfree(qp);
+                        return ERR_PTR(err);
+                }
+
+                qp->ibqp.qp_num = qp->mqp.qpn;
+
+                break;
+        }
+        case IB_QPT_SMI:
+        case IB_QPT_GSI:
+        {
+                /* Userspace is not allowed to create special QPs: */
+                if (pd->uobject)
+                        return ERR_PTR(-EINVAL);
+
+                sqp = kmalloc(sizeof *sqp, GFP_KERNEL);
+                if (!sqp)
+                        return ERR_PTR(-ENOMEM);
+
+                qp = &sqp->qp;
+
+                err = create_qp_common(dev, pd, init_attr, udata,
+                                       dev->dev->caps.sqp_start +
+                                       (init_attr->qp_type == IB_QPT_SMI ? 0 : 2) +
+                                       init_attr->port_num - 1,
+                                       qp);
+                if (err) {
+                        kfree(sqp);
+                        return ERR_PTR(err);
+                }
+
+                qp->port        = init_attr->port_num;
+                qp->ibqp.qp_num = init_attr->qp_type == IB_QPT_SMI ? 0 : 1;
+
+                break;
+        }
+        default:
+                /* Don't support raw QPs */
+                return ERR_PTR(-EINVAL);
+        }
+
+        return &qp->ibqp;
+}
+
+int mlx4_ib_destroy_qp(struct ib_qp *qp)
+{
+        struct mlx4_ib_dev *dev = to_mdev(qp->device);
+        struct mlx4_ib_qp *mqp = to_mqp(qp);
+
+        if (is_qp0(dev, mqp))
+                mlx4_CLOSE_PORT(dev->dev, mqp->port);
+
+        destroy_qp_common(dev, mqp, !!qp->pd->uobject);
+
+        if (is_sqp(dev, mqp))
+                kfree(to_msqp(mqp));
+        else
+                kfree(mqp);
+
+        return 0;
+}
+
+static void init_port(struct mlx4_ib_dev *dev, int port)
+{
+        struct mlx4_init_port_param param;
+        int err;
+
+        memset(&param, 0, sizeof param);
+
+        param.port_width_cap = dev->dev->caps.port_width_cap;
+        param.vl_cap         = dev->dev->caps.vl_cap;
+        param.mtu            = ib_mtu_enum_to_int(dev->dev->caps.mtu_cap);
+        param.max_gid        = dev->dev->caps.gid_table_len;
+        param.max_pkey       = dev->dev->caps.pkey_table_len;
+
+        err = mlx4_INIT_PORT(dev->dev, &param, port);
+        if (err)
+                printk(KERN_WARNING "INIT_PORT failed, return code %d.\n", err);
+}
+
+static int to_mlx4_st(enum ib_qp_type type)
+{
+        switch (type) {
+        case IB_QPT_RC:         return MLX4_QP_ST_RC;
+        case IB_QPT_UC:         return MLX4_QP_ST_UC;
+        case IB_QPT_UD:         return MLX4_QP_ST_UD;
+        case IB_QPT_SMI:
+        case IB_QPT_GSI:        return MLX4_QP_ST_MLX;
+        default:                return -1;
+        }
+}
+
+static __be32 to_mlx4_access_flags(struct mlx4_ib_qp *qp, const struct ib_qp_attr *attr,
+                                   int attr_mask)
+{
+        u8 dest_rd_atomic;
+        u32 access_flags;
+        u32 hw_access_flags = 0;
+
+        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
+                dest_rd_atomic = attr->max_dest_rd_atomic;
+        else
+                dest_rd_atomic = qp->resp_depth;
+
+        if (attr_mask & IB_QP_ACCESS_FLAGS)
+                access_flags = attr->qp_access_flags;
+        else
+                access_flags = qp->atomic_rd_en;
+
+        if (!dest_rd_atomic)
+                access_flags &= IB_ACCESS_REMOTE_WRITE;
+
+        if (access_flags & IB_ACCESS_REMOTE_READ)
+                hw_access_flags |= MLX4_QP_BIT_RRE;
+        if (access_flags & IB_ACCESS_REMOTE_ATOMIC)
+                hw_access_flags |= MLX4_QP_BIT_RAE;
+        if (access_flags & IB_ACCESS_REMOTE_WRITE)
+                hw_access_flags |= MLX4_QP_BIT_RWE;
+
+        return cpu_to_be32(hw_access_flags);
+}
+
+static void store_sqp_attrs(struct mlx4_ib_sqp *sqp, const struct ib_qp_attr *attr,
+                            int attr_mask)
+{
+        if (attr_mask & IB_QP_PKEY_INDEX)
+                sqp->pkey_index = attr->pkey_index;
+        if (attr_mask & IB_QP_QKEY)
+                sqp->qkey = attr->qkey;
+        if (attr_mask & IB_QP_SQ_PSN)
+                sqp->send_psn = attr->sq_psn;
+}
+
+static void mlx4_set_sched(struct mlx4_qp_path *path, u8 port)
+{
+        path->sched_queue = (path->sched_queue & 0xbf) | ((port - 1) << 6);
+}
+
+static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
+                         struct mlx4_qp_path *path, u8 port)
+{
+        path->grh_mylmc     = ah->src_path_bits & 0x7f;
+        path->rlid          = cpu_to_be16(ah->dlid);
+        if (ah->static_rate) {
+                path->static_rate = ah->static_rate + MLX4_STAT_RATE_OFFSET;
+                while (path->static_rate > IB_RATE_2_5_GBPS + MLX4_STAT_RATE_OFFSET &&
+                       !(1 << path->static_rate & dev->dev->caps.stat_rate_support))
+                        --path->static_rate;
+        } else
+                path->static_rate = 0;
+        path->counter_index = 0xff;
+
+        if (ah->ah_flags & IB_AH_GRH) {
+                if (ah->grh.sgid_index >= dev->dev->caps.gid_table_len) {
+                        printk(KERN_ERR "sgid_index (%u) too large. max is %d\n",
+                               ah->grh.sgid_index, dev->dev->caps.gid_table_len - 1);
+                        return -1;
+                }
+
+                path->grh_mylmc |= 1 << 7;
+                path->mgid_index = ah->grh.sgid_index;
+                path->hop_limit  = ah->grh.hop_limit;
+                path->tclass_flowlabel =
+                        cpu_to_be32((ah->grh.traffic_class << 20) |
+                                    (ah->grh.flow_label));
+                memcpy(path->rgid, ah->grh.dgid.raw, 16);
+        }
+
+        path->sched_queue = MLX4_IB_DEFAULT_SCHED_QUEUE |
+                ((port - 1) << 6) | ((ah->sl & 0xf) << 2);
+
+        return 0;
+}
+
+static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
+                               const struct ib_qp_attr *attr, int attr_mask,
+                               enum ib_qp_state cur_state, enum ib_qp_state new_state)
+{
+        struct mlx4_ib_dev *dev = to_mdev(ibqp->device);
+        struct mlx4_ib_qp *qp = to_mqp(ibqp);
+        struct mlx4_qp_context *context;
+        enum mlx4_qp_optpar optpar = 0;
+        int sqd_event;
+        int err = -EINVAL;
+
+        context = kzalloc(sizeof *context, GFP_KERNEL);
+        if (!context)
+                return -ENOMEM;
+
+        context->flags = cpu_to_be32((to_mlx4_state(new_state) << 28) |
+                                     (to_mlx4_st(ibqp->qp_type) << 16));
+        context->flags     |= cpu_to_be32(1 << 8); /* DE? */
+
+        if (!(attr_mask & IB_QP_PATH_MIG_STATE))
+                context->flags |= cpu_to_be32(MLX4_QP_PM_MIGRATED << 11);
+        else {
+                optpar |= MLX4_QP_OPTPAR_PM_STATE;
+                switch (attr->path_mig_state) {
+                case IB_MIG_MIGRATED:
+                        context->flags |= cpu_to_be32(MLX4_QP_PM_MIGRATED << 11);
+                        break;
+                case IB_MIG_REARM:
+                        context->flags |= cpu_to_be32(MLX4_QP_PM_REARM << 11);
+                        break;
+                case IB_MIG_ARMED:
+                        context->flags |= cpu_to_be32(MLX4_QP_PM_ARMED << 11);
+                        break;
+                }
+        }
+
+        if (ibqp->qp_type == IB_QPT_GSI || ibqp->qp_type == IB_QPT_SMI ||
+            ibqp->qp_type == IB_QPT_UD)
+                context->mtu_msgmax = (IB_MTU_4096 << 5) | 11;
+        else if (attr_mask & IB_QP_PATH_MTU) {
+                if (attr->path_mtu < IB_MTU_256 || attr->path_mtu > IB_MTU_4096) {
+                        printk(KERN_ERR "path MTU (%u) is invalid\n",
+                               attr->path_mtu);
+                        return -EINVAL;
+                }
+                context->mtu_msgmax = (attr->path_mtu << 5) | 31;
+        }
+
+        if (qp->rq.max)
+                context->rq_size_stride = ilog2(qp->rq.max) << 3;
+        context->rq_size_stride |= qp->rq.wqe_shift - 4;
+
+        if (qp->sq.max)
+                context->sq_size_stride = ilog2(qp->sq.max) << 3;
+        context->sq_size_stride |= qp->sq.wqe_shift - 4;
+
+        if (qp->ibqp.uobject)
+                context->usr_page = cpu_to_be32(to_mucontext(ibqp->uobject->context)->uar.index);
+        else
+                context->usr_page = cpu_to_be32(dev->priv_uar.index);
+
+        if (attr_mask & IB_QP_DEST_QPN)
+                context->remote_qpn = cpu_to_be32(attr->dest_qp_num);
+
+        if (attr_mask & IB_QP_PORT) {
+                if (cur_state == IB_QPS_SQD && new_state == IB_QPS_SQD &&
+                    !(attr_mask & IB_QP_AV)) {
+                        mlx4_set_sched(&context->pri_path, attr->port_num);
+                        optpar |= MLX4_QP_OPTPAR_SCHED_QUEUE;
+                }
+        }
+
+        if (attr_mask & IB_QP_PKEY_INDEX) {
+                context->pri_path.pkey_index = attr->pkey_index;
+                optpar |= MLX4_QP_OPTPAR_PKEY_INDEX;
+        }
+
+        if (attr_mask & IB_QP_RNR_RETRY) {
+                context->params1 |= cpu_to_be32(attr->rnr_retry << 13);
+                optpar |= MLX4_QP_OPTPAR_RNR_RETRY;
+        }
+
+        if (attr_mask & IB_QP_AV) {
+                if (mlx4_set_path(dev, &attr->ah_attr, &context->pri_path,
+                                  attr_mask & IB_QP_PORT ? attr->port_num : qp->port)) {
+                        err = -EINVAL;
+                        goto out;
+                }
+
+                optpar |= (MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH |
+                           MLX4_QP_OPTPAR_SCHED_QUEUE);
+        }
+
+        if (attr_mask & IB_QP_TIMEOUT) {
+                context->pri_path.ackto = attr->timeout << 3;
+                optpar |= MLX4_QP_OPTPAR_ACK_TIMEOUT;
+        }
+
+        if (attr_mask & IB_QP_ALT_PATH) {
+                if (attr->alt_pkey_index >= dev->dev->caps.pkey_table_len)
+                        return -EINVAL;
+
+                if (attr->alt_port_num == 0 ||
+                    attr->alt_port_num > dev->dev->caps.num_ports)
+                        return -EINVAL;
+
+                if (mlx4_set_path(dev, &attr->alt_ah_attr, &context->alt_path,
+                                  attr->alt_port_num))
+                        return -EINVAL;
+
+                context->alt_path.pkey_index = attr->alt_pkey_index;
+                context->alt_path.ackto = attr->alt_timeout << 3;
+                optpar |= MLX4_QP_OPTPAR_ALT_ADDR_PATH;
+        }
+
+        context->pd         = cpu_to_be32(to_mpd(ibqp->pd)->pdn);
+        context->params1    = cpu_to_be32(MLX4_IB_ACK_REQ_FREQ << 28);
+        if (attr_mask & IB_QP_RETRY_CNT) {
+                context->params1 |= cpu_to_be32(attr->retry_cnt << 16);
+                optpar |= MLX4_QP_OPTPAR_RETRY_COUNT;
+        }
+
+        if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC) {
+                if (attr->max_rd_atomic)
+                        context->params1 |=
+                                cpu_to_be32(fls(attr->max_rd_atomic - 1) << 21);
+                optpar |= MLX4_QP_OPTPAR_SRA_MAX;
+        }
+
+        if (attr_mask & IB_QP_SQ_PSN)
+                context->next_send_psn = cpu_to_be32(attr->sq_psn);
+
+        context->cqn_send = cpu_to_be32(to_mcq(ibqp->send_cq)->mcq.cqn);
+
+        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC) {
+                if (attr->max_dest_rd_atomic)
+                        context->params2 |=
+                                cpu_to_be32(fls(attr->max_dest_rd_atomic - 1) << 21);
+                optpar |= MLX4_QP_OPTPAR_RRA_MAX;
+        }
+
+        if (attr_mask & (IB_QP_ACCESS_FLAGS | IB_QP_MAX_DEST_RD_ATOMIC)) {
+                context->params2 |= to_mlx4_access_flags(qp, attr, attr_mask);
+                optpar |= MLX4_QP_OPTPAR_RWE | MLX4_QP_OPTPAR_RRE | MLX4_QP_OPTPAR_RAE;
+        }
+
+        if (ibqp->srq)
+                context->params2 |= cpu_to_be32(MLX4_QP_BIT_RIC);
+
+        if (attr_mask & IB_QP_MIN_RNR_TIMER) {
+                context->rnr_nextrecvpsn |= cpu_to_be32(attr->min_rnr_timer << 24);
+                optpar |= MLX4_QP_OPTPAR_RNR_TIMEOUT;
+        }
+        if (attr_mask & IB_QP_RQ_PSN)
+                context->rnr_nextrecvpsn |= cpu_to_be32(attr->rq_psn);
+
+        context->cqn_recv = cpu_to_be32(to_mcq(ibqp->recv_cq)->mcq.cqn);
+
+        if (attr_mask & IB_QP_QKEY) {
+                context->qkey = cpu_to_be32(attr->qkey);
+                optpar |= MLX4_QP_OPTPAR_Q_KEY;
+        }
+
+        if (ibqp->srq)
+                context->srqn = cpu_to_be32(1 << 24 | to_msrq(ibqp->srq)->msrq.srqn);
+
+        if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT)
+                context->db_rec_addr = cpu_to_be64(qp->db.dma);
+
+        if (cur_state == IB_QPS_INIT &&
+            new_state == IB_QPS_RTR  &&
+            (ibqp->qp_type == IB_QPT_GSI || ibqp->qp_type == IB_QPT_SMI ||
+             ibqp->qp_type == IB_QPT_UD)) {
+                context->pri_path.sched_queue = (qp->port - 1) << 6;
+                if (is_qp0(dev, qp))
+                        context->pri_path.sched_queue |= MLX4_IB_DEFAULT_QP0_SCHED_QUEUE;
+                else
+                        context->pri_path.sched_queue |= MLX4_IB_DEFAULT_SCHED_QUEUE;
+        }
+
+        if (cur_state == IB_QPS_RTS && new_state == IB_QPS_SQD  &&
+            attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY && attr->en_sqd_async_notify)
+                sqd_event = 1;
+        else
+                sqd_event = 0;
+
+        err = mlx4_qp_modify(dev->dev, &qp->mtt, to_mlx4_state(cur_state),
+                             to_mlx4_state(new_state), context, optpar,
+                             sqd_event, &qp->mqp);
+        if (err)
+                goto out;
+
+        qp->state = new_state;
+
+        if (attr_mask & IB_QP_ACCESS_FLAGS)
+                qp->atomic_rd_en = attr->qp_access_flags;
+        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
+                qp->resp_depth = attr->max_dest_rd_atomic;
+        if (attr_mask & IB_QP_PORT)
+                qp->port = attr->port_num;
+        if (attr_mask & IB_QP_ALT_PATH)
+                qp->alt_port = attr->alt_port_num;
+
+        if (is_sqp(dev, qp))
+                store_sqp_attrs(to_msqp(qp), attr, attr_mask);
+
+        /*
+         * If we moved QP0 to RTR, bring the IB link up; if we moved
+         * QP0 to RESET or ERROR, bring the link back down.
+         */
+        if (is_qp0(dev, qp)) {
+                if (cur_state != IB_QPS_RTR && new_state == IB_QPS_RTR)
+                        init_port(dev, qp->port);
+
+                if (cur_state != IB_QPS_RESET && cur_state != IB_QPS_ERR &&
+                    (new_state == IB_QPS_RESET || new_state == IB_QPS_ERR))
+                        mlx4_CLOSE_PORT(dev->dev, qp->port);
+        }
+
+        /*
+         * If we moved a kernel QP to RESET, clean up all old CQ
+         * entries and reinitialize the QP.
+         */
+        if (new_state == IB_QPS_RESET && !ibqp->uobject) {
+                mlx4_ib_cq_clean(to_mcq(ibqp->recv_cq), qp->mqp.qpn,
+                                 ibqp->srq ? to_msrq(ibqp->srq): NULL);
+                if (ibqp->send_cq != ibqp->recv_cq)
+                        mlx4_ib_cq_clean(to_mcq(ibqp->send_cq), qp->mqp.qpn, NULL);
+
+                qp->rq.head = 0;
+                qp->rq.tail = 0;
+                qp->sq.head = 0;
+                qp->sq.tail = 0;
+                *qp->db.db  = 0;
+        }
+
+out:
+        kfree(context);
+        return err;
+}
+
+static const struct ib_qp_attr mlx4_ib_qp_attr = { .port_num = 1 };
+static const int mlx4_ib_qp_attr_mask_table[IB_QPT_UD + 1] = {
+                [IB_QPT_UD]  = (IB_QP_PKEY_INDEX                |
+                                IB_QP_PORT                      |
+                                IB_QP_QKEY),
+                [IB_QPT_UC]  = (IB_QP_PKEY_INDEX                |
+                                IB_QP_PORT                      |
+                                IB_QP_ACCESS_FLAGS),
+                [IB_QPT_RC]  = (IB_QP_PKEY_INDEX                |
+                                IB_QP_PORT                      |
+                                IB_QP_ACCESS_FLAGS),
+                [IB_QPT_SMI] = (IB_QP_PKEY_INDEX                |
+                                IB_QP_QKEY),
+                [IB_QPT_GSI] = (IB_QP_PKEY_INDEX                |
+                                IB_QP_QKEY),
+};
+
+int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
+                      int attr_mask, struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(ibqp->device);
+        struct mlx4_ib_qp *qp = to_mqp(ibqp);
+        enum ib_qp_state cur_state, new_state;
+        int err = -EINVAL;
+
+        mutex_lock(&qp->mutex);
+
+        cur_state = attr_mask & IB_QP_CUR_STATE ? attr->cur_qp_state : qp->state;
+        new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
+
+        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask))
+                goto out;
+
+        if ((attr_mask & IB_QP_PKEY_INDEX) &&
+             attr->pkey_index >= dev->dev->caps.pkey_table_len) {
+                goto out;
+        }
+
+        if ((attr_mask & IB_QP_PORT) &&
+            (attr->port_num == 0 || attr->port_num > dev->dev->caps.num_ports)) {
+                goto out;
+        }
+
+        if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
+            attr->max_rd_atomic > dev->dev->caps.max_qp_init_rdma) {
+                goto out;
+        }
+
+        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
+            attr->max_dest_rd_atomic > dev->dev->caps.max_qp_dest_rdma) {
+                goto out;
+        }
+
+        if (cur_state == new_state && cur_state == IB_QPS_RESET) {
+                err = 0;
+                goto out;
+        }
+
+        if (cur_state == IB_QPS_RESET && new_state == IB_QPS_ERR) {
+                err = __mlx4_ib_modify_qp(ibqp, &mlx4_ib_qp_attr,
+                                          mlx4_ib_qp_attr_mask_table[ibqp->qp_type],
+                                          IB_QPS_RESET, IB_QPS_INIT);
+                if (err)
+                        goto out;
+                cur_state = IB_QPS_INIT;
+        }
+
+        err = __mlx4_ib_modify_qp(ibqp, attr, attr_mask, cur_state, new_state);
+
+out:
+        mutex_unlock(&qp->mutex);
+        return err;
+}
+
+static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
+                            void *wqe)
+{
+        struct ib_device *ib_dev = &to_mdev(sqp->qp.ibqp.device)->ib_dev;
+        struct mlx4_wqe_mlx_seg *mlx = wqe;
+        struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx;
+        struct mlx4_ib_ah *ah = to_mah(wr->wr.ud.ah);
+        u16 pkey;
+        int send_size;
+        int header_size;
+        int i;
+
+        send_size = 0;
+        for (i = 0; i < wr->num_sge; ++i)
+                send_size += wr->sg_list[i].length;
+
+        ib_ud_header_init(send_size, mlx4_ib_ah_grh_present(ah), &sqp->ud_header);
+
+        sqp->ud_header.lrh.service_level   =
+                be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 28;
+        sqp->ud_header.lrh.destination_lid = ah->av.dlid;
+        sqp->ud_header.lrh.source_lid      = cpu_to_be16(ah->av.g_slid & 0x7f);
+        if (mlx4_ib_ah_grh_present(ah)) {
+                sqp->ud_header.grh.traffic_class =
+                        (be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 20) & 0xff;
+                sqp->ud_header.grh.flow_label    =
+                        ah->av.sl_tclass_flowlabel & cpu_to_be32(0xfffff);
+                sqp->ud_header.grh.hop_limit     = ah->av.hop_limit;
+                ib_get_cached_gid(ib_dev, be32_to_cpu(ah->av.port_pd) >> 24,
+                                  ah->av.gid_index, &sqp->ud_header.grh.source_gid);
+                memcpy(sqp->ud_header.grh.destination_gid.raw,
+                       ah->av.dgid, 16);
+        }
+
+        mlx->flags &= cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE);
+        mlx->flags |= cpu_to_be32((!sqp->qp.ibqp.qp_num ? MLX4_WQE_MLX_VL15 : 0) |
+                                  (sqp->ud_header.lrh.destination_lid ==
+                                   IB_LID_PERMISSIVE ? MLX4_WQE_MLX_SLR : 0) |
+                                  (sqp->ud_header.lrh.service_level << 8));
+        mlx->rlid   = sqp->ud_header.lrh.destination_lid;
+
+        switch (wr->opcode) {
+        case IB_WR_SEND:
+                sqp->ud_header.bth.opcode        = IB_OPCODE_UD_SEND_ONLY;
+                sqp->ud_header.immediate_present = 0;
+                break;
+        case IB_WR_SEND_WITH_IMM:
+                sqp->ud_header.bth.opcode        = IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE;
+                sqp->ud_header.immediate_present = 1;
+                sqp->ud_header.immediate_data    = wr->imm_data;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        sqp->ud_header.lrh.virtual_lane    = !sqp->qp.ibqp.qp_num ? 15 : 0;
+        if (sqp->ud_header.lrh.destination_lid == IB_LID_PERMISSIVE)
+                sqp->ud_header.lrh.source_lid = IB_LID_PERMISSIVE;
+        sqp->ud_header.bth.solicited_event = !!(wr->send_flags & IB_SEND_SOLICITED);
+        if (!sqp->qp.ibqp.qp_num)
+                ib_get_cached_pkey(ib_dev, sqp->qp.port, sqp->pkey_index, &pkey);
+        else
+                ib_get_cached_pkey(ib_dev, sqp->qp.port, wr->wr.ud.pkey_index, &pkey);
+        sqp->ud_header.bth.pkey = cpu_to_be16(pkey);
+        sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->wr.ud.remote_qpn);
+        sqp->ud_header.bth.psn = cpu_to_be32((sqp->send_psn++) & ((1 << 24) - 1));
+        sqp->ud_header.deth.qkey = cpu_to_be32(wr->wr.ud.remote_qkey & 0x80000000 ?
+                                               sqp->qkey : wr->wr.ud.remote_qkey);
+        sqp->ud_header.deth.source_qpn = cpu_to_be32(sqp->qp.ibqp.qp_num);
+
+        header_size = ib_ud_header_pack(&sqp->ud_header, sqp->header_buf);
+
+        if (0) {
+                printk(KERN_ERR "built UD header of size %d:\n", header_size);
+                for (i = 0; i < header_size / 4; ++i) {
+                        if (i % 8 == 0)
+                                printk("  [%02x] ", i * 4);
+                        printk(" %08x",
+                               be32_to_cpu(((__be32 *) sqp->header_buf)[i]));
+                        if ((i + 1) % 8 == 0)
+                                printk("\n");
+                }
+                printk("\n");
+        }
+
+        inl->byte_count = cpu_to_be32(1 << 31 | header_size);
+        memcpy(inl + 1, sqp->header_buf, header_size);
+
+        return ALIGN(sizeof (struct mlx4_wqe_inline_seg) + header_size, 16);
+}
+
+static int mlx4_wq_overflow(struct mlx4_ib_wq *wq, int nreq, struct ib_cq *ib_cq)
+{
+        unsigned cur;
+        struct mlx4_ib_cq *cq;
+
+        cur = wq->head - wq->tail;
+        if (likely(cur + nreq < wq->max))
+                return 0;
+
+        cq = to_mcq(ib_cq);
+        spin_lock(&cq->lock);
+        cur = wq->head - wq->tail;
+        spin_unlock(&cq->lock);
+
+        return cur + nreq >= wq->max;
+}
+
+int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
+                      struct ib_send_wr **bad_wr)
+{
+        struct mlx4_ib_qp *qp = to_mqp(ibqp);
+        void *wqe;
+        struct mlx4_wqe_ctrl_seg *ctrl;
+        unsigned long flags;
+        int nreq;
+        int err = 0;
+        int ind;
+        int size;
+        int i;
+
+        spin_lock_irqsave(&qp->rq.lock, flags);
+
+        ind = qp->sq.head;
+
+        for (nreq = 0; wr; ++nreq, wr = wr->next) {
+                if (mlx4_wq_overflow(&qp->sq, nreq, qp->ibqp.send_cq)) {
+                        err = -ENOMEM;
+                        *bad_wr = wr;
+                        goto out;
+                }
+
+                if (unlikely(wr->num_sge > qp->sq.max_gs)) {
+                        err = -EINVAL;
+                        *bad_wr = wr;
+                        goto out;
+                }
+
+                ctrl = wqe = get_send_wqe(qp, ind & (qp->sq.max - 1));
+                qp->sq.wrid[ind & (qp->sq.max - 1)] = wr->wr_id;
+
+                ctrl->srcrb_flags =
+                        (wr->send_flags & IB_SEND_SIGNALED ?
+                         cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE) : 0) |
+                        (wr->send_flags & IB_SEND_SOLICITED ?
+                         cpu_to_be32(MLX4_WQE_CTRL_SOLICITED) : 0) |
+                        qp->sq_signal_bits;
+
+                if (wr->opcode == IB_WR_SEND_WITH_IMM ||
+                    wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM)
+                        ctrl->imm = wr->imm_data;
+                else
+                        ctrl->imm = 0;
+
+                wqe += sizeof *ctrl;
+                size = sizeof *ctrl / 16;
+
+                switch (ibqp->qp_type) {
+                case IB_QPT_RC:
+                case IB_QPT_UC:
+                        switch (wr->opcode) {
+                        case IB_WR_ATOMIC_CMP_AND_SWP:
+                        case IB_WR_ATOMIC_FETCH_AND_ADD:
+                                ((struct mlx4_wqe_raddr_seg *) wqe)->raddr =
+                                        cpu_to_be64(wr->wr.atomic.remote_addr);
+                                ((struct mlx4_wqe_raddr_seg *) wqe)->rkey =
+                                        cpu_to_be32(wr->wr.atomic.rkey);
+                                ((struct mlx4_wqe_raddr_seg *) wqe)->reserved = 0;
+
+                                wqe  += sizeof (struct mlx4_wqe_raddr_seg);
+
+                                if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP) {
+                                        ((struct mlx4_wqe_atomic_seg *) wqe)->swap_add =
+                                                cpu_to_be64(wr->wr.atomic.swap);
+                                        ((struct mlx4_wqe_atomic_seg *) wqe)->compare =
+                                                cpu_to_be64(wr->wr.atomic.compare_add);
+                                } else {
+                                        ((struct mlx4_wqe_atomic_seg *) wqe)->swap_add =
+                                                cpu_to_be64(wr->wr.atomic.compare_add);
+                                        ((struct mlx4_wqe_atomic_seg *) wqe)->compare = 0;
+                                }
+
+                                wqe  += sizeof (struct mlx4_wqe_atomic_seg);
+                                size += (sizeof (struct mlx4_wqe_raddr_seg) +
+                                         sizeof (struct mlx4_wqe_atomic_seg)) / 16;
+
+                                break;
+
+                        case IB_WR_RDMA_READ:
+                        case IB_WR_RDMA_WRITE:
+                        case IB_WR_RDMA_WRITE_WITH_IMM:
+                                ((struct mlx4_wqe_raddr_seg *) wqe)->raddr =
+                                        cpu_to_be64(wr->wr.rdma.remote_addr);
+                                ((struct mlx4_wqe_raddr_seg *) wqe)->rkey =
+                                        cpu_to_be32(wr->wr.rdma.rkey);
+                                ((struct mlx4_wqe_raddr_seg *) wqe)->reserved = 0;
+
+                                wqe  += sizeof (struct mlx4_wqe_raddr_seg);
+                                size += sizeof (struct mlx4_wqe_raddr_seg) / 16;
+
+                                break;
+
+                        default:
+                                /* No extra segments required for sends */
+                                break;
+                        }
+                        break;
+
+                case IB_QPT_UD:
+                        memcpy(((struct mlx4_wqe_datagram_seg *) wqe)->av,
+                               &to_mah(wr->wr.ud.ah)->av, sizeof (struct mlx4_av));
+                        ((struct mlx4_wqe_datagram_seg *) wqe)->dqpn =
+                                cpu_to_be32(wr->wr.ud.remote_qpn);
+                        ((struct mlx4_wqe_datagram_seg *) wqe)->qkey =
+                                cpu_to_be32(wr->wr.ud.remote_qkey);
+
+                        wqe  += sizeof (struct mlx4_wqe_datagram_seg);
+                        size += sizeof (struct mlx4_wqe_datagram_seg) / 16;
+                        break;
+
+                case IB_QPT_SMI:
+                case IB_QPT_GSI:
+                        err = build_mlx_header(to_msqp(qp), wr, ctrl);
+                        if (err < 0) {
+                                *bad_wr = wr;
+                                goto out;
+                        }
+                        wqe  += err;
+                        size += err / 16;
+
+                        err = 0;
+                        break;
+
+                default:
+                        break;
+                }
+
+                for (i = 0; i < wr->num_sge; ++i) {
+                        ((struct mlx4_wqe_data_seg *) wqe)->byte_count =
+                                cpu_to_be32(wr->sg_list[i].length);
+                        ((struct mlx4_wqe_data_seg *) wqe)->lkey =
+                                cpu_to_be32(wr->sg_list[i].lkey);
+                        ((struct mlx4_wqe_data_seg *) wqe)->addr =
+                                cpu_to_be64(wr->sg_list[i].addr);
+
+                        wqe  += sizeof (struct mlx4_wqe_data_seg);
+                        size += sizeof (struct mlx4_wqe_data_seg) / 16;
+                }
+
+                /* Add one more inline data segment for ICRC for MLX sends */
+                if (qp->ibqp.qp_type == IB_QPT_SMI || qp->ibqp.qp_type == IB_QPT_GSI) {
+                        ((struct mlx4_wqe_inline_seg *) wqe)->byte_count =
+                                cpu_to_be32((1 << 31) | 4);
+                        ((u32 *) wqe)[1] = 0;
+                        wqe  += sizeof (struct mlx4_wqe_data_seg);
+                        size += sizeof (struct mlx4_wqe_data_seg) / 16;
+                }
+
+                ctrl->fence_size = (wr->send_flags & IB_SEND_FENCE ?
+                                    MLX4_WQE_CTRL_FENCE : 0) | size;
+
+                /*
+                 * Make sure descriptor is fully written before
+                 * setting ownership bit (because HW can start
+                 * executing as soon as we do).
+                 */
+                wmb();
+
+                if (wr->opcode < 0 || wr->opcode >= ARRAY_SIZE(mlx4_ib_opcode)) {
+                        err = -EINVAL;
+                        goto out;
+                }
+
+                ctrl->owner_opcode = mlx4_ib_opcode[wr->opcode] |
+                        (ind & qp->sq.max ? cpu_to_be32(1 << 31) : 0);
+
+                ++ind;
+        }
+
+out:
+        if (likely(nreq)) {
+                qp->sq.head += nreq;
+
+                /*
+                 * Make sure that descriptors are written before
+                 * doorbell record.
+                 */
+                wmb();
+
+                writel(qp->doorbell_qpn,
+                       to_mdev(ibqp->device)->uar_map + MLX4_SEND_DOORBELL);
+
+                /*
+                 * Make sure doorbells don't leak out of SQ spinlock
+                 * and reach the HCA out of order.
+                 */
+                mmiowb();
+        }
+
+        spin_unlock_irqrestore(&qp->rq.lock, flags);
+
+        return err;
+}
+
+int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr,
+                      struct ib_recv_wr **bad_wr)
+{
+        struct mlx4_ib_qp *qp = to_mqp(ibqp);
+        struct mlx4_wqe_data_seg *scat;
+        unsigned long flags;
+        int err = 0;
+        int nreq;
+        int ind;
+        int i;
+
+        spin_lock_irqsave(&qp->rq.lock, flags);
+
+        ind = qp->rq.head & (qp->rq.max - 1);
+
+        for (nreq = 0; wr; ++nreq, wr = wr->next) {
+                if (mlx4_wq_overflow(&qp->rq, nreq, qp->ibqp.send_cq)) {
+                        err = -ENOMEM;
+                        *bad_wr = wr;
+                        goto out;
+                }
+
+                if (unlikely(wr->num_sge > qp->rq.max_gs)) {
+                        err = -EINVAL;
+                        *bad_wr = wr;
+                        goto out;
+                }
+
+                scat = get_recv_wqe(qp, ind);
+
+                for (i = 0; i < wr->num_sge; ++i) {
+                        scat[i].byte_count = cpu_to_be32(wr->sg_list[i].length);
+                        scat[i].lkey       = cpu_to_be32(wr->sg_list[i].lkey);
+                        scat[i].addr       = cpu_to_be64(wr->sg_list[i].addr);
+                }
+
+                if (i < qp->rq.max_gs) {
+                        scat[i].byte_count = 0;
+                        scat[i].lkey       = cpu_to_be32(MLX4_INVALID_LKEY);
+                        scat[i].addr       = 0;
+                }
+
+                qp->rq.wrid[ind] = wr->wr_id;
+
+                ind = (ind + 1) & (qp->rq.max - 1);
+        }
+
+out:
+        if (likely(nreq)) {
+                qp->rq.head += nreq;
+
+                /*
+                 * Make sure that descriptors are written before
+                 * doorbell record.
+                 */
+                wmb();
+
+                *qp->db.db = cpu_to_be32(qp->rq.head & 0xffff);
+        }
+
+        spin_unlock_irqrestore(&qp->rq.lock, flags);
+
+        return err;
+}
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
new file mode 100644
index 000000000000..12fac1c8989d
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/mlx4/qp.h>
+#include <linux/mlx4/srq.h>
+
+#include "mlx4_ib.h"
+#include "user.h"
+
+static void *get_wqe(struct mlx4_ib_srq *srq, int n)
+{
+        int offset = n << srq->msrq.wqe_shift;
+
+        if (srq->buf.nbufs == 1)
+                return srq->buf.u.direct.buf + offset;
+        else
+                return srq->buf.u.page_list[offset >> PAGE_SHIFT].buf +
+                        (offset & (PAGE_SIZE - 1));
+}
+
+static void mlx4_ib_srq_event(struct mlx4_srq *srq, enum mlx4_event type)
+{
+        struct ib_event event;
+        struct ib_srq *ibsrq = &to_mibsrq(srq)->ibsrq;
+
+        if (ibsrq->event_handler) {
+                event.device      = ibsrq->device;
+                event.element.srq = ibsrq;
+                switch (type) {
+                case MLX4_EVENT_TYPE_SRQ_LIMIT:
+                        event.event = IB_EVENT_SRQ_LIMIT_REACHED;
+                        break;
+                case MLX4_EVENT_TYPE_SRQ_CATAS_ERROR:
+                        event.event = IB_EVENT_SRQ_ERR;
+                        break;
+                default:
+                        printk(KERN_WARNING "mlx4_ib: Unexpected event type %d "
+                               "on SRQ %06x\n", type, srq->srqn);
+                        return;
+                }
+
+                ibsrq->event_handler(&event, ibsrq->srq_context);
+        }
+}
+
+struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
+                                  struct ib_srq_init_attr *init_attr,
+                                  struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(pd->device);
+        struct mlx4_ib_srq *srq;
+        struct mlx4_wqe_srq_next_seg *next;
+        int desc_size;
+        int buf_size;
+        int err;
+        int i;
+
+        /* Sanity check SRQ size before proceeding */
+        if (init_attr->attr.max_wr  >= dev->dev->caps.max_srq_wqes ||
+            init_attr->attr.max_sge >  dev->dev->caps.max_srq_sge)
+                return ERR_PTR(-EINVAL);
+
+        srq = kmalloc(sizeof *srq, GFP_KERNEL);
+        if (!srq)
+                return ERR_PTR(-ENOMEM);
+
+        mutex_init(&srq->mutex);
+        spin_lock_init(&srq->lock);
+        srq->msrq.max    = roundup_pow_of_two(init_attr->attr.max_wr + 1);
+        srq->msrq.max_gs = init_attr->attr.max_sge;
+
+        desc_size = max(32UL,
+                        roundup_pow_of_two(sizeof (struct mlx4_wqe_srq_next_seg) +
+                                           srq->msrq.max_gs *
+                                           sizeof (struct mlx4_wqe_data_seg)));
+        srq->msrq.wqe_shift = ilog2(desc_size);
+
+        buf_size = srq->msrq.max * desc_size;
+
+        if (pd->uobject) {
+                struct mlx4_ib_create_srq ucmd;
+
+                if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+                        err = -EFAULT;
+                        goto err_srq;
+                }
+
+                srq->umem = ib_umem_get(pd->uobject->context, ucmd.buf_addr,
+                                        buf_size, 0);
+                if (IS_ERR(srq->umem)) {
+                        err = PTR_ERR(srq->umem);
+                        goto err_srq;
+                }
+
+                err = mlx4_mtt_init(dev->dev, ib_umem_page_count(srq->umem),
+                                    ilog2(srq->umem->page_size), &srq->mtt);
+                if (err)
+                        goto err_buf;
+
+                err = mlx4_ib_umem_write_mtt(dev, &srq->mtt, srq->umem);
+                if (err)
+                        goto err_mtt;
+
+                err = mlx4_ib_db_map_user(to_mucontext(pd->uobject->context),
+                                          ucmd.db_addr, &srq->db);
+                if (err)
+                        goto err_mtt;
+        } else {
+                err = mlx4_ib_db_alloc(dev, &srq->db, 0);
+                if (err)
+                        goto err_srq;
+
+                *srq->db.db = 0;
+
+                if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2, &srq->buf)) {
+                        err = -ENOMEM;
+                        goto err_db;
+                }
+
+                srq->head    = 0;
+                srq->tail    = srq->msrq.max - 1;
+                srq->wqe_ctr = 0;
+
+                for (i = 0; i < srq->msrq.max; ++i) {
+                        next = get_wqe(srq, i);
+                        next->next_wqe_index =
+                                cpu_to_be16((i + 1) & (srq->msrq.max - 1));
+                }
+
+                err = mlx4_mtt_init(dev->dev, srq->buf.npages, srq->buf.page_shift,
+                                    &srq->mtt);
+                if (err)
+                        goto err_buf;
+
+                err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf);
+                if (err)
+                        goto err_mtt;
+
+                srq->wrid = kmalloc(srq->msrq.max * sizeof (u64), GFP_KERNEL);
+                if (!srq->wrid) {
+                        err = -ENOMEM;
+                        goto err_mtt;
+                }
+        }
+
+        err = mlx4_srq_alloc(dev->dev, to_mpd(pd)->pdn, &srq->mtt,
+                             srq->db.dma, &srq->msrq);
+        if (err)
+                goto err_wrid;
+
+        srq->msrq.event = mlx4_ib_srq_event;
+
+        if (pd->uobject)
+                if (ib_copy_to_udata(udata, &srq->msrq.srqn, sizeof (__u32))) {
+                        err = -EFAULT;
+                        goto err_wrid;
+                }
+
+        init_attr->attr.max_wr = srq->msrq.max - 1;
+
+        return &srq->ibsrq;
+
+err_wrid:
+        if (pd->uobject)
+                mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &srq->db);
+        else
+                kfree(srq->wrid);
+
+err_mtt:
+        mlx4_mtt_cleanup(dev->dev, &srq->mtt);
+
+err_buf:
+        if (pd->uobject)
+                ib_umem_release(srq->umem);
+        else
+                mlx4_buf_free(dev->dev, buf_size, &srq->buf);
+
+err_db:
+        if (!pd->uobject)
+                mlx4_ib_db_free(dev, &srq->db);
+
+err_srq:
+        kfree(srq);
+
+        return ERR_PTR(err);
+}
+
+int mlx4_ib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
+                       enum ib_srq_attr_mask attr_mask, struct ib_udata *udata)
+{
+        struct mlx4_ib_dev *dev = to_mdev(ibsrq->device);
+        struct mlx4_ib_srq *srq = to_msrq(ibsrq);
+        int ret;
+
+        /* We don't support resizing SRQs (yet?) */
+        if (attr_mask & IB_SRQ_MAX_WR)
+                return -EINVAL;
+
+        if (attr_mask & IB_SRQ_LIMIT) {
+                if (attr->srq_limit >= srq->msrq.max)
+                        return -EINVAL;
+
+                mutex_lock(&srq->mutex);
+                ret = mlx4_srq_arm(dev->dev, &srq->msrq, attr->srq_limit);
+                mutex_unlock(&srq->mutex);
+
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+int mlx4_ib_destroy_srq(struct ib_srq *srq)
+{
+        struct mlx4_ib_dev *dev = to_mdev(srq->device);
+        struct mlx4_ib_srq *msrq = to_msrq(srq);
+
+        mlx4_srq_free(dev->dev, &msrq->msrq);
+        mlx4_mtt_cleanup(dev->dev, &msrq->mtt);
+
+        if (srq->uobject) {
+                mlx4_ib_db_unmap_user(to_mucontext(srq->uobject->context), &msrq->db);
+                ib_umem_release(msrq->umem);
+        } else {
+                kfree(msrq->wrid);
+                mlx4_buf_free(dev->dev, msrq->msrq.max << msrq->msrq.wqe_shift,
+                              &msrq->buf);
+                mlx4_ib_db_free(dev, &msrq->db);
+        }
+
+        kfree(msrq);
+
+        return 0;
+}
+
+void mlx4_ib_free_srq_wqe(struct mlx4_ib_srq *srq, int wqe_index)
+{
+        struct mlx4_wqe_srq_next_seg *next;
+
+        /* always called with interrupts disabled. */
+        spin_lock(&srq->lock);
+
+        next = get_wqe(srq, srq->tail);
+        next->next_wqe_index = cpu_to_be16(wqe_index);
+        srq->tail = wqe_index;
+
+        spin_unlock(&srq->lock);
+}
+
+int mlx4_ib_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
+                          struct ib_recv_wr **bad_wr)
+{
+        struct mlx4_ib_srq *srq = to_msrq(ibsrq);
+        struct mlx4_wqe_srq_next_seg *next;
+        struct mlx4_wqe_data_seg *scat;
+        unsigned long flags;
+        int err = 0;
+        int nreq;
+        int i;
+
+        spin_lock_irqsave(&srq->lock, flags);
+
+        for (nreq = 0; wr; ++nreq, wr = wr->next) {
+                if (unlikely(wr->num_sge > srq->msrq.max_gs)) {
+                        err = -EINVAL;
+                        *bad_wr = wr;
+                        break;
+                }
+
+                if (unlikely(srq->head == srq->tail)) {
+                        err = -ENOMEM;
+                        *bad_wr = wr;
+                        break;
+                }
+
+                srq->wrid[srq->head] = wr->wr_id;
+
+                next      = get_wqe(srq, srq->head);
+                srq->head = be16_to_cpu(next->next_wqe_index);
+                scat      = (struct mlx4_wqe_data_seg *) (next + 1);
+
+                for (i = 0; i < wr->num_sge; ++i) {
+                        scat[i].byte_count = cpu_to_be32(wr->sg_list[i].length);
+                        scat[i].lkey       = cpu_to_be32(wr->sg_list[i].lkey);
+                        scat[i].addr       = cpu_to_be64(wr->sg_list[i].addr);
+                }
+
+                if (i < srq->msrq.max_gs) {
+                        scat[i].byte_count = 0;
+                        scat[i].lkey       = cpu_to_be32(MLX4_INVALID_LKEY);
+                        scat[i].addr       = 0;
+                }
+        }
+
+        if (likely(nreq)) {
+                srq->wqe_ctr += nreq;
+
+                /*
+                 * Make sure that descriptors are written before
+                 * doorbell record.
+                 */
+                wmb();
+
+                *srq->db.db = cpu_to_be32(srq->wqe_ctr);
+        }
+
+        spin_unlock_irqrestore(&srq->lock, flags);
+
+        return err;
+}
diff --git a/drivers/infiniband/hw/mlx4/user.h b/drivers/infiniband/hw/mlx4/user.h
new file mode 100644
index 000000000000..88c72d56368b
--- /dev/null
+++ b/drivers/infiniband/hw/mlx4/user.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX4_IB_USER_H
+#define MLX4_IB_USER_H
+
+#include <linux/types.h>
+
+/*
+ * Increment this value if any changes that break userspace ABI
+ * compatibility are made.
+ */
+#define MLX4_IB_UVERBS_ABI_VERSION      2
+
+/*
+ * Make sure that all structs defined in this file remain laid out so
+ * that they pack the same way on 32-bit and 64-bit architectures (to
+ * avoid incompatibility between 32-bit userspace and 64-bit kernels).
+ * In particular do not use pointer types -- pass pointers in __u64
+ * instead.
+ */
+
+struct mlx4_ib_alloc_ucontext_resp {
+        __u32   qp_tab_size;
+        __u16   bf_reg_size;
+        __u16   bf_regs_per_page;
+};
+
+struct mlx4_ib_alloc_pd_resp {
+        __u32   pdn;
+        __u32   reserved;
+};
+
+struct mlx4_ib_create_cq {
+        __u64   buf_addr;
+        __u64   db_addr;
+};
+
+struct mlx4_ib_create_cq_resp {
+        __u32   cqn;
+        __u32   reserved;
+};
+
+struct mlx4_ib_resize_cq {
+        __u64   buf_addr;
+};
+
+struct mlx4_ib_create_srq {
+        __u64   buf_addr;
+        __u64   db_addr;
+};
+
+struct mlx4_ib_create_srq_resp {
+        __u32   srqn;
+        __u32   reserved;
+};
+
+struct mlx4_ib_create_qp {
+        __u64   buf_addr;
+        __u64   db_addr;
+        __u8    log_sq_bb_count;
+        __u8    log_sq_stride;
+        __u8    reserved[6];
+};
+
+#endif /* MLX4_IB_USER_H */
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index 27caf3b0648a..4b111a852ff6 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -279,6 +279,7 @@ int mthca_read_ah(struct mthca_dev *dev, struct mthca_ah *ah,
                         (be32_to_cpu(ah->av->sl_tclass_flowlabel) >> 20) & 0xff;
                 header->grh.flow_label    =
                         ah->av->sl_tclass_flowlabel & cpu_to_be32(0xfffff);
+                header->grh.hop_limit     = ah->av->hop_limit;
                 ib_get_cached_gid(&dev->ib_dev,
                                   be32_to_cpu(ah->av->port_pd) >> 24,
                                   ah->av->gid_index % dev->limits.gid_table_len,
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 71314460b11e..38102520ffb3 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -37,6 +37,7 @@
 #include <linux/completion.h>
 #include <linux/pci.h>
 #include <linux/errno.h>
+#include <linux/sched.h>
 #include <asm/io.h>
 #include <rdma/ib_mad.h>
 
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index cf0868f6e965..be6e1e03bdab 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -37,6 +37,7 @@
  */
 
 #include <linux/hardirq.h>
+#include <linux/sched.h>
 
 #include <asm/io.h>
 
@@ -284,7 +285,7 @@ void mthca_cq_clean(struct mthca_dev *dev, struct mthca_cq *cq, u32 qpn,
 {
         struct mthca_cqe *cqe;
         u32 prod_index;
-        int nfreed = 0;
+        int i, nfreed = 0;
 
         spin_lock_irq(&cq->lock);
 
@@ -321,6 +322,8 @@ void mthca_cq_clean(struct mthca_dev *dev, struct mthca_cq *cq, u32 qpn,
         }
 
         if (nfreed) {
+                for (i = 0; i < nfreed; ++i)
+                        set_cqe_hw(get_cqe(cq, (cq->cons_index + i) & cq->ibcq.cqe));
                 wmb();
                 cq->cons_index += nfreed;
                 update_cons_index(dev, cq, nfreed);
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 773145e29947..aa563e61de65 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -1250,12 +1250,14 @@ static void __mthca_remove_one(struct pci_dev *pdev)
 int __mthca_restart_one(struct pci_dev *pdev)
 {
         struct mthca_dev *mdev;
+        int hca_type;
 
         mdev = pci_get_drvdata(pdev);
         if (!mdev)
                 return -ENODEV;
+        hca_type = mdev->hca_type;
         __mthca_remove_one(pdev);
-        return __mthca_init_one(pdev, mdev->hca_type);
+        return __mthca_init_one(pdev, hca_type);
 }
 
 static int __devinit mthca_init_one(struct pci_dev *pdev,
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 48f7c65e9aed..e61f3e626980 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -36,6 +36,7 @@
 
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
+#include <linux/sched.h>
 
 #include <asm/page.h>
 
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 1c05486c3c68..6bcde1cb9688 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -37,6 +37,7 @@
  */
 
 #include <rdma/ib_smi.h>
+#include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 #include <linux/mm.h>
 
@@ -908,6 +909,8 @@ static struct ib_mr *mthca_get_dma_mr(struct ib_pd *pd, int acc)
                 return ERR_PTR(err);
         }
 
+        mr->umem = NULL;
+
         return &mr->ibmr;
 }
 
@@ -1003,11 +1006,13 @@ static struct ib_mr *mthca_reg_phys_mr(struct ib_pd       *pd,
         }
 
         kfree(page_list);
+        mr->umem = NULL;
+
         return &mr->ibmr;
 }
 
-static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
-                                       int acc, struct ib_udata *udata)
+static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+                                       u64 virt, int acc, struct ib_udata *udata)
 {
         struct mthca_dev *dev = to_mdev(pd->device);
         struct ib_umem_chunk *chunk;
@@ -1018,20 +1023,26 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
         int err = 0;
         int write_mtt_size;
 
-        shift = ffs(region->page_size) - 1;
-
         mr = kmalloc(sizeof *mr, GFP_KERNEL);
         if (!mr)
                 return ERR_PTR(-ENOMEM);
 
+        mr->umem = ib_umem_get(pd->uobject->context, start, length, acc);
+        if (IS_ERR(mr->umem)) {
+                err = PTR_ERR(mr->umem);
+                goto err;
+        }
+
+        shift = ffs(mr->umem->page_size) - 1;
+
         n = 0;
-        list_for_each_entry(chunk, &region->chunk_list, list)
+        list_for_each_entry(chunk, &mr->umem->chunk_list, list)
                 n += chunk->nents;
 
         mr->mtt = mthca_alloc_mtt(dev, n);
         if (IS_ERR(mr->mtt)) {
                 err = PTR_ERR(mr->mtt);
-                goto err;
+                goto err_umem;
         }
 
         pages = (u64 *) __get_free_page(GFP_KERNEL);
@@ -1044,12 +1055,12 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,
 
         write_mtt_size = min(mthca_write_mtt_size(dev), (int) (PAGE_SIZE / sizeof *pages));
 
-        list_for_each_entry(chunk, &region->chunk_list, list)
+        list_for_each_entry(chunk, &mr->umem->chunk_list, list)
                 for (j = 0; j < chunk->nmap; ++j) {
                         len = sg_dma_len(&chunk->page_list[j]) >> shift;
                         for (k = 0; k < len; ++k) {
                                 pages[i++] = sg_dma_address(&chunk->page_list[j]) +
-                                        region->page_size * k;
+                                        mr->umem->page_size * k;
                                 /*
                                  * Be friendly to write_mtt and pass it chunks
                                  * of appropriate size.
@@ -1071,8 +1082,8 @@ mtt_done:
         if (err)
                 goto err_mtt;
 
-        err = mthca_mr_alloc(dev, to_mpd(pd)->pd_num, shift, region->virt_base,
-                             region->length, convert_access(acc), mr);
+        err = mthca_mr_alloc(dev, to_mpd(pd)->pd_num, shift, virt, length,
+                             convert_access(acc), mr);
 
         if (err)
                 goto err_mtt;
@@ -1082,6 +1093,9 @@ mtt_done:
 err_mtt:
         mthca_free_mtt(dev, mr->mtt);
 
+err_umem:
+        ib_umem_release(mr->umem);
+
 err:
         kfree(mr);
         return ERR_PTR(err);
@@ -1090,8 +1104,12 @@ err:
 static int mthca_dereg_mr(struct ib_mr *mr)
 {
         struct mthca_mr *mmr = to_mmr(mr);
+
         mthca_free_mr(to_mdev(mr->device), mmr);
+        if (mmr->umem)
+                ib_umem_release(mmr->umem);
         kfree(mmr);
+
         return 0;
 }
 
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
index 1d266ac2e094..262616c8ebb6 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -73,6 +73,7 @@ struct mthca_mtt;
 
 struct mthca_mr {
         struct ib_mr      ibmr;
+        struct ib_umem   *umem;
         struct mthca_mtt *mtt;
 };
 
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index fee60c852d14..027664979fe2 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -37,6 +37,7 @@
 
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/sched.h>
 
 #include <asm/io.h>
 
@@ -295,7 +296,7 @@ static int to_mthca_st(int transport)
         }
 }
 
-static void store_attrs(struct mthca_sqp *sqp, struct ib_qp_attr *attr,
+static void store_attrs(struct mthca_sqp *sqp, const struct ib_qp_attr *attr,
                         int attr_mask)
 {
         if (attr_mask & IB_QP_PKEY_INDEX)
@@ -327,7 +328,7 @@ static void init_port(struct mthca_dev *dev, int port)
                 mthca_warn(dev, "INIT_IB returned status %02x.\n", status);
 }
 
-static __be32 get_hw_access_flags(struct mthca_qp *qp, struct ib_qp_attr *attr,
+static __be32 get_hw_access_flags(struct mthca_qp *qp, const struct ib_qp_attr *attr,
                                   int attr_mask)
 {
         u8 dest_rd_atomic;
@@ -510,7 +511,7 @@ out:
         return err;
 }
 
-static int mthca_path_set(struct mthca_dev *dev, struct ib_ah_attr *ah,
+static int mthca_path_set(struct mthca_dev *dev, const struct ib_ah_attr *ah,
                           struct mthca_qp_path *path, u8 port)
 {
         path->g_mylmc     = ah->src_path_bits & 0x7f;
@@ -538,12 +539,12 @@ static int mthca_path_set(struct mthca_dev *dev, struct ib_ah_attr *ah,
         return 0;
 }
 
-int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
-                    struct ib_udata *udata)
+static int __mthca_modify_qp(struct ib_qp *ibqp,
+                             const struct ib_qp_attr *attr, int attr_mask,
+                             enum ib_qp_state cur_state, enum ib_qp_state new_state)
 {
         struct mthca_dev *dev = to_mdev(ibqp->device);
         struct mthca_qp *qp = to_mqp(ibqp);
-        enum ib_qp_state cur_state, new_state;
         struct mthca_mailbox *mailbox;
         struct mthca_qp_param *qp_param;
         struct mthca_qp_context *qp_context;
@@ -551,60 +552,6 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
         u8 status;
         int err = -EINVAL;
 
-        mutex_lock(&qp->mutex);
-
-        if (attr_mask & IB_QP_CUR_STATE) {
-                cur_state = attr->cur_qp_state;
-        } else {
-                spin_lock_irq(&qp->sq.lock);
-                spin_lock(&qp->rq.lock);
-                cur_state = qp->state;
-                spin_unlock(&qp->rq.lock);
-                spin_unlock_irq(&qp->sq.lock);
-        }
-
-        new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
-
-        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
-                mthca_dbg(dev, "Bad QP transition (transport %d) "
-                          "%d->%d with attr 0x%08x\n",
-                          qp->transport, cur_state, new_state,
-                          attr_mask);
-                goto out;
-        }
-
-        if (cur_state == new_state && cur_state == IB_QPS_RESET) {
-                err = 0;
-                goto out;
-        }
-
-        if ((attr_mask & IB_QP_PKEY_INDEX) &&
-             attr->pkey_index >= dev->limits.pkey_table_len) {
-                mthca_dbg(dev, "P_Key index (%u) too large. max is %d\n",
-                          attr->pkey_index, dev->limits.pkey_table_len-1);
-                goto out;
-        }
-
-        if ((attr_mask & IB_QP_PORT) &&
-            (attr->port_num == 0 || attr->port_num > dev->limits.num_ports)) {
-                mthca_dbg(dev, "Port number (%u) is invalid\n", attr->port_num);
-                goto out;
-        }
-
-        if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
-            attr->max_rd_atomic > dev->limits.max_qp_init_rdma) {
-                mthca_dbg(dev, "Max rdma_atomic as initiator %u too large (max is %d)\n",
-                          attr->max_rd_atomic, dev->limits.max_qp_init_rdma);
-                goto out;
-        }
-
-        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
-            attr->max_dest_rd_atomic > 1 << dev->qp_table.rdb_shift) {
-                mthca_dbg(dev, "Max rdma_atomic as responder %u too large (max %d)\n",
-                          attr->max_dest_rd_atomic, 1 << dev->qp_table.rdb_shift);
-                goto out;
-        }
-
         mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
         if (IS_ERR(mailbox)) {
                 err = PTR_ERR(mailbox);
@@ -891,6 +838,98 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
 
 out_mailbox:
         mthca_free_mailbox(dev, mailbox);
+out:
+        return err;
+}
+
+static const struct ib_qp_attr dummy_init_attr = { .port_num = 1 };
+static const int dummy_init_attr_mask[] = {
+        [IB_QPT_UD]  = (IB_QP_PKEY_INDEX                |
+                        IB_QP_PORT                      |
+                        IB_QP_QKEY),
+        [IB_QPT_UC]  = (IB_QP_PKEY_INDEX                |
+                        IB_QP_PORT                      |
+                        IB_QP_ACCESS_FLAGS),
+        [IB_QPT_RC]  = (IB_QP_PKEY_INDEX                |
+                        IB_QP_PORT                      |
+                        IB_QP_ACCESS_FLAGS),
+        [IB_QPT_SMI] = (IB_QP_PKEY_INDEX                |
+                        IB_QP_QKEY),
+        [IB_QPT_GSI] = (IB_QP_PKEY_INDEX                |
+                        IB_QP_QKEY),
+};
+
+int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
+                    struct ib_udata *udata)
+{
+        struct mthca_dev *dev = to_mdev(ibqp->device);
+        struct mthca_qp *qp = to_mqp(ibqp);
+        enum ib_qp_state cur_state, new_state;
+        int err = -EINVAL;
+
+        mutex_lock(&qp->mutex);
+        if (attr_mask & IB_QP_CUR_STATE) {
+                cur_state = attr->cur_qp_state;
+        } else {
+                spin_lock_irq(&qp->sq.lock);
+                spin_lock(&qp->rq.lock);
+                cur_state = qp->state;
+                spin_unlock(&qp->rq.lock);
+                spin_unlock_irq(&qp->sq.lock);
+        }
+
+        new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
+
+        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
+                mthca_dbg(dev, "Bad QP transition (transport %d) "
+                          "%d->%d with attr 0x%08x\n",
+                          qp->transport, cur_state, new_state,
+                          attr_mask);
+                goto out;
+        }
+
+        if ((attr_mask & IB_QP_PKEY_INDEX) &&
+             attr->pkey_index >= dev->limits.pkey_table_len) {
+                mthca_dbg(dev, "P_Key index (%u) too large. max is %d\n",
+                          attr->pkey_index, dev->limits.pkey_table_len-1);
+                goto out;
+        }
+
+        if ((attr_mask & IB_QP_PORT) &&
+            (attr->port_num == 0 || attr->port_num > dev->limits.num_ports)) {
+                mthca_dbg(dev, "Port number (%u) is invalid\n", attr->port_num);
+                goto out;
+        }
+
+        if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
+            attr->max_rd_atomic > dev->limits.max_qp_init_rdma) {
+                mthca_dbg(dev, "Max rdma_atomic as initiator %u too large (max is %d)\n",
+                          attr->max_rd_atomic, dev->limits.max_qp_init_rdma);
+                goto out;
+        }
+
+        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
+            attr->max_dest_rd_atomic > 1 << dev->qp_table.rdb_shift) {
+                mthca_dbg(dev, "Max rdma_atomic as responder %u too large (max %d)\n",
+                          attr->max_dest_rd_atomic, 1 << dev->qp_table.rdb_shift);
+                goto out;
+        }
+
+        if (cur_state == new_state && cur_state == IB_QPS_RESET) {
+                err = 0;
+                goto out;
+        }
+
+        if (cur_state == IB_QPS_RESET && new_state == IB_QPS_ERR) {
+                err = __mthca_modify_qp(ibqp, &dummy_init_attr,
+                                        dummy_init_attr_mask[ibqp->qp_type],
+                                        IB_QPS_RESET, IB_QPS_INIT);
+                if (err)
+                        goto out;
+                cur_state = IB_QPS_INIT;
+        }
+
+        err = __mthca_modify_qp(ibqp, attr, attr_mask, cur_state, new_state);
 
 out:
         mutex_unlock(&qp->mutex);
@@ -1862,6 +1901,7 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
                                       dev->kar + MTHCA_RECEIVE_DOORBELL,
                                       MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
 
+                        qp->rq.next_ind = ind;
                         qp->rq.head += MTHCA_TAVOR_MAX_WQES_PER_RECV_DB;
                         size0 = 0;
                 }
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 61974b0296ca..b8f05a526673 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -34,6 +34,7 @@
 
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/sched.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 87310eeb6df0..a0b3782c7625 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -132,12 +132,46 @@ struct ipoib_cm_data {
         __be32 mtu;
 };
 
+/*
+ * Quoting 10.3.1 Queue Pair and EE Context States:
+ *
+ * Note, for QPs that are associated with an SRQ, the Consumer should take the
+ * QP through the Error State before invoking a Destroy QP or a Modify QP to the
+ * Reset State.  The Consumer may invoke the Destroy QP without first performing
+ * a Modify QP to the Error State and waiting for the Affiliated Asynchronous
+ * Last WQE Reached Event. However, if the Consumer does not wait for the
+ * Affiliated Asynchronous Last WQE Reached Event, then WQE and Data Segment
+ * leakage may occur. Therefore, it is good programming practice to tear down a
+ * QP that is associated with an SRQ by using the following process:
+ *
+ * - Put the QP in the Error State
+ * - Wait for the Affiliated Asynchronous Last WQE Reached Event;
+ * - either:
+ *       drain the CQ by invoking the Poll CQ verb and either wait for CQ
+ *       to be empty or the number of Poll CQ operations has exceeded
+ *       CQ capacity size;
+ * - or
+ *       post another WR that completes on the same CQ and wait for this
+ *       WR to return as a WC;
+ * - and then invoke a Destroy QP or Reset QP.
+ *
+ * We use the second option and wait for a completion on the
+ * rx_drain_qp before destroying QPs attached to our SRQ.
+ */
+
+enum ipoib_cm_state {
+        IPOIB_CM_RX_LIVE,
+        IPOIB_CM_RX_ERROR, /* Ignored by stale task */
+        IPOIB_CM_RX_FLUSH  /* Last WQE Reached event observed */
+};
+
 struct ipoib_cm_rx {
         struct ib_cm_id     *id;
         struct ib_qp        *qp;
         struct list_head     list;
         struct net_device   *dev;
         unsigned long        jiffies;
+        enum ipoib_cm_state  state;
 };
 
 struct ipoib_cm_tx {
@@ -165,10 +199,16 @@ struct ipoib_cm_dev_priv {
         struct ib_srq          *srq;
         struct ipoib_cm_rx_buf *srq_ring;
         struct ib_cm_id        *id;
-        struct list_head        passive_ids;
+        struct ib_qp           *rx_drain_qp;   /* generates WR described in 10.3.1 */
+        struct list_head        passive_ids;   /* state: LIVE */
+        struct list_head        rx_error_list; /* state: ERROR */
+        struct list_head        rx_flush_list; /* state: FLUSH, drain not started */
+        struct list_head        rx_drain_list; /* state: FLUSH, drain started */
+        struct list_head        rx_reap_list;  /* state: FLUSH, drain done */
         struct work_struct      start_task;
         struct work_struct      reap_task;
         struct work_struct      skb_task;
+        struct work_struct      rx_reap_task;
         struct delayed_work     stale_task;
         struct sk_buff_head     skb_queue;
         struct list_head        start_list;
@@ -201,15 +241,17 @@ struct ipoib_dev_priv {
         struct list_head multicast_list;
         struct rb_root multicast_tree;
 
-        struct delayed_work pkey_task;
+        struct delayed_work pkey_poll_task;
         struct delayed_work mcast_task;
         struct work_struct flush_task;
         struct work_struct restart_task;
         struct delayed_work ah_reap_task;
+        struct work_struct pkey_event_task;
 
         struct ib_device *ca;
         u8                port;
         u16               pkey;
+        u16               pkey_index;
         struct ib_pd     *pd;
         struct ib_mr     *mr;
         struct ib_cq     *cq;
@@ -333,12 +375,13 @@ struct ipoib_dev_priv *ipoib_intf_alloc(const char *format);
 
 int ipoib_ib_dev_init(struct net_device *dev, struct ib_device *ca, int port);
 void ipoib_ib_dev_flush(struct work_struct *work);
+void ipoib_pkey_event(struct work_struct *work);
 void ipoib_ib_dev_cleanup(struct net_device *dev);
 
 int ipoib_ib_dev_open(struct net_device *dev);
 int ipoib_ib_dev_up(struct net_device *dev);
 int ipoib_ib_dev_down(struct net_device *dev, int flush);
-int ipoib_ib_dev_stop(struct net_device *dev);
+int ipoib_ib_dev_stop(struct net_device *dev, int flush);
 
 int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port);
 void ipoib_dev_cleanup(struct net_device *dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 785bc8505f2a..ffec794b7913 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -37,6 +37,7 @@
 #include <net/dst.h>
 #include <net/icmp.h>
 #include <linux/icmpv6.h>
+#include <linux/delay.h>
 
 #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
 static int data_debug_level;
@@ -62,6 +63,16 @@ struct ipoib_cm_id {
         u32 remote_mtu;
 };
 
+static struct ib_qp_attr ipoib_cm_err_attr = {
+        .qp_state = IB_QPS_ERR
+};
+
+#define IPOIB_CM_RX_DRAIN_WRID 0x7fffffff
+
+static struct ib_recv_wr ipoib_cm_rx_drain_wr = {
+        .wr_id = IPOIB_CM_RX_DRAIN_WRID
+};
+
 static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id,
                                struct ib_cm_event *event);
 
@@ -150,11 +161,44 @@ partial_error:
         return NULL;
 }
 
+static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv* priv)
+{
+        struct ib_recv_wr *bad_wr;
+
+        /* rx_drain_qp send queue depth is 1, so
+         * make sure we have at most 1 outstanding WR. */
+        if (list_empty(&priv->cm.rx_flush_list) ||
+            !list_empty(&priv->cm.rx_drain_list))
+                return;
+
+        if (ib_post_recv(priv->cm.rx_drain_qp, &ipoib_cm_rx_drain_wr, &bad_wr))
+                ipoib_warn(priv, "failed to post rx_drain wr\n");
+
+        list_splice_init(&priv->cm.rx_flush_list, &priv->cm.rx_drain_list);
+}
+
+static void ipoib_cm_rx_event_handler(struct ib_event *event, void *ctx)
+{
+        struct ipoib_cm_rx *p = ctx;
+        struct ipoib_dev_priv *priv = netdev_priv(p->dev);
+        unsigned long flags;
+
+        if (event->event != IB_EVENT_QP_LAST_WQE_REACHED)
+                return;
+
+        spin_lock_irqsave(&priv->lock, flags);
+        list_move(&p->list, &priv->cm.rx_flush_list);
+        p->state = IPOIB_CM_RX_FLUSH;
+        ipoib_cm_start_rx_drain(priv);
+        spin_unlock_irqrestore(&priv->lock, flags);
+}
+
 static struct ib_qp *ipoib_cm_create_rx_qp(struct net_device *dev,
                                            struct ipoib_cm_rx *p)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ib_qp_init_attr attr = {
+                .event_handler = ipoib_cm_rx_event_handler,
                 .send_cq = priv->cq, /* does not matter, we never send anything */
                 .recv_cq = priv->cq,
                 .srq = priv->cm.srq,
@@ -256,11 +300,13 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
 
         cm_id->context = p;
         p->jiffies = jiffies;
+        p->state = IPOIB_CM_RX_LIVE;
         spin_lock_irq(&priv->lock);
+        if (list_empty(&priv->cm.passive_ids))
+                queue_delayed_work(ipoib_workqueue,
+                                   &priv->cm.stale_task, IPOIB_CM_RX_DELAY);
         list_add(&p->list, &priv->cm.passive_ids);
         spin_unlock_irq(&priv->lock);
-        queue_delayed_work(ipoib_workqueue,
-                           &priv->cm.stale_task, IPOIB_CM_RX_DELAY);
         return 0;
 
 err_rep:
@@ -276,7 +322,6 @@ static int ipoib_cm_rx_handler(struct ib_cm_id *cm_id,
 {
         struct ipoib_cm_rx *p;
         struct ipoib_dev_priv *priv;
-        int ret;
 
         switch (event->event) {
         case IB_CM_REQ_RECEIVED:
@@ -288,20 +333,9 @@ static int ipoib_cm_rx_handler(struct ib_cm_id *cm_id,
         case IB_CM_REJ_RECEIVED:
                 p = cm_id->context;
                 priv = netdev_priv(p->dev);
-                spin_lock_irq(&priv->lock);
-                if (list_empty(&p->list))
-                        ret = 0; /* Connection is going away already. */
-                else {
-                        list_del_init(&p->list);
-                        ret = -ECONNRESET;
-                }
-                spin_unlock_irq(&priv->lock);
-                if (ret) {
-                        ib_destroy_qp(p->qp);
-                        kfree(p);
-                        return ret;
-                }
-                return 0;
+                if (ib_modify_qp(p->qp, &ipoib_cm_err_attr, IB_QP_STATE))
+                        ipoib_warn(priv, "unable to move qp to error state\n");
+                /* Fall through */
         default:
                 return 0;
         }
@@ -353,8 +387,15 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                        wr_id, wc->status);
 
         if (unlikely(wr_id >= ipoib_recvq_size)) {
-                ipoib_warn(priv, "cm recv completion event with wrid %d (> %d)\n",
-                           wr_id, ipoib_recvq_size);
+                if (wr_id == (IPOIB_CM_RX_DRAIN_WRID & ~IPOIB_CM_OP_SRQ)) {
+                        spin_lock_irqsave(&priv->lock, flags);
+                        list_splice_init(&priv->cm.rx_drain_list, &priv->cm.rx_reap_list);
+                        ipoib_cm_start_rx_drain(priv);
+                        queue_work(ipoib_workqueue, &priv->cm.rx_reap_task);
+                        spin_unlock_irqrestore(&priv->lock, flags);
+                } else
+                        ipoib_warn(priv, "cm recv completion event with wrid %d (> %d)\n",
+                                   wr_id, ipoib_recvq_size);
                 return;
         }
 
@@ -373,13 +414,11 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                 if (p && time_after_eq(jiffies, p->jiffies + IPOIB_CM_RX_UPDATE_TIME)) {
                         spin_lock_irqsave(&priv->lock, flags);
                         p->jiffies = jiffies;
-                        /* Move this entry to list head, but do
-                         * not re-add it if it has been removed. */
-                        if (!list_empty(&p->list))
+                        /* Move this entry to list head, but do not re-add it
+                         * if it has been moved out of list. */
+                        if (p->state == IPOIB_CM_RX_LIVE)
                                 list_move(&p->list, &priv->cm.passive_ids);
                         spin_unlock_irqrestore(&priv->lock, flags);
-                        queue_delayed_work(ipoib_workqueue,
-                                           &priv->cm.stale_task, IPOIB_CM_RX_DELAY);
                 }
         }
 
@@ -584,17 +623,43 @@ static void ipoib_cm_tx_completion(struct ib_cq *cq, void *tx_ptr)
 int ipoib_cm_dev_open(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct ib_qp_init_attr qp_init_attr = {
+                .send_cq = priv->cq,   /* does not matter, we never send anything */
+                .recv_cq = priv->cq,
+                .cap.max_send_wr = 1,  /* FIXME: 0 Seems not to work */
+                .cap.max_send_sge = 1, /* FIXME: 0 Seems not to work */
+                .cap.max_recv_wr = 1,
+                .cap.max_recv_sge = 1, /* FIXME: 0 Seems not to work */
+                .sq_sig_type = IB_SIGNAL_ALL_WR,
+                .qp_type = IB_QPT_UC,
+        };
         int ret;
 
         if (!IPOIB_CM_SUPPORTED(dev->dev_addr))
                 return 0;
 
+        priv->cm.rx_drain_qp = ib_create_qp(priv->pd, &qp_init_attr);
+        if (IS_ERR(priv->cm.rx_drain_qp)) {
+                printk(KERN_WARNING "%s: failed to create CM ID\n", priv->ca->name);
+                ret = PTR_ERR(priv->cm.rx_drain_qp);
+                return ret;
+        }
+
+        /*
+         * We put the QP in error state directly.  This way, a "flush
+         * error" WC will be immediately generated for each WR we post.
+         */
+        ret = ib_modify_qp(priv->cm.rx_drain_qp, &ipoib_cm_err_attr, IB_QP_STATE);
+        if (ret) {
+                ipoib_warn(priv, "failed to modify drain QP to error: %d\n", ret);
+                goto err_qp;
+        }
+
         priv->cm.id = ib_create_cm_id(priv->ca, ipoib_cm_rx_handler, dev);
         if (IS_ERR(priv->cm.id)) {
                 printk(KERN_WARNING "%s: failed to create CM ID\n", priv->ca->name);
                 ret = PTR_ERR(priv->cm.id);
-                priv->cm.id = NULL;
-                return ret;
+                goto err_cm;
         }
 
         ret = ib_cm_listen(priv->cm.id, cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num),
@@ -602,35 +667,79 @@ int ipoib_cm_dev_open(struct net_device *dev)
         if (ret) {
                 printk(KERN_WARNING "%s: failed to listen on ID 0x%llx\n", priv->ca->name,
                        IPOIB_CM_IETF_ID | priv->qp->qp_num);
-                ib_destroy_cm_id(priv->cm.id);
-                priv->cm.id = NULL;
-                return ret;
+                goto err_listen;
         }
+
         return 0;
+
+err_listen:
+        ib_destroy_cm_id(priv->cm.id);
+err_cm:
+        priv->cm.id = NULL;
+err_qp:
+        ib_destroy_qp(priv->cm.rx_drain_qp);
+        return ret;
 }
 
 void ipoib_cm_dev_stop(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
-        struct ipoib_cm_rx *p;
+        struct ipoib_cm_rx *p, *n;
+        unsigned long begin;
+        LIST_HEAD(list);
+        int ret;
 
         if (!IPOIB_CM_SUPPORTED(dev->dev_addr) || !priv->cm.id)
                 return;
 
         ib_destroy_cm_id(priv->cm.id);
         priv->cm.id = NULL;
+
         spin_lock_irq(&priv->lock);
         while (!list_empty(&priv->cm.passive_ids)) {
                 p = list_entry(priv->cm.passive_ids.next, typeof(*p), list);
-                list_del_init(&p->list);
+                list_move(&p->list, &priv->cm.rx_error_list);
+                p->state = IPOIB_CM_RX_ERROR;
                 spin_unlock_irq(&priv->lock);
+                ret = ib_modify_qp(p->qp, &ipoib_cm_err_attr, IB_QP_STATE);
+                if (ret)
+                        ipoib_warn(priv, "unable to move qp to error state: %d\n", ret);
+                spin_lock_irq(&priv->lock);
+        }
+
+        /* Wait for all RX to be drained */
+        begin = jiffies;
+
+        while (!list_empty(&priv->cm.rx_error_list) ||
+               !list_empty(&priv->cm.rx_flush_list) ||
+               !list_empty(&priv->cm.rx_drain_list)) {
+                if (!time_after(jiffies, begin + 5 * HZ)) {
+                        ipoib_warn(priv, "RX drain timing out\n");
+
+                        /*
+                         * assume the HW is wedged and just free up everything.
+                         */
+                        list_splice_init(&priv->cm.rx_flush_list, &list);
+                        list_splice_init(&priv->cm.rx_error_list, &list);
+                        list_splice_init(&priv->cm.rx_drain_list, &list);
+                        break;
+                }
+                spin_unlock_irq(&priv->lock);
+                msleep(1);
+                spin_lock_irq(&priv->lock);
+        }
+
+        list_splice_init(&priv->cm.rx_reap_list, &list);
+
+        spin_unlock_irq(&priv->lock);
+
+        list_for_each_entry_safe(p, n, &list, list) {
                 ib_destroy_cm_id(p->id);
                 ib_destroy_qp(p->qp);
                 kfree(p);
-                spin_lock_irq(&priv->lock);
         }
-        spin_unlock_irq(&priv->lock);
 
+        ib_destroy_qp(priv->cm.rx_drain_qp);
         cancel_delayed_work(&priv->cm.stale_task);
 }
 
@@ -1080,26 +1189,50 @@ void ipoib_cm_skb_too_long(struct net_device* dev, struct sk_buff *skb,
                 queue_work(ipoib_workqueue, &priv->cm.skb_task);
 }
 
+static void ipoib_cm_rx_reap(struct work_struct *work)
+{
+        struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,
+                                                   cm.rx_reap_task);
+        struct ipoib_cm_rx *p, *n;
+        LIST_HEAD(list);
+
+        spin_lock_irq(&priv->lock);
+        list_splice_init(&priv->cm.rx_reap_list, &list);
+        spin_unlock_irq(&priv->lock);
+
+        list_for_each_entry_safe(p, n, &list, list) {
+                ib_destroy_cm_id(p->id);
+                ib_destroy_qp(p->qp);
+                kfree(p);
+        }
+}
+
 static void ipoib_cm_stale_task(struct work_struct *work)
 {
         struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,
                                                    cm.stale_task.work);
         struct ipoib_cm_rx *p;
+        int ret;
 
         spin_lock_irq(&priv->lock);
         while (!list_empty(&priv->cm.passive_ids)) {
-                /* List if sorted by LRU, start from tail,
+                /* List is sorted by LRU, start from tail,
                  * stop when we see a recently used entry */
                 p = list_entry(priv->cm.passive_ids.prev, typeof(*p), list);
                 if (time_before_eq(jiffies, p->jiffies + IPOIB_CM_RX_TIMEOUT))
                         break;
-                list_del_init(&p->list);
+                list_move(&p->list, &priv->cm.rx_error_list);
+                p->state = IPOIB_CM_RX_ERROR;
                 spin_unlock_irq(&priv->lock);
-                ib_destroy_cm_id(p->id);
-                ib_destroy_qp(p->qp);
-                kfree(p);
+                ret = ib_modify_qp(p->qp, &ipoib_cm_err_attr, IB_QP_STATE);
+                if (ret)
+                        ipoib_warn(priv, "unable to move qp to error state: %d\n", ret);
                 spin_lock_irq(&priv->lock);
         }
+
+        if (!list_empty(&priv->cm.passive_ids))
+                queue_delayed_work(ipoib_workqueue,
+                                   &priv->cm.stale_task, IPOIB_CM_RX_DELAY);
         spin_unlock_irq(&priv->lock);
 }
 
@@ -1161,9 +1294,14 @@ int ipoib_cm_dev_init(struct net_device *dev)
         INIT_LIST_HEAD(&priv->cm.passive_ids);
         INIT_LIST_HEAD(&priv->cm.reap_list);
         INIT_LIST_HEAD(&priv->cm.start_list);
+        INIT_LIST_HEAD(&priv->cm.rx_error_list);
+        INIT_LIST_HEAD(&priv->cm.rx_flush_list);
+        INIT_LIST_HEAD(&priv->cm.rx_drain_list);
+        INIT_LIST_HEAD(&priv->cm.rx_reap_list);
         INIT_WORK(&priv->cm.start_task, ipoib_cm_tx_start);
         INIT_WORK(&priv->cm.reap_task, ipoib_cm_tx_reap);
         INIT_WORK(&priv->cm.skb_task, ipoib_cm_skb_reap);
+        INIT_WORK(&priv->cm.rx_reap_task, ipoib_cm_rx_reap);
         INIT_DELAYED_WORK(&priv->cm.stale_task, ipoib_cm_stale_task);
 
         skb_queue_head_init(&priv->cm.skb_queue);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 68d72c6f7ffb..c1aad06eb4e9 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -448,6 +448,13 @@ int ipoib_ib_dev_open(struct net_device *dev)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         int ret;
 
+        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &priv->pkey_index)) {
+                ipoib_warn(priv, "P_Key 0x%04x not found\n", priv->pkey);
+                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+                return -1;
+        }
+        set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+
         ret = ipoib_init_qp(dev);
         if (ret) {
                 ipoib_warn(priv, "ipoib_init_qp returned %d\n", ret);
@@ -457,14 +464,14 @@ int ipoib_ib_dev_open(struct net_device *dev)
         ret = ipoib_ib_post_receives(dev);
         if (ret) {
                 ipoib_warn(priv, "ipoib_ib_post_receives returned %d\n", ret);
-                ipoib_ib_dev_stop(dev);
+                ipoib_ib_dev_stop(dev, 1);
                 return -1;
         }
 
         ret = ipoib_cm_dev_open(dev);
         if (ret) {
-                ipoib_warn(priv, "ipoib_ib_post_receives returned %d\n", ret);
-                ipoib_ib_dev_stop(dev);
+                ipoib_warn(priv, "ipoib_cm_dev_open returned %d\n", ret);
+                ipoib_ib_dev_stop(dev, 1);
                 return -1;
         }
 
@@ -516,7 +523,7 @@ int ipoib_ib_dev_down(struct net_device *dev, int flush)
         if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
                 mutex_lock(&pkey_mutex);
                 set_bit(IPOIB_PKEY_STOP, &priv->flags);
-                cancel_delayed_work(&priv->pkey_task);
+                cancel_delayed_work(&priv->pkey_poll_task);
                 mutex_unlock(&pkey_mutex);
                 if (flush)
                         flush_workqueue(ipoib_workqueue);
@@ -543,7 +550,7 @@ static int recvs_pending(struct net_device *dev)
         return pending;
 }
 
-int ipoib_ib_dev_stop(struct net_device *dev)
+int ipoib_ib_dev_stop(struct net_device *dev, int flush)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ib_qp_attr qp_attr;
@@ -629,7 +636,8 @@ timeout:
         /* Wait for all AHs to be reaped */
         set_bit(IPOIB_STOP_REAPER, &priv->flags);
         cancel_delayed_work(&priv->ah_reap_task);
-        flush_workqueue(ipoib_workqueue);
+        if (flush)
+                flush_workqueue(ipoib_workqueue);
 
         begin = jiffies;
 
@@ -673,13 +681,24 @@ int ipoib_ib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
         return 0;
 }
 
-void ipoib_ib_dev_flush(struct work_struct *work)
+static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, int pkey_event)
 {
-        struct ipoib_dev_priv *cpriv, *priv =
-                container_of(work, struct ipoib_dev_priv, flush_task);
+        struct ipoib_dev_priv *cpriv;
         struct net_device *dev = priv->dev;
+        u16 new_index;
+
+        mutex_lock(&priv->vlan_mutex);
 
-        if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags) ) {
+        /*
+         * Flush any child interfaces too -- they might be up even if
+         * the parent is down.
+         */
+        list_for_each_entry(cpriv, &priv->child_intfs, list)
+                __ipoib_ib_dev_flush(cpriv, pkey_event);
+
+        mutex_unlock(&priv->vlan_mutex);
+
+        if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags)) {
                 ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_INITIALIZED not set.\n");
                 return;
         }
@@ -689,10 +708,32 @@ void ipoib_ib_dev_flush(struct work_struct *work)
                 return;
         }
 
+        if (pkey_event) {
+                if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &new_index)) {
+                        clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+                        ipoib_ib_dev_down(dev, 0);
+                        ipoib_pkey_dev_delay_open(dev);
+                        return;
+                }
+                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+
+                /* restart QP only if P_Key index is changed */
+                if (new_index == priv->pkey_index) {
+                        ipoib_dbg(priv, "Not flushing - P_Key index not changed.\n");
+                        return;
+                }
+                priv->pkey_index = new_index;
+        }
+
         ipoib_dbg(priv, "flushing\n");
 
         ipoib_ib_dev_down(dev, 0);
 
+        if (pkey_event) {
+                ipoib_ib_dev_stop(dev, 0);
+                ipoib_ib_dev_open(dev);
+        }
+
         /*
          * The device could have been brought down between the start and when
          * we get here, don't bring it back up if it's not configured up
@@ -701,14 +742,24 @@ void ipoib_ib_dev_flush(struct work_struct *work)
                 ipoib_ib_dev_up(dev);
                 ipoib_mcast_restart_task(&priv->restart_task);
         }
+}
 
-        mutex_lock(&priv->vlan_mutex);
+void ipoib_ib_dev_flush(struct work_struct *work)
+{
+        struct ipoib_dev_priv *priv =
+                container_of(work, struct ipoib_dev_priv, flush_task);
 
-        /* Flush any child interfaces too */
-        list_for_each_entry(cpriv, &priv->child_intfs, list)
-                ipoib_ib_dev_flush(&cpriv->flush_task);
+        ipoib_dbg(priv, "Flushing %s\n", priv->dev->name);
+        __ipoib_ib_dev_flush(priv, 0);
+}
 
-        mutex_unlock(&priv->vlan_mutex);
+void ipoib_pkey_event(struct work_struct *work)
+{
+        struct ipoib_dev_priv *priv =
+                container_of(work, struct ipoib_dev_priv, pkey_event_task);
+
+        ipoib_dbg(priv, "Flushing %s and restarting its QP\n", priv->dev->name);
+        __ipoib_ib_dev_flush(priv, 1);
 }
 
 void ipoib_ib_dev_cleanup(struct net_device *dev)
@@ -736,7 +787,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)
 void ipoib_pkey_poll(struct work_struct *work)
 {
         struct ipoib_dev_priv *priv =
-                container_of(work, struct ipoib_dev_priv, pkey_task.work);
+                container_of(work, struct ipoib_dev_priv, pkey_poll_task.work);
         struct net_device *dev = priv->dev;
 
         ipoib_pkey_dev_check_presence(dev);
@@ -747,7 +798,7 @@ void ipoib_pkey_poll(struct work_struct *work)
                 mutex_lock(&pkey_mutex);
                 if (!test_bit(IPOIB_PKEY_STOP, &priv->flags))
                         queue_delayed_work(ipoib_workqueue,
-                                           &priv->pkey_task,
+                                           &priv->pkey_poll_task,
                                            HZ);
                 mutex_unlock(&pkey_mutex);
         }
@@ -766,7 +817,7 @@ int ipoib_pkey_dev_delay_open(struct net_device *dev)
                 mutex_lock(&pkey_mutex);
                 clear_bit(IPOIB_PKEY_STOP, &priv->flags);
                 queue_delayed_work(ipoib_workqueue,
-                                   &priv->pkey_task,
+                                   &priv->pkey_poll_task,
                                    HZ);
                 mutex_unlock(&pkey_mutex);
                 return 1;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 0a428f2b05c7..894b1dcdf3eb 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -107,7 +107,7 @@ int ipoib_open(struct net_device *dev)
                 return -EINVAL;
 
         if (ipoib_ib_dev_up(dev)) {
-                ipoib_ib_dev_stop(dev);
+                ipoib_ib_dev_stop(dev, 1);
                 return -EINVAL;
         }
 
@@ -152,7 +152,7 @@ static int ipoib_stop(struct net_device *dev)
         flush_workqueue(ipoib_workqueue);
 
         ipoib_ib_dev_down(dev, 1);
-        ipoib_ib_dev_stop(dev);
+        ipoib_ib_dev_stop(dev, 1);
 
         if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
                 struct ipoib_dev_priv *cpriv;
@@ -988,7 +988,8 @@ static void ipoib_setup(struct net_device *dev)
         INIT_LIST_HEAD(&priv->dead_ahs);
         INIT_LIST_HEAD(&priv->multicast_list);
 
-        INIT_DELAYED_WORK(&priv->pkey_task,    ipoib_pkey_poll);
+        INIT_DELAYED_WORK(&priv->pkey_poll_task, ipoib_pkey_poll);
+        INIT_WORK(&priv->pkey_event_task, ipoib_pkey_event);
         INIT_DELAYED_WORK(&priv->mcast_task,   ipoib_mcast_join_task);
         INIT_WORK(&priv->flush_task,   ipoib_ib_dev_flush);
         INIT_WORK(&priv->restart_task, ipoib_mcast_restart_task);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 54fbead4de01..aae367057a56 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -524,7 +524,7 @@ void ipoib_mcast_join_task(struct work_struct *work)
                 return;
 
         if (ib_query_gid(priv->ca, priv->port, 0, &priv->local_gid))
-                ipoib_warn(priv, "ib_gid_entry_get() failed\n");
+                ipoib_warn(priv, "ib_query_gid() failed\n");
         else
                 memcpy(priv->dev->dev_addr + 4, priv->local_gid.raw, sizeof (union ib_gid));
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 5c3c6a43a52b..982eb88e27ec 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -33,8 +33,6 @@
  * $Id: ipoib_verbs.c 1349 2004-12-16 21:09:43Z roland $
  */
 
-#include <rdma/ib_cache.h>
-
 #include "ipoib.h"
 
 int ipoib_mcast_attach(struct net_device *dev, u16 mlid, union ib_gid *mgid)
@@ -49,7 +47,7 @@ int ipoib_mcast_attach(struct net_device *dev, u16 mlid, union ib_gid *mgid)
         if (!qp_attr)
                 goto out;
 
-        if (ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index)) {
+        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &pkey_index)) {
                 clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
                 ret = -ENXIO;
                 goto out;
@@ -94,26 +92,16 @@ int ipoib_init_qp(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         int ret;
-        u16 pkey_index;
         struct ib_qp_attr qp_attr;
         int attr_mask;
 
-        /*
-         * Search through the port P_Key table for the requested pkey value.
-         * The port has to be assigned to the respective IB partition in
-         * advance.
-         */
-        ret = ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index);
-        if (ret) {
-                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
-                return ret;
-        }
-        set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+        if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags))
+                return -1;
 
         qp_attr.qp_state = IB_QPS_INIT;
         qp_attr.qkey = 0;
         qp_attr.port_num = priv->port;
-        qp_attr.pkey_index = pkey_index;
+        qp_attr.pkey_index = priv->pkey_index;
         attr_mask =
             IB_QP_QKEY |
             IB_QP_PORT |
@@ -185,7 +173,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
         size = ipoib_sendq_size + ipoib_recvq_size + 1;
         ret = ipoib_cm_dev_init(dev);
         if (!ret)
-                size += ipoib_recvq_size;
+                size += ipoib_recvq_size + 1 /* 1 extra for rx_drain_qp */;
 
         priv->cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev, size, 0);
         if (IS_ERR(priv->cq)) {
@@ -259,14 +247,18 @@ void ipoib_event(struct ib_event_handler *handler,
         struct ipoib_dev_priv *priv =
                 container_of(handler, struct ipoib_dev_priv, event_handler);
 
-        if ((record->event == IB_EVENT_PORT_ERR    ||
-             record->event == IB_EVENT_PKEY_CHANGE ||
-             record->event == IB_EVENT_PORT_ACTIVE ||
-             record->event == IB_EVENT_LID_CHANGE  ||
-             record->event == IB_EVENT_SM_CHANGE   ||
-             record->event == IB_EVENT_CLIENT_REREGISTER) &&
-            record->element.port_num == priv->port) {
+        if (record->element.port_num != priv->port)
+                return;
+
+        if (record->event == IB_EVENT_PORT_ERR    ||
+            record->event == IB_EVENT_PORT_ACTIVE ||
+            record->event == IB_EVENT_LID_CHANGE  ||
+            record->event == IB_EVENT_SM_CHANGE   ||
+            record->event == IB_EVENT_CLIENT_REREGISTER) {
                 ipoib_dbg(priv, "Port state change event\n");
                 queue_work(ipoib_workqueue, &priv->flush_task);
+        } else if (record->event == IB_EVENT_PKEY_CHANGE) {
+                ipoib_dbg(priv, "P_Key change event on port:%d\n", priv->port);
+                queue_work(ipoib_workqueue, &priv->pkey_event_task);
         }
 }
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 89d6008bb673..3702e2375553 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -35,7 +35,6 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/version.h>
 
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 0e9b69535ad6..f814fb3a469d 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Input device support"
+        depends on !S390
 
 config INPUT
         tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index a4c3729d3960..b234729706be 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/major.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <linux/compat.h>
 
@@ -337,7 +336,7 @@ static int bits_to_user(unsigned long *bits, unsigned int maxbit,
 
         if (compat) {
                 len = NBITS_COMPAT(maxbit) * sizeof(compat_long_t);
-                if (len < maxlen)
+                if (len > maxlen)
                         len = maxlen;
 
                 for (i = 0; i < len / sizeof(compat_long_t); i++)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 915e9ab7cab0..ccd8abafcb70 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/random.h>
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 9bcc5425049b..06f0541b24da 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -24,7 +24,6 @@
 #include <linux/module.h>
 #include <linux/poll.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 82f563e24fdb..b0023452ec90 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -255,6 +255,7 @@ config JOYSTICK_JOYDUMP
 
 config JOYSTICK_XPAD
         tristate "X-Box gamepad support"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use the X-Box pad with your computer.
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 735723912950..8c8cd95a6989 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -74,7 +74,6 @@
 #include <linux/stat.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/smp_lock.h>
 #include <linux/usb/input.h>
 
 #define DRIVER_VERSION "v0.0.6"
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6013ace94d98..842a7b4d16f8 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -84,6 +84,7 @@ config INPUT_ATLAS_BTNS
 
 config INPUT_ATI_REMOTE
         tristate "ATI / X10 USB RF remote control"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
@@ -99,6 +100,7 @@ config INPUT_ATI_REMOTE
 
 config INPUT_ATI_REMOTE2
         tristate "ATI / Philips USB RF remote control"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use an ATI or Philips USB RF remote control.
@@ -114,6 +116,7 @@ config INPUT_ATI_REMOTE2
 config INPUT_KEYSPAN_REMOTE
         tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
         depends on EXPERIMENTAL
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use a Keyspan DMR USB remote control.
@@ -128,6 +131,7 @@ config INPUT_KEYSPAN_REMOTE
 
 config INPUT_POWERMATE
         tristate "Griffin PowerMate and Contour Jog support"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
@@ -144,6 +148,7 @@ config INPUT_POWERMATE
 config INPUT_YEALINK
         tristate "Yealink usb-p1k voip phone"
         depends EXPERIMENTAL
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to enable keyboard and LCD functions of the
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 3d4b619dadab..e759944041ab 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -51,7 +51,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
 
 static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
+        unsigned int pin = (unsigned int) input_get_drvdata(dev);
         unsigned int count = 0;
 
         if (type != EV_SND)
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 2ccc114b3ff6..eb0167e9f0cb 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -111,6 +111,7 @@ config MOUSE_SERIAL
 
 config MOUSE_APPLETOUCH
         tristate "Apple USB Touchpad support"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use an Apple USB Touchpad.
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 7678e9876550..8675f9509393 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -19,7 +19,6 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/input.h>
-#include <linux/smp_lock.h>
 #include <linux/random.h>
 #include <linux/major.h>
 #include <linux/device.h>
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig
index 12dfb0eb3262..d371c0bdc0bd 100644
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@ -13,6 +13,7 @@ if INPUT_TABLET
 
 config TABLET_USB_ACECAD
         tristate "Acecad Flair tablet support (USB)"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use the USB version of the Acecad Flair
@@ -25,6 +26,7 @@ config TABLET_USB_ACECAD
 
 config TABLET_USB_AIPTEK
         tristate "Aiptek 6000U/8000U tablet support (USB)"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use the USB version of the Aiptek 6000U
@@ -49,6 +51,7 @@ config TABLET_USB_GTCO
 
 config TABLET_USB_KBTAB
         tristate "KB Gear JamStudio tablet support (USB)"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use the USB version of the KB Gear
@@ -61,6 +64,7 @@ config TABLET_USB_KBTAB
 
 config TABLET_USB_WACOM
         tristate "Wacom Intuos/Graphire tablet support (USB)"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use the USB version of the Wacom Intuos
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index c0b36cc5ff0a..e5cca9bd0406 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -166,6 +166,7 @@ config TOUCHSCREEN_UCB1400
 
 config TOUCHSCREEN_USB_COMPOSITE
         tristate "USB Touchscreen Driver"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           USB Touchscreen driver for:
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 61c15024c2a0..1a15475aedfc 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -1,7 +1,6 @@
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/delay.h>
@@ -18,12 +17,12 @@
 #define PHDR    0xa400012e
 #define SCPDR   0xa4000136
 
-static void do_softint(void *data);
+static void do_softint(struct work_struct *work);
 
 static struct input_dev *hp680_ts_dev;
-static DECLARE_WORK(work, do_softint);
+static DECLARE_DELAYED_WORK(work, do_softint);
 
-static void do_softint(void *data)
+static void do_softint(struct work_struct *work)
 {
         int absx = 0, absy = 0;
         u8 scpdr;
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 5e5b5c91d75b..8238b13874c2 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -48,7 +48,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/major.h>
-#include <linux/smp_lock.h>
 #include <linux/random.h>
 #include <linux/time.h>
 #include <linux/device.h>
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index c90afeea54aa..d42fe89cddf6 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "ISDN subsystem"
+        depends on !S390
 
 config ISDN
         tristate "ISDN support"
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index c921d6c522f5..c92f9d764fce 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -17,7 +17,7 @@ config CAPI_TRACE
         help
           If you say Y here, the kernelcapi driver can make verbose traces
           of CAPI messages. This feature can be enabled/disabled via IOCTL for
-          every controler (default disabled).
+          every controller (default disabled).
           This will increase the size of the kernelcapi module by 20 KB.
           If unsure, say Y.
 
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index db1260f73f10..81661b8bd3a8 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -18,8 +18,8 @@
 #include <linux/fcntl.h>
 #include <linux/fs.h>
 #include <linux/signal.h>
+#include <linux/mutex.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -147,7 +147,7 @@ struct capidev {
 
         struct capincci *nccis;
 
-        struct semaphore ncci_list_sem;
+        struct mutex ncci_list_mtx;
 };
 
 /* -------- global variables ---------------------------------------- */
@@ -395,7 +395,7 @@ static struct capidev *capidev_alloc(void)
         if (!cdev)
                 return NULL;
 
-        init_MUTEX(&cdev->ncci_list_sem);
+        mutex_init(&cdev->ncci_list_mtx);
         skb_queue_head_init(&cdev->recvqueue);
         init_waitqueue_head(&cdev->recvwait);
         write_lock_irqsave(&capidev_list_lock, flags);
@@ -414,9 +414,9 @@ static void capidev_free(struct capidev *cdev)
         }
         skb_queue_purge(&cdev->recvqueue);
 
-        down(&cdev->ncci_list_sem);
+        mutex_lock(&cdev->ncci_list_mtx);
         capincci_free(cdev, 0xffffffff);
-        up(&cdev->ncci_list_sem);
+        mutex_unlock(&cdev->ncci_list_mtx);
 
         write_lock_irqsave(&capidev_list_lock, flags);
         list_del(&cdev->list);
@@ -603,15 +603,15 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
         if (CAPIMSG_CMD(skb->data) == CAPI_CONNECT_B3_CONF) {
                 u16 info = CAPIMSG_U16(skb->data, 12); // Info field
                 if (info == 0) {
-                        down(&cdev->ncci_list_sem);
+                        mutex_lock(&cdev->ncci_list_mtx);
                         capincci_alloc(cdev, CAPIMSG_NCCI(skb->data));
-                        up(&cdev->ncci_list_sem);
+                        mutex_unlock(&cdev->ncci_list_mtx);
                 }
         }
         if (CAPIMSG_CMD(skb->data) == CAPI_CONNECT_B3_IND) {
-                down(&cdev->ncci_list_sem);
+                mutex_lock(&cdev->ncci_list_mtx);
                 capincci_alloc(cdev, CAPIMSG_NCCI(skb->data));
-                up(&cdev->ncci_list_sem);
+                mutex_unlock(&cdev->ncci_list_mtx);
         }
         spin_lock_irqsave(&workaround_lock, flags);
         if (CAPIMSG_COMMAND(skb->data) != CAPI_DATA_B3) {
@@ -752,9 +752,9 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos
         CAPIMSG_SETAPPID(skb->data, cdev->ap.applid);
 
         if (CAPIMSG_CMD(skb->data) == CAPI_DISCONNECT_B3_RESP) {
-                down(&cdev->ncci_list_sem);
+                mutex_lock(&cdev->ncci_list_mtx);
                 capincci_free(cdev, CAPIMSG_NCCI(skb->data));
-                up(&cdev->ncci_list_sem);
+                mutex_unlock(&cdev->ncci_list_mtx);
         }
 
         cdev->errcode = capi20_put_message(&cdev->ap, skb);
@@ -939,9 +939,9 @@ capi_ioctl(struct inode *inode, struct file *file,
                         if (copy_from_user(&ncci, argp, sizeof(ncci)))
                                 return -EFAULT;
 
-                        down(&cdev->ncci_list_sem);
+                        mutex_lock(&cdev->ncci_list_mtx);
                         if ((nccip = capincci_find(cdev, (u32) ncci)) == 0) {
-                                up(&cdev->ncci_list_sem);
+                                mutex_unlock(&cdev->ncci_list_mtx);
                                 return 0;
                         }
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -949,7 +949,7 @@ capi_ioctl(struct inode *inode, struct file *file,
                                 count += atomic_read(&mp->ttyopencount);
                         }
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
-                        up(&cdev->ncci_list_sem);
+                        mutex_unlock(&cdev->ncci_list_mtx);
                         return count;
                 }
                 return 0;
@@ -964,14 +964,14 @@ capi_ioctl(struct inode *inode, struct file *file,
                         if (copy_from_user(&ncci, argp,
                                            sizeof(ncci)))
                                 return -EFAULT;
-                        down(&cdev->ncci_list_sem);
+                        mutex_lock(&cdev->ncci_list_mtx);
                         nccip = capincci_find(cdev, (u32) ncci);
                         if (!nccip || (mp = nccip->minorp) == 0) {
-                                up(&cdev->ncci_list_sem);
+                                mutex_unlock(&cdev->ncci_list_mtx);
                                 return -ESRCH;
                         }
                         unit = mp->minor;
-                        up(&cdev->ncci_list_sem);
+                        mutex_unlock(&cdev->ncci_list_mtx);
                         return unit;
                 }
                 return 0;
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index ad1e2702c2d1..22379b94e88f 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -855,7 +855,7 @@ static _cdebbuf *g_debbuf;
 static u_long g_debbuf_lock;
 static _cmsg *g_cmsg;
 
-_cdebbuf *cdebbuf_alloc(void)
+static _cdebbuf *cdebbuf_alloc(void)
 {
         _cdebbuf *cdb;
 
@@ -989,11 +989,6 @@ _cdebbuf *capi_cmsg2str(_cmsg * cmsg)
         return &g_debbuf;
 }
 
-_cdebbuf *cdebbuf_alloc(void)
-{
-        return &g_debbuf;
-}
-
 void cdebbuf_free(_cdebbuf *cdb)
 {
 }
@@ -1009,7 +1004,6 @@ void __exit cdebug_exit(void)
 
 #endif
 
-EXPORT_SYMBOL(cdebbuf_alloc);
 EXPORT_SYMBOL(cdebbuf_free);
 EXPORT_SYMBOL(capi_cmsg2message);
 EXPORT_SYMBOL(capi_message2cmsg);
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 53a189003355..be77ee625bb7 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -11,7 +11,6 @@
 
 #include <linux/module.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
 #else
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index c8e1c357cec8..a1263019df5e 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -138,8 +138,6 @@ struct usb_cardstate {
         char                    bchars[6];              /* for request 0x19 */
 };
 
-struct usb_bc_state {};
-
 static inline unsigned tiocm_to_gigaset(unsigned state)
 {
         return ((state & TIOCM_DTR) ? 1 : 0) | ((state & TIOCM_RTS) ? 2 : 0);
@@ -579,25 +577,21 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
 
 static int gigaset_freebcshw(struct bc_state *bcs)
 {
-        if (!bcs->hw.usb)
-                return 0;
-        //FIXME
-        kfree(bcs->hw.usb);
+        /* unused */
         return 1;
 }
 
 /* Initialize the b-channel structure */
 static int gigaset_initbcshw(struct bc_state *bcs)
 {
-        bcs->hw.usb = kmalloc(sizeof(struct usb_bc_state), GFP_KERNEL);
-        if (!bcs->hw.usb)
-                return 0;
-
+        /* unused */
+        bcs->hw.usb = NULL;
         return 1;
 }
 
 static void gigaset_reinitbcshw(struct bc_state *bcs)
 {
+        /* nothing to do for M10x */
 }
 
 static void gigaset_freecshw(struct cardstate *cs)
diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c
index 7a74ed35b1bf..98fcdfc7ca55 100644
--- a/drivers/isdn/hardware/eicon/capimain.c
+++ b/drivers/isdn/hardware/eicon/capimain.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
-#include <linux/smp_lock.h>
 #include <linux/skbuff.h>
 
 #include "os_capi.h"
diff --git a/drivers/isdn/hardware/eicon/dbgioctl.h b/drivers/isdn/hardware/eicon/dbgioctl.h
deleted file mode 100644
index 0fb6f5e88b60..000000000000
--- a/drivers/isdn/hardware/eicon/dbgioctl.h
+++ /dev/null
@@ -1,198 +0,0 @@
-
-/*
- *
-  Copyright (c) Eicon Technology Corporation, 2000.
- *
-  This source file is supplied for the use with Eicon
-  Technology Corporation's range of DIVA Server Adapters.
- *
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
-  any later version.
- *
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY OF ANY KIND WHATSOEVER INCLUDING ANY
-  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.
- *
- */
-/*------------------------------------------------------------------*/
-/* file: dbgioctl.h                                                 */
-/*------------------------------------------------------------------*/
-
-#if !defined(__DBGIOCTL_H__)
-
-#define __DBGIOCTL_H__
-
-#ifdef NOT_YET_NEEDED
-/*
- * The requested operation is passed in arg0 of DbgIoctlArgs,
- * additional arguments (if any) in arg1, arg2 and arg3.
- */
-
-typedef struct
-{       ULONG   arg0 ;
-        ULONG   arg1 ;
-        ULONG   arg2 ;
-        ULONG   arg3 ;
-} DbgIoctlArgs ;
-
-#define DBG_COPY_LOGS   0       /* copy debugs to user until buffer full        */
-                                                        /* arg1: size threshold                                         */
-                                                        /* arg2: timeout in milliseconds                        */
-
-#define DBG_FLUSH_LOGS  1       /* flush pending debugs to user buffer          */
-                                                        /* arg1: internal driver id                                     */
-
-#define DBG_LIST_DRVS   2       /* return the list of registered drivers        */
-
-#define DBG_GET_MASK    3       /* get current debug mask of driver                     */
-                                                        /* arg1: internal driver id                                     */
-
-#define DBG_SET_MASK    4       /* set/change debug mask of driver                      */
-                                                        /* arg1: internal driver id                                     */
-                                                        /* arg2: new debug mask                                         */
-
-#define DBG_GET_BUFSIZE 5       /* get current buffer size of driver            */
-                                                        /* arg1: internal driver id                                     */
-                                                        /* arg2: new debug mask                                         */
-
-#define DBG_SET_BUFSIZE 6       /* set new buffer size of driver                        */
-                                                        /* arg1: new buffer size                                        */
-
-/*
- *      common internal debug message structure
- */
-
-typedef struct
-{       unsigned short id ;             /* virtual driver id                  */
-        unsigned short type ;   /* special message type               */
-        unsigned long  seq ;    /* sequence number of message         */
-        unsigned long  size ;   /* size of message in bytes           */
-        unsigned long  next ;   /* offset to next buffered message    */
-        LARGE_INTEGER  NTtime ; /* 100 ns  since 1.1.1601             */
-        unsigned char  data[4] ;/* message data                       */
-} OldDbgMessage ;
-
-typedef struct
-{       LARGE_INTEGER  NTtime ; /* 100 ns  since 1.1.1601             */
-        unsigned short size ;   /* size of message in bytes           */
-        unsigned short ffff ;   /* always 0xffff to indicate new msg  */
-        unsigned short id ;             /* virtual driver id                  */
-        unsigned short type ;   /* special message type               */
-        unsigned long  seq ;    /* sequence number of message         */
-        unsigned char  data[4] ;/* message data                       */
-} DbgMessage ;
-
-#endif
-
-#define DRV_ID_UNKNOWN          0x0C    /* for messages via prtComp() */
-
-#define MSG_PROC_FLAG           0x80
-#define MSG_PROC_NO_GET(x)      (((x) & MSG_PROC_FLAG) ? (((x) >> 4) & 7) : -1)
-#define MSG_PROC_NO_SET(x)      (MSG_PROC_FLAG | (((x) & 7) << 4))
-
-#define MSG_TYPE_DRV_ID         0x0001
-#define MSG_TYPE_FLAGS          0x0002
-#define MSG_TYPE_STRING         0x0003
-#define MSG_TYPE_BINARY         0x0004
-
-#define MSG_HEAD_SIZE   ((unsigned long)&(((DbgMessage *)0)->data[0]))
-#define MSG_ALIGN(len)  (((unsigned long)(len) + MSG_HEAD_SIZE + 3) & ~3)
-#define MSG_SIZE(pMsg)  MSG_ALIGN((pMsg)->size)
-#define MSG_NEXT(pMsg)  ((DbgMessage *)( ((char *)(pMsg)) + MSG_SIZE(pMsg) ))
-
-#define OLD_MSG_HEAD_SIZE       ((unsigned long)&(((OldDbgMessage *)0)->data[0]))
-#define OLD_MSG_ALIGN(len)      (((unsigned long)(len)+OLD_MSG_HEAD_SIZE+3) & ~3)
-
-/*
- * manifest constants
- */
-
-#define MSG_FRAME_MAX_SIZE      2150            /* maximum size of B1 frame      */
-#define MSG_TEXT_MAX_SIZE       1024            /* maximum size of msg text      */
-#define MSG_MAX_SIZE            MSG_ALIGN(MSG_FRAME_MAX_SIZE)
-#define DBG_MIN_BUFFER_SIZE     0x00008000      /* minimal total buffer size  32 KB */
-#define DBG_DEF_BUFFER_SIZE     0x00020000      /* default total buffer size 128 KB */
-#define DBG_MAX_BUFFER_SIZE     0x00400000      /* maximal total buffer size   4 MB */
-
-#define DBGDRV_NAME             "Diehl_DIMAINT"
-#define UNIDBG_DRIVER   L"\\Device\\Diehl_DIMAINT" /* UNICODE name for kernel */
-#define DEBUG_DRIVER    "\\\\.\\" DBGDRV_NAME  /* traditional string for apps */
-#define DBGVXD_NAME             "DIMAINT"
-#define DEBUG_VXD               "\\\\.\\" DBGVXD_NAME  /* traditional string for apps */
-
-/*
- *      Special IDI interface debug construction
- */
-
-#define DBG_IDI_SIG_REQ         (unsigned long)0xF479C402
-#define DBG_IDI_SIG_IND         (unsigned long)0xF479C403
-#define DBG_IDI_NL_REQ          (unsigned long)0xF479C404
-#define DBG_IDI_NL_IND          (unsigned long)0xF479C405
-
-typedef struct
-{       unsigned long  magic_type ;
-        unsigned short data_len ;
-        unsigned char  layer_ID ;
-        unsigned char  entity_ID ;
-        unsigned char  request ;
-        unsigned char  ret_code ;
-        unsigned char  indication ;
-        unsigned char  complete ;
-        unsigned char  data[4] ;
-} DbgIdiAct, *DbgIdiAction ;
-
-/*
- * We want to use the same IOCTL codes in Win95 and WinNT.
- * The official constructor for IOCTL codes is the CTL_CODE macro
- * from <winoctl.h> (<devioctl.h> in WinNT DDK environment).
- * The problem here is that we don't know how to get <winioctl.h>
- * working in a Win95 DDK environment!
- */
-
-# ifdef CTL_CODE        /*{*/
-
-/* Assert that we have the same idea of the CTL_CODE macro.     */
-
-#define CTL_CODE( DeviceType, Function, Method, Access ) (                 \
-    ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \
-)
-
-# else  /* !CTL_CODE */ /*}{*/
-
-/* Use the definitions stolen from <winioctl.h>.  */
-
-#define CTL_CODE( DeviceType, Function, Method, Access ) (                 \
-    ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \
-)
-
-#define METHOD_BUFFERED                 0
-#define METHOD_IN_DIRECT                1
-#define METHOD_OUT_DIRECT               2
-#define METHOD_NEITHER                  3
-
-#define FILE_ANY_ACCESS                 0
-#define FILE_READ_ACCESS          ( 0x0001 )    // file & pipe
-#define FILE_WRITE_ACCESS         ( 0x0002 )    // file & pipe
-
-# endif /* CTL_CODE */ /*}*/
-
-/*
- * Now we can define WinNT/Win95 DeviceIoControl codes.
- *
- * These codes are defined in di_defs.h too, a possible mismatch will be
- * detected when the dbgtool is compiled.
- */
-
-#define IOCTL_DRIVER_LNK \
-        CTL_CODE(0x8001U,0x701,METHOD_OUT_DIRECT,FILE_ANY_ACCESS)
-#define IOCTL_DRIVER_DBG \
-        CTL_CODE(0x8001U,0x702,METHOD_OUT_DIRECT,FILE_ANY_ACCESS)
-
-#endif /* __DBGIOCTL_H__ */
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 4aba5c502d8e..c90928974249 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index 556b19615bc7..78f141e77466 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 5e862e244117..6d39f9360766 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -17,7 +17,6 @@
 #include <linux/ioport.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/poll.h>
diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
index af3eb9e795b5..85784a7ffb25 100644
--- a/drivers/isdn/hardware/eicon/divasync.h
+++ b/drivers/isdn/hardware/eicon/divasync.h
@@ -216,7 +216,7 @@ typedef struct
 #define SERIAL_HOOK_RING 0x85
 #define SERIAL_HOOK_DETACH 0x8f
  unsigned char Flags;           /* function refinements   */
- /* parameters passed by the the ATTACH request      */
+ /* parameters passed by the ATTACH request      */
  SERIAL_INT_CB InterruptHandler; /* called on each interrupt  */
  SERIAL_DPC_CB DeferredHandler; /* called on hook state changes */
  void   *HandlerContext; /* context for both handlers */
diff --git a/drivers/isdn/hardware/eicon/main_if.h b/drivers/isdn/hardware/eicon/main_if.h
deleted file mode 100644
index 0ea339afd424..000000000000
--- a/drivers/isdn/hardware/eicon/main_if.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
-  Copyright (c) Eicon Technology Corporation, 2000.
- *
-  This source file is supplied for the use with Eicon
-  Technology Corporation's range of DIVA Server Adapters.
- *
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
-  any later version.
- *
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY OF ANY KIND WHATSOEVER INCLUDING ANY
-  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.
- *
- */
-/*------------------------------------------------------------------*/
-/* file: main_if.h                                                  */
-/*------------------------------------------------------------------*/
-# ifndef MAIN_IF___H
-# define MAIN_IF___H
-
-# include "debug_if.h"
-
-void  DI_lock (void) ;
-void  DI_unlock (void) ;
-
-#ifdef NOT_YET_NEEDED
-void  DI_nttime (LARGE_INTEGER *NTtime) ;
-void  DI_ntlcltime(LARGE_INTEGER *NTtime, LARGE_INTEGER *lclNTtime) ;
-void  DI_nttimefields(LARGE_INTEGER *NTtime, TIME_FIELDS *TimeFields);
-unsigned long  DI_wintime(LARGE_INTEGER *NTtime) ;
-
-unsigned short  DiInsertProcessorNumber (int type) ;
-void DiProcessEventLog (unsigned short id, unsigned long msgID, va_list ap);
-
-void  StartIoctlTimer (void (*Handler)(void), unsigned long msec) ;
-void  StopIoctlTimer (void) ;
-void  UnpendIoctl (DbgRequest *pDbgReq) ;
-#endif
-
-void add_to_q(int, char* , unsigned int);
-# endif /* MAIN_IF___H */
-
diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h
index ff09f07f440a..15d4942de53b 100644
--- a/drivers/isdn/hardware/eicon/platform.h
+++ b/drivers/isdn/hardware/eicon/platform.h
@@ -26,7 +26,6 @@
 #include <linux/vmalloc.h>
 #include <linux/proc_fs.h>
 #include <linux/interrupt.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <asm/types.h>
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 9f44d3e69fb0..1f18f1993387 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -37,7 +37,6 @@
 #include <linux/kernel_stat.h>
 #include <linux/usb.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include "hisax.h"
 #include "hisax_if.h"
 #include "hfc_usb.h"
@@ -1218,11 +1217,11 @@ usb_init(hfcusb_data * hfc)
         /* aux = output, reset off */
         write_usb(hfc, HFCUSB_CIRM, 0x10);
 
-        /* set USB_SIZE to match the the wMaxPacketSize for INT or BULK transfers */
+        /* set USB_SIZE to match the wMaxPacketSize for INT or BULK transfers */
         write_usb(hfc, HFCUSB_USB_SIZE,
                   (hfc->packet_size / 8) | ((hfc->packet_size / 8) << 4));
 
-        /* set USB_SIZE_I to match the the wMaxPacketSize for ISO transfers */
+        /* set USB_SIZE_I to match the wMaxPacketSize for ISO transfers */
         write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size);
 
         /* enable PCM/GCI master mode */
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c
index 84dccd526ac0..6cdbad3a9926 100644
--- a/drivers/isdn/hysdn/boardergo.c
+++ b/drivers/isdn/hysdn/boardergo.c
@@ -443,7 +443,7 @@ ergo_inithardware(hysdn_card * card)
         card->waitpofready = ergo_waitpofready;
         card->set_errlog_state = ergo_set_errlog_state;
         INIT_WORK(&card->irq_queue, ergo_irq_bh);
-        card->hysdn_lock = SPIN_LOCK_UNLOCKED;
+        spin_lock_init(&card->hysdn_lock);
 
         return (0);
 }                               /* ergo_inithardware */
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 4c7dedac0e51..27b3991fb0ec 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -297,8 +297,6 @@ hysdn_log_close(struct inode *ino, struct file *filep)
         struct procdata *pd;
         hysdn_card *card;
         int retval = 0;
-        unsigned long flags;
-        spinlock_t hysdn_lock = SPIN_LOCK_UNLOCKED;
 
         lock_kernel();
         if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_WRITE) {
@@ -308,7 +306,6 @@ hysdn_log_close(struct inode *ino, struct file *filep)
                 /* read access -> log/debug read, mark one further file as closed */
 
                 pd = NULL;
-                spin_lock_irqsave(&hysdn_lock, flags);
                 inf = *((struct log_data **) filep->private_data);      /* get first log entry */
                 if (inf)
                         pd = (struct procdata *) inf->proc_ctrl;        /* still entries there */
@@ -331,7 +328,6 @@ hysdn_log_close(struct inode *ino, struct file *filep)
                         inf->usage_cnt--;       /* decrement usage count for buffers */
                         inf = inf->next;
                 }
-                spin_unlock_irqrestore(&hysdn_lock, flags);
 
                 if (pd)
                         if (pd->if_used <= 0)   /* delete buffers if last file closed */
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 1e699bcaba0f..82d957bde299 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -12,6 +12,7 @@
 #include "icn.h"
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 
 static int portbase = ICN_BASEADDR;
 static unsigned long membase = ICN_MEMADDR;
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index e93ad59f60bf..bb92e3cd9334 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -1462,7 +1462,7 @@ isdnloop_initcard(char *id)
                 skb_queue_head_init(&card->bqueue[i]);
         }
         skb_queue_head_init(&card->dqueue);
-        card->isdnloop_lock = SPIN_LOCK_UNLOCKED;
+        spin_lock_init(&card->isdnloop_lock);
         card->next = cards;
         cards = card;
         if (!register_isdn(&card->interface)) {
diff --git a/drivers/isdn/sc/message.c b/drivers/isdn/sc/message.c
index c5a307e3c496..0b4c4f15abdd 100644
--- a/drivers/isdn/sc/message.c
+++ b/drivers/isdn/sc/message.c
@@ -16,7 +16,7 @@
  *     +1 (416) 297-8565
  *     +1 (416) 297-6433 Facsimile
  */
-
+#include <linux/sched.h>
 #include "includes.h"
 #include "hardware.h"
 #include "message.h"
diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 703cc88d1ef9..e8e37d826478 100644
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -2,6 +2,7 @@
 # KVM configuration
 #
 menu "Virtualization"
+        depends on X86
 
 config KVM
         tristate "Kernel-based Virtual Machine (KVM) support"
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 41634fde8e13..1c040d80c641 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -11,6 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
+#include <asm/signal.h>
 
 #include "vmx.h"
 #include <linux/kvm.h>
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index c8b8cfa332bb..da985b31b17e 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -40,6 +40,7 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
+#include <linux/sched.h>
 
 #include "x86_emulate.h"
 #include "segment_descriptor.h"
@@ -2889,7 +2890,9 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
 
         switch (val) {
         case CPU_DOWN_PREPARE:
+        case CPU_DOWN_PREPARE_FROZEN:
         case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
                 printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n",
                        cpu);
                 decache_vcpus_on_cpu(cpu);
@@ -2897,6 +2900,7 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
                                          NULL, 0, 1);
                 break;
         case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
                 printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",
                        cpu);
                 smp_call_function_single(cpu, kvm_arch_ops->hardware_enable,
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 9c15f32eea18..fa17d6d4f0cb 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -19,6 +19,7 @@
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
 #include <linux/profile.h>
+#include <linux/sched.h>
 #include <asm/desc.h>
 
 #include "kvm_svm.h"
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 724db0027f00..e6e4d240b2a6 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -22,6 +22,7 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/profile.h>
+#include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/desc.h>
 
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 80acd08f0e97..87d2046f866c 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -1,5 +1,6 @@
 
 menu "LED devices"
+        depends on HAS_IOMEM
 
 config NEW_LEDS
         bool "LED Support"
diff --git a/drivers/leds/leds-h1940.c b/drivers/leds/leds-h1940.c
index 1d49d2ade557..677c99325be5 100644
--- a/drivers/leds/leds-h1940.c
+++ b/drivers/leds/leds-h1940.c
@@ -1,5 +1,5 @@
 /*
- * drivers/leds/h1940-leds.c
+ * drivers/leds/leds-h1940.c
  * Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org>
  *
  * This file is subject to the terms and conditions of the GNU General Public
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 1a86387e23be..58926da0ae18 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -1,6 +1,10 @@
 
-menu "Macintosh device drivers"
+menuconfig MACINTOSH_DRIVERS
+        bool "Macintosh device drivers"
         depends on PPC || MAC || X86
+        default y
+
+if MACINTOSH_DRIVERS
 
 config ADB
         bool "Apple Desktop Bus (ADB) support"
@@ -109,7 +113,9 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
         tristate "APM emulation"
-        depends on PPC_PMAC && PPC32 && PM && ADB_PMU
+        select SYS_SUPPORTS_APM_EMULATION
+        select APM_EMULATION
+        depends on ADB_PMU && PM
 
 config PMAC_MEDIABAY
         bool "Support PowerBook hotswap media bay"
@@ -231,7 +237,7 @@ config PMAC_RACKMETER
         tristate "Support for Apple XServe front panel LEDs"
         depends on PPC_PMAC
         help
-          This driver procides some support to control the front panel
+          This driver provides some support to control the front panel
           blue LEDs "vu-meter" of the XServer macs.
 
-endmenu
+endif # MACINTOSH_DRIVERS
diff --git a/drivers/macintosh/apm_emu.c b/drivers/macintosh/apm_emu.c
index cdb0bead9917..9821e6361e60 100644
--- a/drivers/macintosh/apm_emu.c
+++ b/drivers/macintosh/apm_emu.c
@@ -1,9 +1,7 @@
-/* APM emulation layer for PowerMac
- * 
- * Copyright 2001 Benjamin Herrenschmidt (benh@kernel.crashing.org)
+/*
+ * APM emulation for PMU-based machines
  *
- * Lots of code inherited from apm.c, see appropriate notice in
- *  arch/i386/kernel/apm.c
+ * Copyright 2001 Benjamin Herrenschmidt (benh@kernel.crashing.org)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -18,429 +16,39 @@
  *
  */
 
-#include <linux/module.h>
-
-#include <linux/poll.h>
-#include <linux/types.h>
-#include <linux/stddef.h>
-#include <linux/timer.h>
-#include <linux/fcntl.h>
-#include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-#include <linux/miscdevice.h>
-#include <linux/apm_bios.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/pm.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
-
+#include <linux/module.h>
+#include <linux/apm-emulation.h>
 #include <linux/adb.h>
 #include <linux/pmu.h>
 
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
-
-#undef DEBUG
-
-#ifdef DEBUG
-#define DBG(args...) printk(KERN_DEBUG args)
-//#define DBG(args...) xmon_printf(args)
-#else
-#define DBG(args...) do { } while (0)
-#endif
-
-/*
- * The apm_bios device is one of the misc char devices.
- * This is its minor number.
- */
-#define APM_MINOR_DEV   134
-
-/*
- * Maximum number of events stored
- */
-#define APM_MAX_EVENTS          20
-
-#define FAKE_APM_BIOS_VERSION   0x0101
-
-#define APM_USER_NOTIFY_TIMEOUT (5*HZ)
-
-/*
- * The per-file APM data
- */
-struct apm_user {
-        int             magic;
-        struct apm_user *       next;
-        int             suser: 1;
-        int             suspend_waiting: 1;
-        int             suspends_pending;
-        int             suspends_read;
-        int             event_head;
-        int             event_tail;
-        apm_event_t     events[APM_MAX_EVENTS];
-};
-
-/*
- * The magic number in apm_user
- */
-#define APM_BIOS_MAGIC          0x4101
-
-/*
- * Local variables
- */
-static int                      suspends_pending;
-
-static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
-static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
-static struct apm_user *        user_list;
-
-static void apm_notify_sleep(struct pmu_sleep_notifier *self, int when);
-static struct pmu_sleep_notifier apm_sleep_notifier = {
-        apm_notify_sleep,
-        SLEEP_LEVEL_USERLAND,
-};
-
-static const char driver_version[] = "0.5";     /* no spaces */
-
-#ifdef DEBUG
-static char *   apm_event_name[] = {
-        "system standby",
-        "system suspend",
-        "normal resume",
-        "critical resume",
-        "low battery",
-        "power status change",
-        "update time",
-        "critical suspend",
-        "user standby",
-        "user suspend",
-        "system standby resume",
-        "capabilities change"
-};
-#define NR_APM_EVENT_NAME       \
-                (sizeof(apm_event_name) / sizeof(apm_event_name[0]))
-
-#endif
-
-static int queue_empty(struct apm_user *as)
-{
-        return as->event_head == as->event_tail;
-}
-
-static apm_event_t get_queued_event(struct apm_user *as)
-{
-        as->event_tail = (as->event_tail + 1) % APM_MAX_EVENTS;
-        return as->events[as->event_tail];
-}
-
-static void queue_event(apm_event_t event, struct apm_user *sender)
-{
-        struct apm_user *       as;
-
-        DBG("apm_emu: queue_event(%s)\n", apm_event_name[event-1]);
-        if (user_list == NULL)
-                return;
-        for (as = user_list; as != NULL; as = as->next) {
-                if (as == sender)
-                        continue;
-                as->event_head = (as->event_head + 1) % APM_MAX_EVENTS;
-                if (as->event_head == as->event_tail) {
-                        static int notified;
-
-                        if (notified++ == 0)
-                            printk(KERN_ERR "apm_emu: an event queue overflowed\n");
-                        as->event_tail = (as->event_tail + 1) % APM_MAX_EVENTS;
-                }
-                as->events[as->event_head] = event;
-                if (!as->suser)
-                        continue;
-                switch (event) {
-                case APM_SYS_SUSPEND:
-                case APM_USER_SUSPEND:
-                        as->suspends_pending++;
-                        suspends_pending++;
-                        break;
-                case APM_NORMAL_RESUME:
-                        as->suspend_waiting = 0;
-                        break;
-                }
-        }
-        wake_up_interruptible(&apm_waitqueue);
-}
-
-static int check_apm_user(struct apm_user *as, const char *func)
-{
-        if ((as == NULL) || (as->magic != APM_BIOS_MAGIC)) {
-                printk(KERN_ERR "apm_emu: %s passed bad filp\n", func);
-                return 1;
-        }
-        return 0;
-}
-
-static ssize_t do_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos)
-{
-        struct apm_user *       as;
-        size_t                  i;
-        apm_event_t             event;
-        DECLARE_WAITQUEUE(wait, current);
-
-        as = fp->private_data;
-        if (check_apm_user(as, "read"))
-                return -EIO;
-        if (count < sizeof(apm_event_t))
-                return -EINVAL;
-        if (queue_empty(as)) {
-                if (fp->f_flags & O_NONBLOCK)
-                        return -EAGAIN;
-                add_wait_queue(&apm_waitqueue, &wait);
-repeat:
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (queue_empty(as) && !signal_pending(current)) {
-                        schedule();
-                        goto repeat;
-                }
-                set_current_state(TASK_RUNNING);
-                remove_wait_queue(&apm_waitqueue, &wait);
-        }
-        i = count;
-        while ((i >= sizeof(event)) && !queue_empty(as)) {
-                event = get_queued_event(as);
-                DBG("apm_emu: do_read, returning: %s\n", apm_event_name[event-1]);
-                if (copy_to_user(buf, &event, sizeof(event))) {
-                        if (i < count)
-                                break;
-                        return -EFAULT;
-                }
-                switch (event) {
-                case APM_SYS_SUSPEND:
-                case APM_USER_SUSPEND:
-                        as->suspends_read++;
-                        break;
-                }
-                buf += sizeof(event);
-                i -= sizeof(event);
-        }
-        if (i < count)
-                return count - i;
-        if (signal_pending(current))
-                return -ERESTARTSYS;
-        return 0;
-}
-
-static unsigned int do_poll(struct file *fp, poll_table * wait)
-{
-        struct apm_user * as;
-
-        as = fp->private_data;
-        if (check_apm_user(as, "poll"))
-                return 0;
-        poll_wait(fp, &apm_waitqueue, wait);
-        if (!queue_empty(as))
-                return POLLIN | POLLRDNORM;
-        return 0;
-}
-
-static int do_ioctl(struct inode * inode, struct file *filp,
-                    u_int cmd, u_long arg)
-{
-        struct apm_user *       as;
-        DECLARE_WAITQUEUE(wait, current);
-
-        as = filp->private_data;
-        if (check_apm_user(as, "ioctl"))
-                return -EIO;
-        if (!as->suser)
-                return -EPERM;
-        switch (cmd) {
-        case APM_IOC_SUSPEND:
-                /* If a suspend message was sent to userland, we
-                 * consider this as a confirmation message
-                 */
-                if (as->suspends_read > 0) {
-                        as->suspends_read--;
-                        as->suspends_pending--;
-                        suspends_pending--;
-                } else {
-                        // Route to PMU suspend ?
-                        break;
-                }
-                as->suspend_waiting = 1;
-                add_wait_queue(&apm_waitqueue, &wait);
-                DBG("apm_emu: ioctl waking up sleep waiter !\n");
-                wake_up(&apm_suspend_waitqueue);
-                mb();
-                while(as->suspend_waiting && !signal_pending(current)) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule();
-                }
-                set_current_state(TASK_RUNNING);
-                remove_wait_queue(&apm_waitqueue, &wait);
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static int do_release(struct inode * inode, struct file * filp)
-{
-        struct apm_user *       as;
-
-        as = filp->private_data;
-        if (check_apm_user(as, "release"))
-                return 0;
-        filp->private_data = NULL;
-        lock_kernel();
-        if (as->suspends_pending > 0) {
-                suspends_pending -= as->suspends_pending;
-                if (suspends_pending <= 0)
-                        wake_up(&apm_suspend_waitqueue);
-        }
-        if (user_list == as)
-                user_list = as->next;
-        else {
-                struct apm_user *       as1;
-
-                for (as1 = user_list;
-                     (as1 != NULL) && (as1->next != as);
-                     as1 = as1->next)
-                        ;
-                if (as1 == NULL)
-                        printk(KERN_ERR "apm: filp not in user list\n");
-                else
-                        as1->next = as->next;
-        }
-        unlock_kernel();
-        kfree(as);
-        return 0;
-}
-
-static int do_open(struct inode * inode, struct file * filp)
-{
-        struct apm_user *       as;
-
-        as = kmalloc(sizeof(*as), GFP_KERNEL);
-        if (as == NULL) {
-                printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
-                       sizeof(*as));
-                return -ENOMEM;
-        }
-        as->magic = APM_BIOS_MAGIC;
-        as->event_tail = as->event_head = 0;
-        as->suspends_pending = 0;
-        as->suspends_read = 0;
-        /*
-         * XXX - this is a tiny bit broken, when we consider BSD
-         * process accounting. If the device is opened by root, we
-         * instantly flag that we used superuser privs. Who knows,
-         * we might close the device immediately without doing a
-         * privileged operation -- cevans
-         */
-        as->suser = capable(CAP_SYS_ADMIN);
-        as->next = user_list;
-        user_list = as;
-        filp->private_data = as;
-
-        DBG("apm_emu: opened by %s, suser: %d\n", current->comm, (int)as->suser);
-
-        return 0;
-}
-
-/* Wait for all clients to ack the suspend request. APM API
- * doesn't provide a way to NAK, but this could be added
- * here.
- */
-static void wait_all_suspend(void)
-{
-        DECLARE_WAITQUEUE(wait, current);
-
-        add_wait_queue(&apm_suspend_waitqueue, &wait);
-        DBG("apm_emu: wait_all_suspend(), suspends_pending: %d\n", suspends_pending);
-        while(suspends_pending > 0) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule();
-        }
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&apm_suspend_waitqueue, &wait);
-
-        DBG("apm_emu: wait_all_suspend() - complete !\n");
-}
-
-static void apm_notify_sleep(struct pmu_sleep_notifier *self, int when)
-{
-        switch(when) {
-                case PBOOK_SLEEP_REQUEST:
-                        queue_event(APM_SYS_SUSPEND, NULL);
-                        wait_all_suspend();
-                        break;
-                case PBOOK_WAKE:
-                        queue_event(APM_NORMAL_RESUME, NULL);
-                        break;
-        }
-}
-
 #define APM_CRITICAL            10
 #define APM_LOW                 30
 
-static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
+static void pmu_apm_get_power_status(struct apm_power_info *info)
 {
-        /* Arguments, with symbols from linux/apm_bios.h.  Information is
-           from the Get Power Status (0x0a) call unless otherwise noted.
+        int percentage = -1;
+        int batteries = 0;
+        int time_units = -1;
+        int real_count = 0;
+        int i;
+        char charging = 0;
+        long charge = -1;
+        long amperage = 0;
+        unsigned long btype = 0;
+
+        info->battery_status = APM_BATTERY_STATUS_UNKNOWN;
+        info->battery_flag = APM_BATTERY_FLAG_UNKNOWN;
+        info->units = APM_UNITS_MINS;
+
+        if (pmu_power_flags & PMU_PWR_AC_PRESENT)
+                info->ac_line_status = APM_AC_ONLINE;
+        else
+                info->ac_line_status = APM_AC_OFFLINE;
 
-           0) Linux driver version (this will change if format changes)
-           1) APM BIOS Version.  Usually 1.0, 1.1 or 1.2.
-           2) APM flags from APM Installation Check (0x00):
-              bit 0: APM_16_BIT_SUPPORT
-              bit 1: APM_32_BIT_SUPPORT
-              bit 2: APM_IDLE_SLOWS_CLOCK
-              bit 3: APM_BIOS_DISABLED
-              bit 4: APM_BIOS_DISENGAGED
-           3) AC line status
-              0x00: Off-line
-              0x01: On-line
-              0x02: On backup power (BIOS >= 1.1 only)
-              0xff: Unknown
-           4) Battery status
-              0x00: High
-              0x01: Low
-              0x02: Critical
-              0x03: Charging
-              0x04: Selected battery not present (BIOS >= 1.2 only)
-              0xff: Unknown
-           5) Battery flag
-              bit 0: High
-              bit 1: Low
-              bit 2: Critical
-              bit 3: Charging
-              bit 7: No system battery
-              0xff: Unknown
-           6) Remaining battery life (percentage of charge):
-              0-100: valid
-              -1: Unknown
-           7) Remaining battery life (time units):
-              Number of remaining minutes or seconds
-              -1: Unknown
-           8) min = minutes; sec = seconds */
-
-        unsigned short  ac_line_status;
-        unsigned short  battery_status = 0;
-        unsigned short  battery_flag   = 0xff;
-        int             percentage     = -1;
-        int             time_units     = -1;
-        int             real_count     = 0;
-        int             i;
-        char *          p = buf;
-        char            charging       = 0;
-        long            charge         = -1;
-        long            amperage       = 0;
-        unsigned long   btype          = 0;
-
-        ac_line_status = ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0);
         for (i=0; i<pmu_battery_count; i++) {
                 if (pmu_batteries[i].flags & PMU_BATT_PRESENT) {
-                        battery_status++;
+                        batteries++;
                         if (percentage < 0)
                                 percentage = 0;
                         if (charge < 0)
@@ -456,9 +64,9 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
                                 charging++;
                 }
         }
-        if (0 == battery_status)
-                ac_line_status = 1;
-        battery_status = 0xff;
+        if (batteries == 0)
+                info->ac_line_status = APM_AC_ONLINE;
+
         if (real_count) {
                 if (amperage < 0) {
                         if (btype == PMU_BATT_TYPE_SMART)
@@ -468,85 +76,44 @@ static int apm_emu_get_info(char *buf, char **start, off_t fpos, int length)
                 }
                 percentage /= real_count;
                 if (charging > 0) {
-                        battery_status = 0x03;
-                        battery_flag = 0x08;
+                        info->battery_status = APM_BATTERY_STATUS_CHARGING;
+                        info->battery_flag = APM_BATTERY_FLAG_CHARGING;
                 } else if (percentage <= APM_CRITICAL) {
-                        battery_status = 0x02;
-                        battery_flag = 0x04;
+                        info->battery_status = APM_BATTERY_STATUS_CRITICAL;
+                        info->battery_flag = APM_BATTERY_FLAG_CRITICAL;
                 } else if (percentage <= APM_LOW) {
-                        battery_status = 0x01;
-                        battery_flag = 0x02;
+                        info->battery_status = APM_BATTERY_STATUS_LOW;
+                        info->battery_flag = APM_BATTERY_FLAG_LOW;
                 } else {
-                        battery_status = 0x00;
-                        battery_flag = 0x01;
+                        info->battery_status = APM_BATTERY_STATUS_HIGH;
+                        info->battery_flag = APM_BATTERY_FLAG_HIGH;
                 }
         }
-        p += sprintf(p, "%s %d.%d 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
-                     driver_version,
-                     (FAKE_APM_BIOS_VERSION >> 8) & 0xff,
-                     FAKE_APM_BIOS_VERSION & 0xff,
-                     0,
-                     ac_line_status,
-                     battery_status,
-                     battery_flag,
-                     percentage,
-                     time_units,
-                     "min");
 
-        return p - buf;
+        info->battery_life = percentage;
+        info->time = time_units;
 }
 
-static const struct file_operations apm_bios_fops = {
-        .owner          = THIS_MODULE,
-        .read           = do_read,
-        .poll           = do_poll,
-        .ioctl          = do_ioctl,
-        .open           = do_open,
-        .release        = do_release,
-};
-
-static struct miscdevice apm_device = {
-        APM_MINOR_DEV,
-        "apm_bios",
-        &apm_bios_fops
-};
-
 static int __init apm_emu_init(void)
 {
-        struct proc_dir_entry *apm_proc;
-
-        if (sys_ctrler != SYS_CTRLER_PMU) {
-                printk(KERN_INFO "apm_emu: Requires a machine with a PMU.\n");
-                return -ENODEV;
-        }
-                
-        apm_proc = create_proc_info_entry("apm", 0, NULL, apm_emu_get_info);
-        if (apm_proc)
-                apm_proc->owner = THIS_MODULE;
+        apm_get_power_status = pmu_apm_get_power_status;
 
-        if (misc_register(&apm_device) != 0)
-                printk(KERN_INFO "Could not create misc. device for apm\n");
-
-        pmu_register_sleep_notifier(&apm_sleep_notifier);
-
-        printk(KERN_INFO "apm_emu: APM Emulation %s initialized.\n", driver_version);
+        printk(KERN_INFO "apm_emu: PMU APM Emulation initialized.\n");
 
         return 0;
 }
 
 static void __exit apm_emu_exit(void)
 {
-        pmu_unregister_sleep_notifier(&apm_sleep_notifier);
-        misc_deregister(&apm_device);
-        remove_proc_entry("apm", NULL);
+        if (apm_get_power_status == pmu_apm_get_power_status)
+                apm_get_power_status = NULL;
 
-        printk(KERN_INFO "apm_emu: APM Emulation removed.\n");
+        printk(KERN_INFO "apm_emu: PMU APM Emulation removed.\n");
 }
 
 module_init(apm_emu_init);
 module_exit(apm_emu_exit);
 
 MODULE_AUTHOR("Benjamin Herrenschmidt");
-MODULE_DESCRIPTION("APM emulation layer for PowerMac");
+MODULE_DESCRIPTION("APM emulation for PowerMac");
 MODULE_LICENSE("GPL");
-
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index 1599dc34f15f..76c1e8e4a487 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -24,7 +24,7 @@ static int mouse_last_keycode;
 
 #if defined(CONFIG_SYSCTL)
 /* file(s) in /proc/sys/dev/mac_hid */
-ctl_table mac_hid_files[] = {
+static ctl_table mac_hid_files[] = {
         {
                 .ctl_name       = DEV_MAC_HID_MOUSE_BUTTON_EMULATION,
                 .procname       = "mouse_button_emulation",
@@ -53,7 +53,7 @@ ctl_table mac_hid_files[] = {
 };
 
 /* dir in /proc/sys/dev */
-ctl_table mac_hid_dir[] = {
+static ctl_table mac_hid_dir[] = {
         {
                 .ctl_name       = DEV_MAC_HID,
                 .procname       = "mac_hid",
@@ -65,7 +65,7 @@ ctl_table mac_hid_dir[] = {
 };
 
 /* /proc/sys/dev itself, in case that is not there yet */
-ctl_table mac_hid_root_dir[] = {
+static ctl_table mac_hid_root_dir[] = {
         {
                 .ctl_name       = CTL_DEV,
                 .procname       = "dev",
@@ -127,7 +127,7 @@ static int emumousebtn_input_register(void)
         return ret;
 }
 
-int __init mac_hid_init(void)
+static int __init mac_hid_init(void)
 {
         int err;
 
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index cc8267912656..112e5ef728f1 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -41,28 +41,15 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
 static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
                               char *buf)
 {
-        struct of_device *of;
-        const char *compat;
-        int cplen;
-        int length;
+        struct of_device *ofdev = to_of_device(dev);
+        int len;
 
-        of = &to_macio_device (dev)->ofdev;
-        compat = of_get_property(of->node, "compatible", &cplen);
-        if (!compat) compat = "", cplen = 1;
-        length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
-        buf += length;
-        while (cplen > 0) {
-                int l;
-                l = sprintf (buf, "C%s", compat);
-                length += l;
-                buf += l;
-                l = strlen (compat) + 1;
-                compat += l;
-                cplen -= l;
-        }
-        length += sprintf(buf, "\n");
+        len = of_device_get_modalias(ofdev, buf, PAGE_SIZE);
 
-        return length;
+        buf[len] = '\n';
+        buf[len+1] = 0;
+
+        return len+1;
 }
 
 macio_config_of_attr (name, "%s\n");
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 0acf2f7fd9d7..c803d2bba65d 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -563,7 +563,7 @@ static void media_bay_step(int i)
                                 ide_init_hwif_ports(&hw, (unsigned long) bay->cd_base, (unsigned long) 0, NULL);
                                 hw.irq = bay->cd_irq;
                                 hw.chipset = ide_pmac;
-                                bay->cd_index = ide_register_hw(&hw, NULL);
+                                bay->cd_index = ide_register_hw(&hw, 0, NULL);
                                 pmu_resume();
                         }
                         if (bay->cd_index == -1) {
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index a98a328b1cfc..f8e1a135bf9d 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -606,7 +606,7 @@ static void smu_expose_childs(struct work_struct *unused)
         struct device_node *np;
 
         for (np = NULL; (np = of_get_next_child(smu->of_node, np)) != NULL;)
-                if (device_is_compatible(np, "smu-sensors"))
+                if (of_device_is_compatible(np, "smu-sensors"))
                         of_platform_device_create(np, "smu-sensors",
                                                   &smu->of_dev->dev);
 }
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 228903403cfc..bd55e6ab99fc 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <linux/suspend.h>
 #include <linux/kthread.h>
@@ -560,9 +559,9 @@ thermostat_init(void)
         np = of_find_node_by_name(NULL, "fan");
         if (!np)
                 return -ENODEV;
-        if (device_is_compatible(np, "adt7460"))
+        if (of_device_is_compatible(np, "adt7460"))
                 therm_type = ADT7460;
-        else if (device_is_compatible(np, "adt7467"))
+        else if (of_device_is_compatible(np, "adt7467"))
                 therm_type = ADT7467;
         else
                 return -ENODEV;
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 78ff18617139..dbb22403979f 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -117,7 +117,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <linux/reboot.h>
 #include <linux/kmod.h>
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index fc89a7047cd0..55ad95671387 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -31,7 +31,6 @@ static spinlock_t pmu_blink_lock;
 static struct adb_request pmu_blink_req;
 /* -1: no change, 0: request off, 1: request on */
 static int requested_change;
-static int sleeping;
 
 static void pmu_req_done(struct adb_request * req)
 {
@@ -41,7 +40,7 @@ static void pmu_req_done(struct adb_request * req)
         /* if someone requested a change in the meantime
          * (we only see the last one which is fine)
          * then apply it now */
-        if (requested_change != -1 && !sleeping)
+        if (requested_change != -1 && !pmu_sys_suspended)
                 pmu_request(&pmu_blink_req, NULL, 4, 0xee, 4, 0, requested_change);
         /* reset requested change */
         requested_change = -1;
@@ -66,7 +65,7 @@ static void pmu_led_set(struct led_classdev *led_cdev,
                 break;
         }
         /* if request isn't done, then don't do anything */
-        if (pmu_blink_req.complete && !sleeping)
+        if (pmu_blink_req.complete && !pmu_sys_suspended)
                 pmu_request(&pmu_blink_req, NULL, 4, 0xee, 4, 0, requested_change);
  out:
         spin_unlock_irqrestore(&pmu_blink_lock, flags);
@@ -80,32 +79,6 @@ static struct led_classdev pmu_led = {
         .brightness_set = pmu_led_set,
 };
 
-#ifdef CONFIG_PM
-static void pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&pmu_blink_lock, flags);
-
-        switch (when) {
-        case PBOOK_SLEEP_REQUEST:
-                sleeping = 1;
-                break;
-        case PBOOK_WAKE:
-                sleeping = 0;
-                break;
-        default:
-                /* do nothing */
-                break;
-        }
-        spin_unlock_irqrestore(&pmu_blink_lock, flags);
-}
-
-static struct pmu_sleep_notifier via_pmu_led_sleep_notif = {
-        .notifier_call = pmu_led_sleep_call,
-};
-#endif
-
 static int __init via_pmu_led_init(void)
 {
         struct device_node *dt;
@@ -135,9 +108,7 @@ static int __init via_pmu_led_init(void)
         /* no outstanding req */
         pmu_blink_req.complete = 1;
         pmu_blink_req.done = pmu_req_done;
-#ifdef CONFIG_PM
-        pmu_register_sleep_notifier(&via_pmu_led_sleep_notif);
-#endif
+
         return led_classdev_register(NULL, &pmu_led);
 }
 
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 1729d3fd7a11..157080b3b468 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -310,14 +310,14 @@ int __init find_via_pmu(void)
                         PMU_INT_TICK;
         
         if (vias->parent->name && ((strcmp(vias->parent->name, "ohare") == 0)
-            || device_is_compatible(vias->parent, "ohare")))
+            || of_device_is_compatible(vias->parent, "ohare")))
                 pmu_kind = PMU_OHARE_BASED;
-        else if (device_is_compatible(vias->parent, "paddington"))
+        else if (of_device_is_compatible(vias->parent, "paddington"))
                 pmu_kind = PMU_PADDINGTON_BASED;
-        else if (device_is_compatible(vias->parent, "heathrow"))
+        else if (of_device_is_compatible(vias->parent, "heathrow"))
                 pmu_kind = PMU_HEATHROW_BASED;
-        else if (device_is_compatible(vias->parent, "Keylargo")
-                 || device_is_compatible(vias->parent, "K2-Keylargo")) {
+        else if (of_device_is_compatible(vias->parent, "Keylargo")
+                 || of_device_is_compatible(vias->parent, "K2-Keylargo")) {
                 struct device_node *gpiop;
                 struct device_node *adbp;
                 u64 gaddr = OF_BAD_ADDR;
@@ -2759,7 +2759,7 @@ pmu_polled_request(struct adb_request *req)
 
 #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
 
-static int pmu_sys_suspended;
+int pmu_sys_suspended;
 
 static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
 {
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 94c117ef20c1..11ced17f438a 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -27,7 +27,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/kthread.h>
 #include <linux/jiffies.h>
 #include <linux/reboot.h>
@@ -217,7 +216,10 @@ int wf_register_control(struct wf_control *new_ct)
         new_ct->attr.attr.mode = 0644;
         new_ct->attr.show = wf_show_control;
         new_ct->attr.store = wf_store_control;
-        device_create_file(&wf_platform_device.dev, &new_ct->attr);
+        if (device_create_file(&wf_platform_device.dev, &new_ct->attr))
+                printk(KERN_WARNING "windfarm: device_create_file failed"
+                        " for %s\n", new_ct->name);
+                /* the subsystem still does useful work without the file */
 
         DBG("wf: Registered control %s\n", new_ct->name);
 
@@ -327,7 +329,10 @@ int wf_register_sensor(struct wf_sensor *new_sr)
         new_sr->attr.attr.mode = 0444;
         new_sr->attr.show = wf_show_sensor;
         new_sr->attr.store = NULL;
-        device_create_file(&wf_platform_device.dev, &new_sr->attr);
+        if (device_create_file(&wf_platform_device.dev, &new_sr->attr))
+                printk(KERN_WARNING "windfarm: device_create_file failed"
+                        " for %s\n", new_sr->name);
+                /* the subsystem still does useful work without the file */
 
         DBG("wf: Registered sensor %s\n", new_sr->name);
 
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index ab4d1b63f63e..a0fabf3c2008 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -188,10 +188,10 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
                 if (loc == NULL || addr == 0)
                         continue;
                 /* real lm75 */
-                if (device_is_compatible(dev, "lm75"))
+                if (of_device_is_compatible(dev, "lm75"))
                         wf_lm75_create(adapter, addr, 0, loc);
                 /* ds1775 (compatible, better resolution */
-                else if (device_is_compatible(dev, "ds1775"))
+                else if (of_device_is_compatible(dev, "ds1775"))
                         wf_lm75_create(adapter, addr, 1, loc);
         }
         return 0;
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index eaa74afa175b..5f03aab9fb5d 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -131,7 +131,7 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
                  */
                 if (!pmac_i2c_match_adapter(dev, adapter))
                         continue;
-                if (!device_is_compatible(dev, "max6690"))
+                if (!of_device_is_compatible(dev, "max6690"))
                         continue;
                 addr = pmac_i2c_get_dev_addr(dev);
                 loc = of_get_property(dev, "hwsensor-location", NULL);
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index ff398adc0283..58c2590f05ec 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -263,7 +263,7 @@ static int __init smu_controls_init(void)
         /* Look for RPM fans */
         for (fans = NULL; (fans = of_get_next_child(smu, fans)) != NULL;)
                 if (!strcmp(fans->name, "rpm-fans") ||
-                    device_is_compatible(fans, "smu-rpm-fans"))
+                    of_device_is_compatible(fans, "smu-rpm-fans"))
                         break;
         for (fan = NULL;
              fans && (fan = of_get_next_child(fans, fan)) != NULL;) {
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 9a6c2cf8fd0e..1043b39aa123 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -380,7 +380,7 @@ static int wf_sat_attach(struct i2c_adapter *adapter)
         busnode = pmac_i2c_get_bus_node(bus);
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL)
-                if (device_is_compatible(dev, "smu-sat"))
+                if (of_device_is_compatible(dev, "smu-sat"))
                         wf_sat_create(adapter, dev);
         return 0;
 }
diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c
index da862e4632dd..67b8e9453b19 100644
--- a/drivers/mca/mca-bus.c
+++ b/drivers/mca/mca-bus.c
@@ -47,19 +47,25 @@ static int mca_bus_match (struct device *dev, struct device_driver *drv)
 {
         struct mca_device *mca_dev = to_mca_device (dev);
         struct mca_driver *mca_drv = to_mca_driver (drv);
-        const short *mca_ids = mca_drv->id_table;
-        int i;
-
-        if (!mca_ids)
-                return 0;
-
-        for(i = 0; mca_ids[i]; i++) {
-                if (mca_ids[i] == mca_dev->pos_id) {
-                        mca_dev->index = i;
-                        return 1;
+        const unsigned short *mca_ids = mca_drv->id_table;
+        int i = 0;
+
+        if (mca_ids) {
+                for(i = 0; mca_ids[i]; i++) {
+                        if (mca_ids[i] == mca_dev->pos_id) {
+                                mca_dev->index = i;
+                                return 1;
+                        }
                 }
         }
-
+        /* If the integrated id is present, treat it as though it were an
+         * additional id in the id_table (it can't be because by definition,
+         * integrated id's overflow a short */
+        if (mca_drv->integrated_id && mca_dev->pos_id ==
+            mca_drv->integrated_id) {
+                mca_dev->index = i;
+                return 1;
+        }
         return 0;
 }
 
diff --git a/drivers/mca/mca-driver.c b/drivers/mca/mca-driver.c
index 2223466b3d8a..32cd39bcc715 100644
--- a/drivers/mca/mca-driver.c
+++ b/drivers/mca/mca-driver.c
@@ -36,12 +36,25 @@ int mca_register_driver(struct mca_driver *mca_drv)
                 mca_drv->driver.bus = &mca_bus_type;
                 if ((r = driver_register(&mca_drv->driver)) < 0)
                         return r;
+                mca_drv->integrated_id = 0;
         }
 
         return 0;
 }
 EXPORT_SYMBOL(mca_register_driver);
 
+int mca_register_driver_integrated(struct mca_driver *mca_driver,
+                                   int integrated_id)
+{
+        int r = mca_register_driver(mca_driver);
+
+        if (!r)
+                mca_driver->integrated_id = integrated_id;
+
+        return r;
+}
+EXPORT_SYMBOL(mca_register_driver_integrated);
+
 void mca_unregister_driver(struct mca_driver *mca_drv)
 {
         if (MCA_bus)
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 4540ade6b6b5..7df934d69134 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -262,6 +262,15 @@ config DM_MULTIPATH_EMC
         ---help---
           Multipath support for EMC CX/AX series hardware.
 
+config DM_DELAY
+        tristate "I/O delaying target (EXPERIMENTAL)"
+        depends on BLK_DEV_DM && EXPERIMENTAL
+        ---help---
+        A target that delays reads and/or writes and can send
+        them to different devices.  Useful for testing.
+
+        If unsure, say N.
+
 endmenu
 
 endif
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 34957a68d921..38754084eac7 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_MD_FAULTY)		+= faulty.o
 obj-$(CONFIG_BLK_DEV_MD)        += md-mod.o
 obj-$(CONFIG_BLK_DEV_DM)        += dm-mod.o
 obj-$(CONFIG_DM_CRYPT)          += dm-crypt.o
+obj-$(CONFIG_DM_DELAY)          += dm-delay.o
 obj-$(CONFIG_DM_MULTIPATH)      += dm-multipath.o dm-round-robin.o
 obj-$(CONFIG_DM_MULTIPATH_EMC)  += dm-emc.o
 obj-$(CONFIG_DM_SNAPSHOT)       += dm-snapshot.o
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index e61e0efe9ec7..5a4a74c1097c 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1456,10 +1456,10 @@ int bitmap_create(mddev_t *mddev)
         bitmap->offset = mddev->bitmap_offset;
         if (file) {
                 get_file(file);
-                do_sync_file_range(file, 0, LLONG_MAX,
-                                   SYNC_FILE_RANGE_WAIT_BEFORE |
-                                   SYNC_FILE_RANGE_WRITE |
-                                   SYNC_FILE_RANGE_WAIT_AFTER);
+                do_sync_mapping_range(file->f_mapping, 0, LLONG_MAX,
+                                      SYNC_FILE_RANGE_WAIT_BEFORE |
+                                      SYNC_FILE_RANGE_WRITE |
+                                      SYNC_FILE_RANGE_WAIT_AFTER);
         }
         /* read superblock from bitmap file (this sets bitmap->chunksize) */
         err = bitmap_read_sb(bitmap);
diff --git a/drivers/md/dm-bio-list.h b/drivers/md/dm-bio-list.h
index da4349649f7f..c6be88826fae 100644
--- a/drivers/md/dm-bio-list.h
+++ b/drivers/md/dm-bio-list.h
@@ -8,17 +8,43 @@
 #define DM_BIO_LIST_H
 
 #include <linux/bio.h>
+#include <linux/prefetch.h>
 
 struct bio_list {
         struct bio *head;
         struct bio *tail;
 };
 
+static inline int bio_list_empty(const struct bio_list *bl)
+{
+        return bl->head == NULL;
+}
+
+#define BIO_LIST_INIT { .head = NULL, .tail = NULL }
+
+#define BIO_LIST(bl) \
+        struct bio_list bl = BIO_LIST_INIT
+
 static inline void bio_list_init(struct bio_list *bl)
 {
         bl->head = bl->tail = NULL;
 }
 
+#define bio_list_for_each(bio, bl) \
+        for (bio = (bl)->head; bio && ({ prefetch(bio->bi_next); 1; }); \
+             bio = bio->bi_next)
+
+static inline unsigned bio_list_size(const struct bio_list *bl)
+{
+        unsigned sz = 0;
+        struct bio *bio;
+
+        bio_list_for_each(bio, bl)
+                sz++;
+
+        return sz;
+}
+
 static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
 {
         bio->bi_next = NULL;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index d8121234c347..7b0fcfc9eaa5 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -33,7 +33,6 @@
 struct crypt_io {
         struct dm_target *target;
         struct bio *base_bio;
-        struct bio *first_clone;
         struct work_struct work;
         atomic_t pending;
         int error;
@@ -107,6 +106,8 @@ struct crypt_config {
 
 static struct kmem_cache *_crypt_io_pool;
 
+static void clone_init(struct crypt_io *, struct bio *);
+
 /*
  * Different IV generation algorithms:
  *
@@ -120,6 +121,9 @@ static struct kmem_cache *_crypt_io_pool;
  * benbi: the 64-bit "big-endian 'narrow block'-count", starting at 1
  *        (needed for LRW-32-AES and possible other narrow block modes)
  *
+ * null: the initial vector is always zero.  Provides compatibility with
+ *       obsolete loop_fish2 devices.  Do not use for new devices.
+ *
  * plumb: unimplemented, see:
  * http://article.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/454
  */
@@ -256,6 +260,13 @@ static int crypt_iv_benbi_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
         return 0;
 }
 
+static int crypt_iv_null_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
+{
+        memset(iv, 0, cc->iv_size);
+
+        return 0;
+}
+
 static struct crypt_iv_operations crypt_iv_plain_ops = {
         .generator = crypt_iv_plain_gen
 };
@@ -272,6 +283,10 @@ static struct crypt_iv_operations crypt_iv_benbi_ops = {
         .generator = crypt_iv_benbi_gen
 };
 
+static struct crypt_iv_operations crypt_iv_null_ops = {
+        .generator = crypt_iv_null_gen
+};
+
 static int
 crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
                           struct scatterlist *in, unsigned int length,
@@ -378,36 +393,21 @@ static int crypt_convert(struct crypt_config *cc,
  * This should never violate the device limitations
  * May return a smaller bio when running out of pages
  */
-static struct bio *
-crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
-                   struct bio *base_bio, unsigned int *bio_vec_idx)
+static struct bio *crypt_alloc_buffer(struct crypt_io *io, unsigned int size)
 {
+        struct crypt_config *cc = io->target->private;
         struct bio *clone;
         unsigned int nr_iovecs = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
         gfp_t gfp_mask = GFP_NOIO | __GFP_HIGHMEM;
         unsigned int i;
 
-        if (base_bio) {
-                clone = bio_alloc_bioset(GFP_NOIO, base_bio->bi_max_vecs, cc->bs);
-                __bio_clone(clone, base_bio);
-        } else
-                clone = bio_alloc_bioset(GFP_NOIO, nr_iovecs, cc->bs);
-
+        clone = bio_alloc_bioset(GFP_NOIO, nr_iovecs, cc->bs);
         if (!clone)
                 return NULL;
 
-        clone->bi_destructor = dm_crypt_bio_destructor;
-
-        /* if the last bio was not complete, continue where that one ended */
-        clone->bi_idx = *bio_vec_idx;
-        clone->bi_vcnt = *bio_vec_idx;
-        clone->bi_size = 0;
-        clone->bi_flags &= ~(1 << BIO_SEG_VALID);
-
-        /* clone->bi_idx pages have already been allocated */
-        size -= clone->bi_idx * PAGE_SIZE;
+        clone_init(io, clone);
 
-        for (i = clone->bi_idx; i < nr_iovecs; i++) {
+        for (i = 0; i < nr_iovecs; i++) {
                 struct bio_vec *bv = bio_iovec_idx(clone, i);
 
                 bv->bv_page = mempool_alloc(cc->page_pool, gfp_mask);
@@ -419,7 +419,7 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
                  * return a partially allocated bio, the caller will then try
                  * to allocate additional bios while submitting this partial bio
                  */
-                if ((i - clone->bi_idx) == (MIN_BIO_PAGES - 1))
+                if (i == (MIN_BIO_PAGES - 1))
                         gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
 
                 bv->bv_offset = 0;
@@ -438,12 +438,6 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
                 return NULL;
         }
 
-        /*
-         * Remember the last bio_vec allocated to be able
-         * to correctly continue after the splitting.
-         */
-        *bio_vec_idx = clone->bi_vcnt;
-
         return clone;
 }
 
@@ -495,9 +489,6 @@ static void dec_pending(struct crypt_io *io, int error)
         if (!atomic_dec_and_test(&io->pending))
                 return;
 
-        if (io->first_clone)
-                bio_put(io->first_clone);
-
         bio_endio(io->base_bio, io->base_bio->bi_size, io->error);
 
         mempool_free(io, cc->io_pool);
@@ -562,6 +553,7 @@ static void clone_init(struct crypt_io *io, struct bio *clone)
         clone->bi_end_io  = crypt_endio;
         clone->bi_bdev    = cc->dev->bdev;
         clone->bi_rw      = io->base_bio->bi_rw;
+        clone->bi_destructor = dm_crypt_bio_destructor;
 }
 
 static void process_read(struct crypt_io *io)
@@ -585,7 +577,6 @@ static void process_read(struct crypt_io *io)
         }
 
         clone_init(io, clone);
-        clone->bi_destructor = dm_crypt_bio_destructor;
         clone->bi_idx = 0;
         clone->bi_vcnt = bio_segments(base_bio);
         clone->bi_size = base_bio->bi_size;
@@ -604,7 +595,6 @@ static void process_write(struct crypt_io *io)
         struct convert_context ctx;
         unsigned remaining = base_bio->bi_size;
         sector_t sector = base_bio->bi_sector - io->target->begin;
-        unsigned bvec_idx = 0;
 
         atomic_inc(&io->pending);
 
@@ -615,14 +605,14 @@ static void process_write(struct crypt_io *io)
          * so repeat the whole process until all the data can be handled.
          */
         while (remaining) {
-                clone = crypt_alloc_buffer(cc, base_bio->bi_size,
-                                           io->first_clone, &bvec_idx);
+                clone = crypt_alloc_buffer(io, remaining);
                 if (unlikely(!clone)) {
                         dec_pending(io, -ENOMEM);
                         return;
                 }
 
                 ctx.bio_out = clone;
+                ctx.idx_out = 0;
 
                 if (unlikely(crypt_convert(cc, &ctx) < 0)) {
                         crypt_free_buffer_pages(cc, clone, clone->bi_size);
@@ -631,31 +621,26 @@ static void process_write(struct crypt_io *io)
                         return;
                 }
 
-                clone_init(io, clone);
-                clone->bi_sector = cc->start + sector;
-
-                if (!io->first_clone) {
-                        /*
-                         * hold a reference to the first clone, because it
-                         * holds the bio_vec array and that can't be freed
-                         * before all other clones are released
-                         */
-                        bio_get(clone);
-                        io->first_clone = clone;
-                }
+                /* crypt_convert should have filled the clone bio */
+                BUG_ON(ctx.idx_out < clone->bi_vcnt);
 
+                clone->bi_sector = cc->start + sector;
                 remaining -= clone->bi_size;
                 sector += bio_sectors(clone);
 
-                /* prevent bio_put of first_clone */
+                /* Grab another reference to the io struct
+                 * before we kick off the request */
                 if (remaining)
                         atomic_inc(&io->pending);
 
                 generic_make_request(clone);
 
+                /* Do not reference clone after this - it
+                 * may be gone already. */
+
                 /* out of memory -> run queues */
                 if (remaining)
-                        congestion_wait(bio_data_dir(clone), HZ/100);
+                        congestion_wait(WRITE, HZ/100);
         }
 }
 
@@ -832,6 +817,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 cc->iv_gen_ops = &crypt_iv_essiv_ops;
         else if (strcmp(ivmode, "benbi") == 0)
                 cc->iv_gen_ops = &crypt_iv_benbi_ops;
+        else if (strcmp(ivmode, "null") == 0)
+                cc->iv_gen_ops = &crypt_iv_null_ops;
         else {
                 ti->error = "Invalid IV mode";
                 goto bad2;
@@ -954,10 +941,12 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,
         struct crypt_config *cc = ti->private;
         struct crypt_io *io;
 
+        if (bio_barrier(bio))
+                return -EOPNOTSUPP;
+
         io = mempool_alloc(cc->io_pool, GFP_NOIO);
         io->target = ti;
         io->base_bio = bio;
-        io->first_clone = NULL;
         io->error = io->post_process = 0;
         atomic_set(&io->pending, 0);
         kcryptd_queue_io(io);
@@ -1057,7 +1046,7 @@ error:
 
 static struct target_type crypt_target = {
         .name   = "crypt",
-        .version= {1, 3, 0},
+        .version= {1, 5, 0},
         .module = THIS_MODULE,
         .ctr    = crypt_ctr,
         .dtr    = crypt_dtr,
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
new file mode 100644
index 000000000000..52c7cf9e5803
--- /dev/null
+++ b/drivers/md/dm-delay.c
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2005-2007 Red Hat GmbH
+ *
+ * A target that delays reads and/or writes and can send
+ * them to different devices.
+ *
+ * This file is released under the GPL.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <linux/bio.h>
+#include <linux/slab.h>
+
+#include "dm.h"
+#include "dm-bio-list.h"
+
+#define DM_MSG_PREFIX "delay"
+
+struct delay_c {
+        struct timer_list delay_timer;
+        struct semaphore timer_lock;
+        struct work_struct flush_expired_bios;
+        struct list_head delayed_bios;
+        atomic_t may_delay;
+        mempool_t *delayed_pool;
+
+        struct dm_dev *dev_read;
+        sector_t start_read;
+        unsigned read_delay;
+        unsigned reads;
+
+        struct dm_dev *dev_write;
+        sector_t start_write;
+        unsigned write_delay;
+        unsigned writes;
+};
+
+struct delay_info {
+        struct delay_c *context;
+        struct list_head list;
+        struct bio *bio;
+        unsigned long expires;
+};
+
+static DEFINE_MUTEX(delayed_bios_lock);
+
+static struct workqueue_struct *kdelayd_wq;
+static struct kmem_cache *delayed_cache;
+
+static void handle_delayed_timer(unsigned long data)
+{
+        struct delay_c *dc = (struct delay_c *)data;
+
+        queue_work(kdelayd_wq, &dc->flush_expired_bios);
+}
+
+static void queue_timeout(struct delay_c *dc, unsigned long expires)
+{
+        down(&dc->timer_lock);
+
+        if (!timer_pending(&dc->delay_timer) || expires < dc->delay_timer.expires)
+                mod_timer(&dc->delay_timer, expires);
+
+        up(&dc->timer_lock);
+}
+
+static void flush_bios(struct bio *bio)
+{
+        struct bio *n;
+
+        while (bio) {
+                n = bio->bi_next;
+                bio->bi_next = NULL;
+                generic_make_request(bio);
+                bio = n;
+        }
+}
+
+static struct bio *flush_delayed_bios(struct delay_c *dc, int flush_all)
+{
+        struct delay_info *delayed, *next;
+        unsigned long next_expires = 0;
+        int start_timer = 0;
+        BIO_LIST(flush_bios);
+
+        mutex_lock(&delayed_bios_lock);
+        list_for_each_entry_safe(delayed, next, &dc->delayed_bios, list) {
+                if (flush_all || time_after_eq(jiffies, delayed->expires)) {
+                        list_del(&delayed->list);
+                        bio_list_add(&flush_bios, delayed->bio);
+                        if ((bio_data_dir(delayed->bio) == WRITE))
+                                delayed->context->writes--;
+                        else
+                                delayed->context->reads--;
+                        mempool_free(delayed, dc->delayed_pool);
+                        continue;
+                }
+
+                if (!start_timer) {
+                        start_timer = 1;
+                        next_expires = delayed->expires;
+                } else
+                        next_expires = min(next_expires, delayed->expires);
+        }
+
+        mutex_unlock(&delayed_bios_lock);
+
+        if (start_timer)
+                queue_timeout(dc, next_expires);
+
+        return bio_list_get(&flush_bios);
+}
+
+static void flush_expired_bios(struct work_struct *work)
+{
+        struct delay_c *dc;
+
+        dc = container_of(work, struct delay_c, flush_expired_bios);
+        flush_bios(flush_delayed_bios(dc, 0));
+}
+
+/*
+ * Mapping parameters:
+ *    <device> <offset> <delay> [<write_device> <write_offset> <write_delay>]
+ *
+ * With separate write parameters, the first set is only used for reads.
+ * Delays are specified in milliseconds.
+ */
+static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
+{
+        struct delay_c *dc;
+        unsigned long long tmpll;
+
+        if (argc != 3 && argc != 6) {
+                ti->error = "requires exactly 3 or 6 arguments";
+                return -EINVAL;
+        }
+
+        dc = kmalloc(sizeof(*dc), GFP_KERNEL);
+        if (!dc) {
+                ti->error = "Cannot allocate context";
+                return -ENOMEM;
+        }
+
+        dc->reads = dc->writes = 0;
+
+        if (sscanf(argv[1], "%llu", &tmpll) != 1) {
+                ti->error = "Invalid device sector";
+                goto bad;
+        }
+        dc->start_read = tmpll;
+
+        if (sscanf(argv[2], "%u", &dc->read_delay) != 1) {
+                ti->error = "Invalid delay";
+                goto bad;
+        }
+
+        if (dm_get_device(ti, argv[0], dc->start_read, ti->len,
+                          dm_table_get_mode(ti->table), &dc->dev_read)) {
+                ti->error = "Device lookup failed";
+                goto bad;
+        }
+
+        if (argc == 3) {
+                dc->dev_write = NULL;
+                goto out;
+        }
+
+        if (sscanf(argv[4], "%llu", &tmpll) != 1) {
+                ti->error = "Invalid write device sector";
+                goto bad;
+        }
+        dc->start_write = tmpll;
+
+        if (sscanf(argv[5], "%u", &dc->write_delay) != 1) {
+                ti->error = "Invalid write delay";
+                goto bad;
+        }
+
+        if (dm_get_device(ti, argv[3], dc->start_write, ti->len,
+                          dm_table_get_mode(ti->table), &dc->dev_write)) {
+                ti->error = "Write device lookup failed";
+                dm_put_device(ti, dc->dev_read);
+                goto bad;
+        }
+
+out:
+        dc->delayed_pool = mempool_create_slab_pool(128, delayed_cache);
+        if (!dc->delayed_pool) {
+                DMERR("Couldn't create delayed bio pool.");
+                goto bad;
+        }
+
+        init_timer(&dc->delay_timer);
+        dc->delay_timer.function = handle_delayed_timer;
+        dc->delay_timer.data = (unsigned long)dc;
+
+        INIT_WORK(&dc->flush_expired_bios, flush_expired_bios);
+        INIT_LIST_HEAD(&dc->delayed_bios);
+        init_MUTEX(&dc->timer_lock);
+        atomic_set(&dc->may_delay, 1);
+
+        ti->private = dc;
+        return 0;
+
+bad:
+        kfree(dc);
+        return -EINVAL;
+}
+
+static void delay_dtr(struct dm_target *ti)
+{
+        struct delay_c *dc = ti->private;
+
+        flush_workqueue(kdelayd_wq);
+
+        dm_put_device(ti, dc->dev_read);
+
+        if (dc->dev_write)
+                dm_put_device(ti, dc->dev_write);
+
+        mempool_destroy(dc->delayed_pool);
+        kfree(dc);
+}
+
+static int delay_bio(struct delay_c *dc, int delay, struct bio *bio)
+{
+        struct delay_info *delayed;
+        unsigned long expires = 0;
+
+        if (!delay || !atomic_read(&dc->may_delay))
+                return 1;
+
+        delayed = mempool_alloc(dc->delayed_pool, GFP_NOIO);
+
+        delayed->context = dc;
+        delayed->bio = bio;
+        delayed->expires = expires = jiffies + (delay * HZ / 1000);
+
+        mutex_lock(&delayed_bios_lock);
+
+        if (bio_data_dir(bio) == WRITE)
+                dc->writes++;
+        else
+                dc->reads++;
+
+        list_add_tail(&delayed->list, &dc->delayed_bios);
+
+        mutex_unlock(&delayed_bios_lock);
+
+        queue_timeout(dc, expires);
+
+        return 0;
+}
+
+static void delay_presuspend(struct dm_target *ti)
+{
+        struct delay_c *dc = ti->private;
+
+        atomic_set(&dc->may_delay, 0);
+        del_timer_sync(&dc->delay_timer);
+        flush_bios(flush_delayed_bios(dc, 1));
+}
+
+static void delay_resume(struct dm_target *ti)
+{
+        struct delay_c *dc = ti->private;
+
+        atomic_set(&dc->may_delay, 1);
+}
+
+static int delay_map(struct dm_target *ti, struct bio *bio,
+                     union map_info *map_context)
+{
+        struct delay_c *dc = ti->private;
+
+        if ((bio_data_dir(bio) == WRITE) && (dc->dev_write)) {
+                bio->bi_bdev = dc->dev_write->bdev;
+                bio->bi_sector = dc->start_write +
+                                 (bio->bi_sector - ti->begin);
+
+                return delay_bio(dc, dc->write_delay, bio);
+        }
+
+        bio->bi_bdev = dc->dev_read->bdev;
+        bio->bi_sector = dc->start_read +
+                         (bio->bi_sector - ti->begin);
+
+        return delay_bio(dc, dc->read_delay, bio);
+}
+
+static int delay_status(struct dm_target *ti, status_type_t type,
+                        char *result, unsigned maxlen)
+{
+        struct delay_c *dc = ti->private;
+        int sz = 0;
+
+        switch (type) {
+        case STATUSTYPE_INFO:
+                DMEMIT("%u %u", dc->reads, dc->writes);
+                break;
+
+        case STATUSTYPE_TABLE:
+                DMEMIT("%s %llu %u", dc->dev_read->name,
+                       (unsigned long long) dc->start_read,
+                       dc->read_delay);
+                if (dc->dev_write)
+                        DMEMIT("%s %llu %u", dc->dev_write->name,
+                               (unsigned long long) dc->start_write,
+                               dc->write_delay);
+                break;
+        }
+
+        return 0;
+}
+
+static struct target_type delay_target = {
+        .name        = "delay",
+        .version     = {1, 0, 2},
+        .module      = THIS_MODULE,
+        .ctr         = delay_ctr,
+        .dtr         = delay_dtr,
+        .map         = delay_map,
+        .presuspend  = delay_presuspend,
+        .resume      = delay_resume,
+        .status      = delay_status,
+};
+
+static int __init dm_delay_init(void)
+{
+        int r = -ENOMEM;
+
+        kdelayd_wq = create_workqueue("kdelayd");
+        if (!kdelayd_wq) {
+                DMERR("Couldn't start kdelayd");
+                goto bad_queue;
+        }
+
+        delayed_cache = kmem_cache_create("dm-delay",
+                                          sizeof(struct delay_info),
+                                          __alignof__(struct delay_info),
+                                          0, NULL, NULL);
+        if (!delayed_cache) {
+                DMERR("Couldn't create delayed bio cache.");
+                goto bad_memcache;
+        }
+
+        r = dm_register_target(&delay_target);
+        if (r < 0) {
+                DMERR("register failed %d", r);
+                goto bad_register;
+        }
+
+        return 0;
+
+bad_register:
+        kmem_cache_destroy(delayed_cache);
+bad_memcache:
+        destroy_workqueue(kdelayd_wq);
+bad_queue:
+        return r;
+}
+
+static void __exit dm_delay_exit(void)
+{
+        int r = dm_unregister_target(&delay_target);
+
+        if (r < 0)
+                DMERR("unregister failed %d", r);
+
+        kmem_cache_destroy(delayed_cache);
+        destroy_workqueue(kdelayd_wq);
+}
+
+/* Module hooks */
+module_init(dm_delay_init);
+module_exit(dm_delay_exit);
+
+MODULE_DESCRIPTION(DM_NAME " delay target");
+MODULE_AUTHOR("Heinz Mauelshagen <mauelshagen@redhat.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 99cdffa7fbfe..07e0a0c84f6e 100644
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -1,7 +1,8 @@
 /*
- * dm-snapshot.c
+ * dm-exception-store.c
  *
  * Copyright (C) 2001-2002 Sistina Software (UK) Limited.
+ * Copyright (C) 2006 Red Hat GmbH
  *
  * This file is released under the GPL.
  */
@@ -123,6 +124,7 @@ struct pstore {
         atomic_t pending_count;
         uint32_t callback_count;
         struct commit_callback *callbacks;
+        struct dm_io_client *io_client;
 };
 
 static inline unsigned int sectors_to_pages(unsigned int sectors)
@@ -159,14 +161,20 @@ static void free_area(struct pstore *ps)
  */
 static int chunk_io(struct pstore *ps, uint32_t chunk, int rw)
 {
-        struct io_region where;
-        unsigned long bits;
-
-        where.bdev = ps->snap->cow->bdev;
-        where.sector = ps->snap->chunk_size * chunk;
-        where.count = ps->snap->chunk_size;
-
-        return dm_io_sync_vm(1, &where, rw, ps->area, &bits);
+        struct io_region where = {
+                .bdev = ps->snap->cow->bdev,
+                .sector = ps->snap->chunk_size * chunk,
+                .count = ps->snap->chunk_size,
+        };
+        struct dm_io_request io_req = {
+                .bi_rw = rw,
+                .mem.type = DM_IO_VMA,
+                .mem.ptr.vma = ps->area,
+                .client = ps->io_client,
+                .notify.fn = NULL,
+        };
+
+        return dm_io(&io_req, 1, &where, NULL);
 }
 
 /*
@@ -213,17 +221,18 @@ static int read_header(struct pstore *ps, int *new_snapshot)
                 chunk_size_supplied = 0;
         }
 
-        r = dm_io_get(sectors_to_pages(ps->snap->chunk_size));
-        if (r)
-                return r;
+        ps->io_client = dm_io_client_create(sectors_to_pages(ps->snap->
+                                                             chunk_size));
+        if (IS_ERR(ps->io_client))
+                return PTR_ERR(ps->io_client);
 
         r = alloc_area(ps);
         if (r)
-                goto bad1;
+                return r;
 
         r = chunk_io(ps, 0, READ);
         if (r)
-                goto bad2;
+                goto bad;
 
         dh = (struct disk_header *) ps->area;
 
@@ -235,7 +244,7 @@ static int read_header(struct pstore *ps, int *new_snapshot)
         if (le32_to_cpu(dh->magic) != SNAP_MAGIC) {
                 DMWARN("Invalid or corrupt snapshot");
                 r = -ENXIO;
-                goto bad2;
+                goto bad;
         }
 
         *new_snapshot = 0;
@@ -252,27 +261,22 @@ static int read_header(struct pstore *ps, int *new_snapshot)
                (unsigned long long)ps->snap->chunk_size);
 
         /* We had a bogus chunk_size. Fix stuff up. */
-        dm_io_put(sectors_to_pages(ps->snap->chunk_size));
         free_area(ps);
 
         ps->snap->chunk_size = chunk_size;
         ps->snap->chunk_mask = chunk_size - 1;
         ps->snap->chunk_shift = ffs(chunk_size) - 1;
 
-        r = dm_io_get(sectors_to_pages(chunk_size));
+        r = dm_io_client_resize(sectors_to_pages(ps->snap->chunk_size),
+                                ps->io_client);
         if (r)
                 return r;
 
         r = alloc_area(ps);
-        if (r)
-                goto bad1;
-
-        return 0;
+        return r;
 
-bad2:
+bad:
         free_area(ps);
-bad1:
-        dm_io_put(sectors_to_pages(ps->snap->chunk_size));
         return r;
 }
 
@@ -405,7 +409,7 @@ static void persistent_destroy(struct exception_store *store)
 {
         struct pstore *ps = get_info(store);
 
-        dm_io_put(sectors_to_pages(ps->snap->chunk_size));
+        dm_io_client_destroy(ps->io_client);
         vfree(ps->callbacks);
         free_area(ps);
         kfree(ps);
diff --git a/drivers/md/dm-hw-handler.h b/drivers/md/dm-hw-handler.h
index 32eff28e4adc..e0832e6fcf36 100644
--- a/drivers/md/dm-hw-handler.h
+++ b/drivers/md/dm-hw-handler.h
@@ -16,6 +16,7 @@
 struct hw_handler_type;
 struct hw_handler {
         struct hw_handler_type *type;
+        struct mapped_device *md;
         void *context;
 };
 
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 8bdc8a87b249..352c6fbeac53 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2003 Sistina Software
+ * Copyright (C) 2006 Red Hat GmbH
  *
  * This file is released under the GPL.
  */
@@ -12,13 +13,17 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-static struct bio_set *_bios;
+struct dm_io_client {
+        mempool_t *pool;
+        struct bio_set *bios;
+};
 
 /* FIXME: can we shrink this ? */
 struct io {
         unsigned long error;
         atomic_t count;
         struct task_struct *sleeper;
+        struct dm_io_client *client;
         io_notify_fn callback;
         void *context;
 };
@@ -26,63 +31,58 @@ struct io {
 /*
  * io contexts are only dynamically allocated for asynchronous
  * io.  Since async io is likely to be the majority of io we'll
- * have the same number of io contexts as buffer heads ! (FIXME:
- * must reduce this).
+ * have the same number of io contexts as bios! (FIXME: must reduce this).
  */
-static unsigned _num_ios;
-static mempool_t *_io_pool;
 
 static unsigned int pages_to_ios(unsigned int pages)
 {
         return 4 * pages;       /* too many ? */
 }
 
-static int resize_pool(unsigned int new_ios)
+/*
+ * Create a client with mempool and bioset.
+ */
+struct dm_io_client *dm_io_client_create(unsigned num_pages)
 {
-        int r = 0;
-
-        if (_io_pool) {
-                if (new_ios == 0) {
-                        /* free off the pool */
-                        mempool_destroy(_io_pool);
-                        _io_pool = NULL;
-                        bioset_free(_bios);
-
-                } else {
-                        /* resize the pool */
-                        r = mempool_resize(_io_pool, new_ios, GFP_KERNEL);
-                }
+        unsigned ios = pages_to_ios(num_pages);
+        struct dm_io_client *client;
 
-        } else {
-                /* create new pool */
-                _io_pool = mempool_create_kmalloc_pool(new_ios,
-                                                       sizeof(struct io));
-                if (!_io_pool)
-                        return -ENOMEM;
-
-                _bios = bioset_create(16, 16);
-                if (!_bios) {
-                        mempool_destroy(_io_pool);
-                        _io_pool = NULL;
-                        return -ENOMEM;
-                }
-        }
+        client = kmalloc(sizeof(*client), GFP_KERNEL);
+        if (!client)
+                return ERR_PTR(-ENOMEM);
+
+        client->pool = mempool_create_kmalloc_pool(ios, sizeof(struct io));
+        if (!client->pool)
+                goto bad;
 
-        if (!r)
-                _num_ios = new_ios;
+        client->bios = bioset_create(16, 16);
+        if (!client->bios)
+                goto bad;
 
-        return r;
+        return client;
+
+   bad:
+        if (client->pool)
+                mempool_destroy(client->pool);
+        kfree(client);
+        return ERR_PTR(-ENOMEM);
 }
+EXPORT_SYMBOL(dm_io_client_create);
 
-int dm_io_get(unsigned int num_pages)
+int dm_io_client_resize(unsigned num_pages, struct dm_io_client *client)
 {
-        return resize_pool(_num_ios + pages_to_ios(num_pages));
+        return mempool_resize(client->pool, pages_to_ios(num_pages),
+                              GFP_KERNEL);
 }
+EXPORT_SYMBOL(dm_io_client_resize);
 
-void dm_io_put(unsigned int num_pages)
+void dm_io_client_destroy(struct dm_io_client *client)
 {
-        resize_pool(_num_ios - pages_to_ios(num_pages));
+        mempool_destroy(client->pool);
+        bioset_free(client->bios);
+        kfree(client);
 }
+EXPORT_SYMBOL(dm_io_client_destroy);
 
 /*-----------------------------------------------------------------
  * We need to keep track of which region a bio is doing io for.
@@ -118,7 +118,7 @@ static void dec_count(struct io *io, unsigned int region, int error)
                         io_notify_fn fn = io->callback;
                         void *context = io->context;
 
-                        mempool_free(io, _io_pool);
+                        mempool_free(io, io->client->pool);
                         fn(r, context);
                 }
         }
@@ -126,7 +126,8 @@ static void dec_count(struct io *io, unsigned int region, int error)
 
 static int endio(struct bio *bio, unsigned int done, int error)
 {
-        struct io *io = (struct io *) bio->bi_private;
+        struct io *io;
+        unsigned region;
 
         /* keep going until we've finished */
         if (bio->bi_size)
@@ -135,10 +136,17 @@ static int endio(struct bio *bio, unsigned int done, int error)
         if (error && bio_data_dir(bio) == READ)
                 zero_fill_bio(bio);
 
-        dec_count(io, bio_get_region(bio), error);
+        /*
+         * The bio destructor in bio_put() may use the io object.
+         */
+        io = bio->bi_private;
+        region = bio_get_region(bio);
+
         bio->bi_max_vecs++;
         bio_put(bio);
 
+        dec_count(io, region, error);
+
         return 0;
 }
 
@@ -209,6 +217,9 @@ static void bvec_dp_init(struct dpages *dp, struct bio_vec *bvec)
         dp->context_ptr = bvec;
 }
 
+/*
+ * Functions for getting the pages from a VMA.
+ */
 static void vm_get_page(struct dpages *dp,
                  struct page **p, unsigned long *len, unsigned *offset)
 {
@@ -233,7 +244,34 @@ static void vm_dp_init(struct dpages *dp, void *data)
 
 static void dm_bio_destructor(struct bio *bio)
 {
-        bio_free(bio, _bios);
+        struct io *io = bio->bi_private;
+
+        bio_free(bio, io->client->bios);
+}
+
+/*
+ * Functions for getting the pages from kernel memory.
+ */
+static void km_get_page(struct dpages *dp, struct page **p, unsigned long *len,
+                        unsigned *offset)
+{
+        *p = virt_to_page(dp->context_ptr);
+        *offset = dp->context_u;
+        *len = PAGE_SIZE - dp->context_u;
+}
+
+static void km_next_page(struct dpages *dp)
+{
+        dp->context_ptr += PAGE_SIZE - dp->context_u;
+        dp->context_u = 0;
+}
+
+static void km_dp_init(struct dpages *dp, void *data)
+{
+        dp->get_page = km_get_page;
+        dp->next_page = km_next_page;
+        dp->context_u = ((unsigned long) data) & (PAGE_SIZE - 1);
+        dp->context_ptr = data;
 }
 
 /*-----------------------------------------------------------------
@@ -256,7 +294,7 @@ static void do_region(int rw, unsigned int region, struct io_region *where,
                  * to hide it from bio_add_page().
                  */
                 num_bvecs = (remaining / (PAGE_SIZE >> SECTOR_SHIFT)) + 2;
-                bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, _bios);
+                bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios);
                 bio->bi_sector = where->sector + (where->count - remaining);
                 bio->bi_bdev = where->bdev;
                 bio->bi_end_io = endio;
@@ -311,8 +349,9 @@ static void dispatch_io(int rw, unsigned int num_regions,
         dec_count(io, 0, 0);
 }
 
-static int sync_io(unsigned int num_regions, struct io_region *where,
-            int rw, struct dpages *dp, unsigned long *error_bits)
+static int sync_io(struct dm_io_client *client, unsigned int num_regions,
+                   struct io_region *where, int rw, struct dpages *dp,
+                   unsigned long *error_bits)
 {
         struct io io;
 
@@ -324,6 +363,7 @@ static int sync_io(unsigned int num_regions, struct io_region *where,
         io.error = 0;
         atomic_set(&io.count, 1); /* see dispatch_io() */
         io.sleeper = current;
+        io.client = client;
 
         dispatch_io(rw, num_regions, where, dp, &io, 1);
 
@@ -340,12 +380,15 @@ static int sync_io(unsigned int num_regions, struct io_region *where,
         if (atomic_read(&io.count))
                 return -EINTR;
 
-        *error_bits = io.error;
+        if (error_bits)
+                *error_bits = io.error;
+
         return io.error ? -EIO : 0;
 }
 
-static int async_io(unsigned int num_regions, struct io_region *where, int rw,
-             struct dpages *dp, io_notify_fn fn, void *context)
+static int async_io(struct dm_io_client *client, unsigned int num_regions,
+                    struct io_region *where, int rw, struct dpages *dp,
+                    io_notify_fn fn, void *context)
 {
         struct io *io;
 
@@ -355,10 +398,11 @@ static int async_io(unsigned int num_regions, struct io_region *where, int rw,
                 return -EIO;
         }
 
-        io = mempool_alloc(_io_pool, GFP_NOIO);
+        io = mempool_alloc(client->pool, GFP_NOIO);
         io->error = 0;
         atomic_set(&io->count, 1); /* see dispatch_io() */
         io->sleeper = NULL;
+        io->client = client;
         io->callback = fn;
         io->context = context;
 
@@ -366,61 +410,51 @@ static int async_io(unsigned int num_regions, struct io_region *where, int rw,
         return 0;
 }
 
-int dm_io_sync(unsigned int num_regions, struct io_region *where, int rw,
-               struct page_list *pl, unsigned int offset,
-               unsigned long *error_bits)
+static int dp_init(struct dm_io_request *io_req, struct dpages *dp)
 {
-        struct dpages dp;
-        list_dp_init(&dp, pl, offset);
-        return sync_io(num_regions, where, rw, &dp, error_bits);
-}
+        /* Set up dpages based on memory type */
+        switch (io_req->mem.type) {
+        case DM_IO_PAGE_LIST:
+                list_dp_init(dp, io_req->mem.ptr.pl, io_req->mem.offset);
+                break;
+
+        case DM_IO_BVEC:
+                bvec_dp_init(dp, io_req->mem.ptr.bvec);
+                break;
+
+        case DM_IO_VMA:
+                vm_dp_init(dp, io_req->mem.ptr.vma);
+                break;
+
+        case DM_IO_KMEM:
+                km_dp_init(dp, io_req->mem.ptr.addr);
+                break;
+
+        default:
+                return -EINVAL;
+        }
 
-int dm_io_sync_bvec(unsigned int num_regions, struct io_region *where, int rw,
-                    struct bio_vec *bvec, unsigned long *error_bits)
-{
-        struct dpages dp;
-        bvec_dp_init(&dp, bvec);
-        return sync_io(num_regions, where, rw, &dp, error_bits);
+        return 0;
 }
 
-int dm_io_sync_vm(unsigned int num_regions, struct io_region *where, int rw,
-                  void *data, unsigned long *error_bits)
+/*
+ * New collapsed (a)synchronous interface
+ */
+int dm_io(struct dm_io_request *io_req, unsigned num_regions,
+          struct io_region *where, unsigned long *sync_error_bits)
 {
+        int r;
         struct dpages dp;
-        vm_dp_init(&dp, data);
-        return sync_io(num_regions, where, rw, &dp, error_bits);
-}
 
-int dm_io_async(unsigned int num_regions, struct io_region *where, int rw,
-                struct page_list *pl, unsigned int offset,
-                io_notify_fn fn, void *context)
-{
-        struct dpages dp;
-        list_dp_init(&dp, pl, offset);
-        return async_io(num_regions, where, rw, &dp, fn, context);
-}
+        r = dp_init(io_req, &dp);
+        if (r)
+                return r;
 
-int dm_io_async_bvec(unsigned int num_regions, struct io_region *where, int rw,
-                     struct bio_vec *bvec, io_notify_fn fn, void *context)
-{
-        struct dpages dp;
-        bvec_dp_init(&dp, bvec);
-        return async_io(num_regions, where, rw, &dp, fn, context);
-}
+        if (!io_req->notify.fn)
+                return sync_io(io_req->client, num_regions, where,
+                               io_req->bi_rw, &dp, sync_error_bits);
 
-int dm_io_async_vm(unsigned int num_regions, struct io_region *where, int rw,
-                   void *data, io_notify_fn fn, void *context)
-{
-        struct dpages dp;
-        vm_dp_init(&dp, data);
-        return async_io(num_regions, where, rw, &dp, fn, context);
+        return async_io(io_req->client, num_regions, where, io_req->bi_rw,
+                        &dp, io_req->notify.fn, io_req->notify.context);
 }
-
-EXPORT_SYMBOL(dm_io_get);
-EXPORT_SYMBOL(dm_io_put);
-EXPORT_SYMBOL(dm_io_sync);
-EXPORT_SYMBOL(dm_io_async);
-EXPORT_SYMBOL(dm_io_sync_bvec);
-EXPORT_SYMBOL(dm_io_async_bvec);
-EXPORT_SYMBOL(dm_io_sync_vm);
-EXPORT_SYMBOL(dm_io_async_vm);
+EXPORT_SYMBOL(dm_io);
diff --git a/drivers/md/dm-io.h b/drivers/md/dm-io.h
index f9035bfd1a9f..f647e2cceaa6 100644
--- a/drivers/md/dm-io.h
+++ b/drivers/md/dm-io.h
@@ -12,7 +12,7 @@
 struct io_region {
         struct block_device *bdev;
         sector_t sector;
-        sector_t count;
+        sector_t count;         /* If this is zero the region is ignored. */
 };
 
 struct page_list {
@@ -20,55 +20,60 @@ struct page_list {
         struct page *page;
 };
 
-
-/*
- * 'error' is a bitset, with each bit indicating whether an error
- * occurred doing io to the corresponding region.
- */
 typedef void (*io_notify_fn)(unsigned long error, void *context);
 
+enum dm_io_mem_type {
+        DM_IO_PAGE_LIST,/* Page list */
+        DM_IO_BVEC,     /* Bio vector */
+        DM_IO_VMA,      /* Virtual memory area */
+        DM_IO_KMEM,     /* Kernel memory */
+};
+
+struct dm_io_memory {
+        enum dm_io_mem_type type;
+
+        union {
+                struct page_list *pl;
+                struct bio_vec *bvec;
+                void *vma;
+                void *addr;
+        } ptr;
+
+        unsigned offset;
+};
+
+struct dm_io_notify {
+        io_notify_fn fn;        /* Callback for asynchronous requests */
+        void *context;          /* Passed to callback */
+};
 
 /*
- * Before anyone uses the IO interface they should call
- * dm_io_get(), specifying roughly how many pages they are
- * expecting to perform io on concurrently.
- *
- * This function may block.
+ * IO request structure
  */
-int dm_io_get(unsigned int num_pages);
-void dm_io_put(unsigned int num_pages);
+struct dm_io_client;
+struct dm_io_request {
+        int bi_rw;                      /* READ|WRITE - not READA */
+        struct dm_io_memory mem;        /* Memory to use for io */
+        struct dm_io_notify notify;     /* Synchronous if notify.fn is NULL */
+        struct dm_io_client *client;    /* Client memory handler */
+};
 
 /*
- * Synchronous IO.
+ * For async io calls, users can alternatively use the dm_io() function below
+ * and dm_io_client_create() to create private mempools for the client.
  *
- * Please ensure that the rw flag in the next two functions is
- * either READ or WRITE, ie. we don't take READA.  Any
- * regions with a zero count field will be ignored.
+ * Create/destroy may block.
  */
-int dm_io_sync(unsigned int num_regions, struct io_region *where, int rw,
-               struct page_list *pl, unsigned int offset,
-               unsigned long *error_bits);
-
-int dm_io_sync_bvec(unsigned int num_regions, struct io_region *where, int rw,
-                    struct bio_vec *bvec, unsigned long *error_bits);
-
-int dm_io_sync_vm(unsigned int num_regions, struct io_region *where, int rw,
-                  void *data, unsigned long *error_bits);
+struct dm_io_client *dm_io_client_create(unsigned num_pages);
+int dm_io_client_resize(unsigned num_pages, struct dm_io_client *client);
+void dm_io_client_destroy(struct dm_io_client *client);
 
 /*
- * Aynchronous IO.
- *
- * The 'where' array may be safely allocated on the stack since
- * the function takes a copy.
+ * IO interface using private per-client pools.
+ * Each bit in the optional 'sync_error_bits' bitset indicates whether an
+ * error occurred doing io to the corresponding region.
  */
-int dm_io_async(unsigned int num_regions, struct io_region *where, int rw,
-                struct page_list *pl, unsigned int offset,
-                io_notify_fn fn, void *context);
-
-int dm_io_async_bvec(unsigned int num_regions, struct io_region *where, int rw,
-                     struct bio_vec *bvec, io_notify_fn fn, void *context);
-
-int dm_io_async_vm(unsigned int num_regions, struct io_region *where, int rw,
-                   void *data, io_notify_fn fn, void *context);
+int dm_io(struct dm_io_request *io_req, unsigned num_regions,
+          struct io_region *region, unsigned long *sync_error_bits);
 
 #endif
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 6a9261351848..a66428d860fe 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -149,9 +149,12 @@ struct log_c {
                 FORCESYNC,      /* Force a sync to happen */
         } sync;
 
+        struct dm_io_request io_req;
+
         /*
          * Disk log fields
          */
+        int log_dev_failed;
         struct dm_dev *log_dev;
         struct log_header header;
 
@@ -199,13 +202,20 @@ static void header_from_disk(struct log_header *core, struct log_header *disk)
         core->nr_regions = le64_to_cpu(disk->nr_regions);
 }
 
+static int rw_header(struct log_c *lc, int rw)
+{
+        lc->io_req.bi_rw = rw;
+        lc->io_req.mem.ptr.vma = lc->disk_header;
+        lc->io_req.notify.fn = NULL;
+
+        return dm_io(&lc->io_req, 1, &lc->header_location, NULL);
+}
+
 static int read_header(struct log_c *log)
 {
         int r;
-        unsigned long ebits;
 
-        r = dm_io_sync_vm(1, &log->header_location, READ,
-                          log->disk_header, &ebits);
+        r = rw_header(log, READ);
         if (r)
                 return r;
 
@@ -233,11 +243,8 @@ static int read_header(struct log_c *log)
 
 static inline int write_header(struct log_c *log)
 {
-        unsigned long ebits;
-
         header_to_disk(&log->header, log->disk_header);
-        return dm_io_sync_vm(1, &log->header_location, WRITE,
-                             log->disk_header, &ebits);
+        return rw_header(log, WRITE);
 }
 
 /*----------------------------------------------------------------
@@ -256,6 +263,7 @@ static int create_log_context(struct dirty_log *log, struct dm_target *ti,
         uint32_t region_size;
         unsigned int region_count;
         size_t bitset_size, buf_size;
+        int r;
 
         if (argc < 1 || argc > 2) {
                 DMWARN("wrong number of arguments to mirror log");
@@ -315,6 +323,7 @@ static int create_log_context(struct dirty_log *log, struct dm_target *ti,
                 lc->disk_header = NULL;
         } else {
                 lc->log_dev = dev;
+                lc->log_dev_failed = 0;
                 lc->header_location.bdev = lc->log_dev->bdev;
                 lc->header_location.sector = 0;
 
@@ -324,6 +333,15 @@ static int create_log_context(struct dirty_log *log, struct dm_target *ti,
                 buf_size = dm_round_up((LOG_OFFSET << SECTOR_SHIFT) +
                                        bitset_size, ti->limits.hardsect_size);
                 lc->header_location.count = buf_size >> SECTOR_SHIFT;
+                lc->io_req.mem.type = DM_IO_VMA;
+                lc->io_req.client = dm_io_client_create(dm_div_up(buf_size,
+                                                                   PAGE_SIZE));
+                if (IS_ERR(lc->io_req.client)) {
+                        r = PTR_ERR(lc->io_req.client);
+                        DMWARN("couldn't allocate disk io client");
+                        kfree(lc);
+                        return -ENOMEM;
+                }
 
                 lc->disk_header = vmalloc(buf_size);
                 if (!lc->disk_header) {
@@ -424,6 +442,7 @@ static void disk_dtr(struct dirty_log *log)
 
         dm_put_device(lc->ti, lc->log_dev);
         vfree(lc->disk_header);
+        dm_io_client_destroy(lc->io_req.client);
         destroy_log_context(lc);
 }
 
@@ -437,6 +456,15 @@ static int count_bits32(uint32_t *addr, unsigned size)
         return count;
 }
 
+static void fail_log_device(struct log_c *lc)
+{
+        if (lc->log_dev_failed)
+                return;
+
+        lc->log_dev_failed = 1;
+        dm_table_event(lc->ti->table);
+}
+
 static int disk_resume(struct dirty_log *log)
 {
         int r;
@@ -446,8 +474,19 @@ static int disk_resume(struct dirty_log *log)
 
         /* read the disk header */
         r = read_header(lc);
-        if (r)
-                return r;
+        if (r) {
+                DMWARN("%s: Failed to read header on mirror log device",
+                       lc->log_dev->name);
+                fail_log_device(lc);
+                /*
+                 * If the log device cannot be read, we must assume
+                 * all regions are out-of-sync.  If we simply return
+                 * here, the state will be uninitialized and could
+                 * lead us to return 'in-sync' status for regions
+                 * that are actually 'out-of-sync'.
+                 */
+                lc->header.nr_regions = 0;
+        }
 
         /* set or clear any new bits -- device has grown */
         if (lc->sync == NOSYNC)
@@ -472,7 +511,14 @@ static int disk_resume(struct dirty_log *log)
         lc->header.nr_regions = lc->region_count;
 
         /* write the new header */
-        return write_header(lc);
+        r = write_header(lc);
+        if (r) {
+                DMWARN("%s: Failed to write header on mirror log device",
+                       lc->log_dev->name);
+                fail_log_device(lc);
+        }
+
+        return r;
 }
 
 static uint32_t core_get_region_size(struct dirty_log *log)
@@ -516,7 +562,9 @@ static int disk_flush(struct dirty_log *log)
                 return 0;
 
         r = write_header(lc);
-        if (!r)
+        if (r)
+                fail_log_device(lc);
+        else
                 lc->touched = 0;
 
         return r;
@@ -591,6 +639,7 @@ static int core_status(struct dirty_log *log, status_type_t status,
 
         switch(status) {
         case STATUSTYPE_INFO:
+                DMEMIT("1 %s", log->type->name);
                 break;
 
         case STATUSTYPE_TABLE:
@@ -606,17 +655,17 @@ static int disk_status(struct dirty_log *log, status_type_t status,
                        char *result, unsigned int maxlen)
 {
         int sz = 0;
-        char buffer[16];
         struct log_c *lc = log->context;
 
         switch(status) {
         case STATUSTYPE_INFO:
+                DMEMIT("3 %s %s %c", log->type->name, lc->log_dev->name,
+                       lc->log_dev_failed ? 'D' : 'A');
                 break;
 
         case STATUSTYPE_TABLE:
-                format_dev_t(buffer, lc->log_dev->bdev->bd_dev);
                 DMEMIT("%s %u %s %u ", log->type->name,
-                       lc->sync == DEFAULTSYNC ? 2 : 3, buffer,
+                       lc->sync == DEFAULTSYNC ? 2 : 3, lc->log_dev->name,
                        lc->region_size);
                 DMEMIT_SYNC;
         }
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 3aa013506967..de54b39e6ffe 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -668,6 +668,9 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m)
                 return -EINVAL;
         }
 
+        m->hw_handler.md = dm_table_get_md(ti->table);
+        dm_put(m->hw_handler.md);
+
         r = hwht->create(&m->hw_handler, hw_argc - 1, as->argv);
         if (r) {
                 dm_put_hw_handler(hwht);
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 23a642619bed..ef124b71ccc8 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -21,15 +21,11 @@
 #include <linux/workqueue.h>
 
 #define DM_MSG_PREFIX "raid1"
+#define DM_IO_PAGES 64
 
-static struct workqueue_struct *_kmirrord_wq;
-static struct work_struct _kmirrord_work;
-static DECLARE_WAIT_QUEUE_HEAD(_kmirrord_recovery_stopped);
+#define DM_RAID1_HANDLE_ERRORS 0x01
 
-static inline void wake(void)
-{
-        queue_work(_kmirrord_wq, &_kmirrord_work);
-}
+static DECLARE_WAIT_QUEUE_HEAD(_kmirrord_recovery_stopped);
 
 /*-----------------------------------------------------------------
  * Region hash
@@ -125,17 +121,23 @@ struct mirror_set {
         struct list_head list;
         struct region_hash rh;
         struct kcopyd_client *kcopyd_client;
+        uint64_t features;
 
         spinlock_t lock;        /* protects the next two lists */
         struct bio_list reads;
         struct bio_list writes;
 
+        struct dm_io_client *io_client;
+
         /* recovery */
         region_t nr_regions;
         int in_sync;
 
         struct mirror *default_mirror;  /* Default mirror */
 
+        struct workqueue_struct *kmirrord_wq;
+        struct work_struct kmirrord_work;
+
         unsigned int nr_mirrors;
         struct mirror mirror[0];
 };
@@ -153,6 +155,11 @@ static inline sector_t region_to_sector(struct region_hash *rh, region_t region)
         return region << rh->region_shift;
 }
 
+static void wake(struct mirror_set *ms)
+{
+        queue_work(ms->kmirrord_wq, &ms->kmirrord_work);
+}
+
 /* FIXME move this */
 static void queue_bio(struct mirror_set *ms, struct bio *bio, int rw);
 
@@ -398,8 +405,7 @@ static void rh_update_states(struct region_hash *rh)
                 mempool_free(reg, rh->region_pool);
         }
 
-        if (!list_empty(&recovered))
-                rh->log->type->flush(rh->log);
+        rh->log->type->flush(rh->log);
 
         list_for_each_entry_safe (reg, next, &clean, list)
                 mempool_free(reg, rh->region_pool);
@@ -471,7 +477,7 @@ static void rh_dec(struct region_hash *rh, region_t region)
         spin_unlock_irqrestore(&rh->region_lock, flags);
 
         if (should_wake)
-                wake();
+                wake(rh->ms);
 }
 
 /*
@@ -558,7 +564,7 @@ static void rh_recovery_end(struct region *reg, int success)
         list_add(&reg->list, &reg->rh->recovered_regions);
         spin_unlock_irq(&rh->region_lock);
 
-        wake();
+        wake(rh->ms);
 }
 
 static void rh_flush(struct region_hash *rh)
@@ -592,7 +598,7 @@ static void rh_start_recovery(struct region_hash *rh)
         for (i = 0; i < MAX_RECOVERY; i++)
                 up(&rh->recovery_count);
 
-        wake();
+        wake(rh->ms);
 }
 
 /*
@@ -735,7 +741,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
                 /*
                  * We can only read balance if the region is in sync.
                  */
-                if (rh_in_sync(&ms->rh, region, 0))
+                if (rh_in_sync(&ms->rh, region, 1))
                         m = choose_mirror(ms, bio->bi_sector);
                 else
                         m = ms->default_mirror;
@@ -792,6 +798,14 @@ static void do_write(struct mirror_set *ms, struct bio *bio)
         unsigned int i;
         struct io_region io[KCOPYD_MAX_REGIONS+1];
         struct mirror *m;
+        struct dm_io_request io_req = {
+                .bi_rw = WRITE,
+                .mem.type = DM_IO_BVEC,
+                .mem.ptr.bvec = bio->bi_io_vec + bio->bi_idx,
+                .notify.fn = write_callback,
+                .notify.context = bio,
+                .client = ms->io_client,
+        };
 
         for (i = 0; i < ms->nr_mirrors; i++) {
                 m = ms->mirror + i;
@@ -802,9 +816,8 @@ static void do_write(struct mirror_set *ms, struct bio *bio)
         }
 
         bio_set_ms(bio, ms);
-        dm_io_async_bvec(ms->nr_mirrors, io, WRITE,
-                         bio->bi_io_vec + bio->bi_idx,
-                         write_callback, bio);
+
+        (void) dm_io(&io_req, ms->nr_mirrors, io, NULL);
 }
 
 static void do_writes(struct mirror_set *ms, struct bio_list *writes)
@@ -870,11 +883,10 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
 /*-----------------------------------------------------------------
  * kmirrord
  *---------------------------------------------------------------*/
-static LIST_HEAD(_mirror_sets);
-static DECLARE_RWSEM(_mirror_sets_lock);
-
-static void do_mirror(struct mirror_set *ms)
+static void do_mirror(struct work_struct *work)
 {
+        struct mirror_set *ms =container_of(work, struct mirror_set,
+                                            kmirrord_work);
         struct bio_list reads, writes;
 
         spin_lock(&ms->lock);
@@ -890,16 +902,6 @@ static void do_mirror(struct mirror_set *ms)
         do_writes(ms, &writes);
 }
 
-static void do_work(struct work_struct *ignored)
-{
-        struct mirror_set *ms;
-
-        down_read(&_mirror_sets_lock);
-        list_for_each_entry (ms, &_mirror_sets, list)
-                do_mirror(ms);
-        up_read(&_mirror_sets_lock);
-}
-
 /*-----------------------------------------------------------------
  * Target functions
  *---------------------------------------------------------------*/
@@ -931,6 +933,13 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
         ms->in_sync = 0;
         ms->default_mirror = &ms->mirror[DEFAULT_MIRROR];
 
+        ms->io_client = dm_io_client_create(DM_IO_PAGES);
+        if (IS_ERR(ms->io_client)) {
+                ti->error = "Error creating dm_io client";
+                kfree(ms);
+                return NULL;
+        }
+
         if (rh_init(&ms->rh, ms, dl, region_size, ms->nr_regions)) {
                 ti->error = "Error creating dirty region hash";
                 kfree(ms);
@@ -946,6 +955,7 @@ static void free_context(struct mirror_set *ms, struct dm_target *ti,
         while (m--)
                 dm_put_device(ti, ms->mirror[m].dev);
 
+        dm_io_client_destroy(ms->io_client);
         rh_exit(&ms->rh);
         kfree(ms);
 }
@@ -978,23 +988,6 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
         return 0;
 }
 
-static int add_mirror_set(struct mirror_set *ms)
-{
-        down_write(&_mirror_sets_lock);
-        list_add_tail(&ms->list, &_mirror_sets);
-        up_write(&_mirror_sets_lock);
-        wake();
-
-        return 0;
-}
-
-static void del_mirror_set(struct mirror_set *ms)
-{
-        down_write(&_mirror_sets_lock);
-        list_del(&ms->list);
-        up_write(&_mirror_sets_lock);
-}
-
 /*
  * Create dirty log: log_type #log_params <log_params>
  */
@@ -1037,16 +1030,55 @@ static struct dirty_log *create_dirty_log(struct dm_target *ti,
         return dl;
 }
 
+static int parse_features(struct mirror_set *ms, unsigned argc, char **argv,
+                          unsigned *args_used)
+{
+        unsigned num_features;
+        struct dm_target *ti = ms->ti;
+
+        *args_used = 0;
+
+        if (!argc)
+                return 0;
+
+        if (sscanf(argv[0], "%u", &num_features) != 1) {
+                ti->error = "Invalid number of features";
+                return -EINVAL;
+        }
+
+        argc--;
+        argv++;
+        (*args_used)++;
+
+        if (num_features > argc) {
+                ti->error = "Not enough arguments to support feature count";
+                return -EINVAL;
+        }
+
+        if (!strcmp("handle_errors", argv[0]))
+                ms->features |= DM_RAID1_HANDLE_ERRORS;
+        else {
+                ti->error = "Unrecognised feature requested";
+                return -EINVAL;
+        }
+
+        (*args_used)++;
+
+        return 0;
+}
+
 /*
  * Construct a mirror mapping:
  *
  * log_type #log_params <log_params>
  * #mirrors [mirror_path offset]{2,}
+ * [#features <features>]
  *
  * log_type is "core" or "disk"
  * #log_params is between 1 and 3
+ *
+ * If present, features must be "handle_errors".
  */
-#define DM_IO_PAGES 64
 static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
         int r;
@@ -1070,8 +1102,8 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         argv++, argc--;
 
-        if (argc != nr_mirrors * 2) {
-                ti->error = "Wrong number of mirror arguments";
+        if (argc < nr_mirrors * 2) {
+                ti->error = "Too few mirror arguments";
                 dm_destroy_dirty_log(dl);
                 return -EINVAL;
         }
@@ -1096,13 +1128,37 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         ti->private = ms;
         ti->split_io = ms->rh.region_size;
 
+        ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
+        if (!ms->kmirrord_wq) {
+                DMERR("couldn't start kmirrord");
+                free_context(ms, ti, m);
+                return -ENOMEM;
+        }
+        INIT_WORK(&ms->kmirrord_work, do_mirror);
+
+        r = parse_features(ms, argc, argv, &args_used);
+        if (r) {
+                free_context(ms, ti, ms->nr_mirrors);
+                return r;
+        }
+
+        argv += args_used;
+        argc -= args_used;
+
+        if (argc) {
+                ti->error = "Too many mirror arguments";
+                free_context(ms, ti, ms->nr_mirrors);
+                return -EINVAL;
+        }
+
         r = kcopyd_client_create(DM_IO_PAGES, &ms->kcopyd_client);
         if (r) {
+                destroy_workqueue(ms->kmirrord_wq);
                 free_context(ms, ti, ms->nr_mirrors);
                 return r;
         }
 
-        add_mirror_set(ms);
+        wake(ms);
         return 0;
 }
 
@@ -1110,8 +1166,9 @@ static void mirror_dtr(struct dm_target *ti)
 {
         struct mirror_set *ms = (struct mirror_set *) ti->private;
 
-        del_mirror_set(ms);
+        flush_workqueue(ms->kmirrord_wq);
         kcopyd_client_destroy(ms->kcopyd_client);
+        destroy_workqueue(ms->kmirrord_wq);
         free_context(ms, ti, ms->nr_mirrors);
 }
 
@@ -1127,7 +1184,7 @@ static void queue_bio(struct mirror_set *ms, struct bio *bio, int rw)
         spin_unlock(&ms->lock);
 
         if (should_wake)
-                wake();
+                wake(ms);
 }
 
 /*
@@ -1222,11 +1279,9 @@ static void mirror_resume(struct dm_target *ti)
 static int mirror_status(struct dm_target *ti, status_type_t type,
                          char *result, unsigned int maxlen)
 {
-        unsigned int m, sz;
+        unsigned int m, sz = 0;
         struct mirror_set *ms = (struct mirror_set *) ti->private;
 
-        sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen);
-
         switch (type) {
         case STATUSTYPE_INFO:
                 DMEMIT("%d ", ms->nr_mirrors);
@@ -1237,13 +1292,21 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
                         (unsigned long long)ms->rh.log->type->
                                 get_sync_count(ms->rh.log),
                         (unsigned long long)ms->nr_regions);
+
+                sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen);
+
                 break;
 
         case STATUSTYPE_TABLE:
+                sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen);
+
                 DMEMIT("%d", ms->nr_mirrors);
                 for (m = 0; m < ms->nr_mirrors; m++)
                         DMEMIT(" %s %llu", ms->mirror[m].dev->name,
                                 (unsigned long long)ms->mirror[m].offset);
+
+                if (ms->features & DM_RAID1_HANDLE_ERRORS)
+                        DMEMIT(" 1 handle_errors");
         }
 
         return 0;
@@ -1251,7 +1314,7 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
 
 static struct target_type mirror_target = {
         .name    = "mirror",
-        .version = {1, 0, 2},
+        .version = {1, 0, 3},
         .module  = THIS_MODULE,
         .ctr     = mirror_ctr,
         .dtr     = mirror_dtr,
@@ -1270,20 +1333,11 @@ static int __init dm_mirror_init(void)
         if (r)
                 return r;
 
-        _kmirrord_wq = create_singlethread_workqueue("kmirrord");
-        if (!_kmirrord_wq) {
-                DMERR("couldn't start kmirrord");
-                dm_dirty_log_exit();
-                return r;
-        }
-        INIT_WORK(&_kmirrord_work, do_work);
-
         r = dm_register_target(&mirror_target);
         if (r < 0) {
                 DMERR("%s: Failed to register mirror target",
                       mirror_target.name);
                 dm_dirty_log_exit();
-                destroy_workqueue(_kmirrord_wq);
         }
 
         return r;
@@ -1297,7 +1351,6 @@ static void __exit dm_mirror_exit(void)
         if (r < 0)
                 DMERR("%s: unregister failed %d", mirror_target.name, r);
 
-        destroy_workqueue(_kmirrord_wq);
         dm_dirty_log_exit();
 }
 
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 05befa91807a..2fc199b0016b 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -425,13 +425,15 @@ static void close_dev(struct dm_dev *d, struct mapped_device *md)
 }
 
 /*
- * If possible (ie. blk_size[major] is set), this checks an area
- * of a destination device is valid.
+ * If possible, this checks an area of a destination device is valid.
  */
 static int check_device_area(struct dm_dev *dd, sector_t start, sector_t len)
 {
-        sector_t dev_size;
-        dev_size = dd->bdev->bd_inode->i_size >> SECTOR_SHIFT;
+        sector_t dev_size = dd->bdev->bd_inode->i_size >> SECTOR_SHIFT;
+
+        if (!dev_size)
+                return 1;
+
         return ((start < dev_size) && (len <= (dev_size - start)));
 }
 
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 11a98df298ec..2717a355dc5b 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1236,6 +1236,7 @@ void dm_put(struct mapped_device *md)
                 free_dev(md);
         }
 }
+EXPORT_SYMBOL_GPL(dm_put);
 
 /*
  * Process the deferred bios
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index b46f6c575f7e..dbc234e3c69f 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2002 Sistina Software (UK) Limited.
+ * Copyright (C) 2006 Red Hat GmbH
  *
  * This file is released under the GPL.
  *
@@ -45,6 +46,8 @@ struct kcopyd_client {
         unsigned int nr_pages;
         unsigned int nr_free_pages;
 
+        struct dm_io_client *io_client;
+
         wait_queue_head_t destroyq;
         atomic_t nr_jobs;
 };
@@ -342,16 +345,20 @@ static void complete_io(unsigned long error, void *context)
 static int run_io_job(struct kcopyd_job *job)
 {
         int r;
+        struct dm_io_request io_req = {
+                .bi_rw = job->rw,
+                .mem.type = DM_IO_PAGE_LIST,
+                .mem.ptr.pl = job->pages,
+                .mem.offset = job->offset,
+                .notify.fn = complete_io,
+                .notify.context = job,
+                .client = job->kc->io_client,
+        };
 
         if (job->rw == READ)
-                r = dm_io_async(1, &job->source, job->rw,
-                                job->pages,
-                                job->offset, complete_io, job);
-
+                r = dm_io(&io_req, 1, &job->source, NULL);
         else
-                r = dm_io_async(job->num_dests, job->dests, job->rw,
-                                job->pages,
-                                job->offset, complete_io, job);
+                r = dm_io(&io_req, job->num_dests, job->dests, NULL);
 
         return r;
 }
@@ -670,8 +677,9 @@ int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)
                 return r;
         }
 
-        r = dm_io_get(nr_pages);
-        if (r) {
+        kc->io_client = dm_io_client_create(nr_pages);
+        if (IS_ERR(kc->io_client)) {
+                r = PTR_ERR(kc->io_client);
                 client_free_pages(kc);
                 kfree(kc);
                 kcopyd_exit();
@@ -691,7 +699,7 @@ void kcopyd_client_destroy(struct kcopyd_client *kc)
         /* Wait for completion of all jobs submitted by this client. */
         wait_event(kc->destroyq, !atomic_read(&kc->nr_jobs));
 
-        dm_io_put(kc->nr_pages);
+        dm_io_client_destroy(kc->io_client);
         client_free_pages(kc);
         client_del(kc);
         kfree(kc);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 2b4315d7e5d6..c10ce91b64e9 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -33,6 +33,7 @@
 */
 
 #include <linux/module.h>
+#include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/linkage.h>
 #include <linux/raid/md.h>
@@ -273,6 +274,7 @@ static mddev_t * mddev_find(dev_t unit)
         atomic_set(&new->active, 1);
         spin_lock_init(&new->write_lock);
         init_waitqueue_head(&new->sb_wait);
+        new->reshape_position = MaxSector;
 
         new->queue = blk_alloc_queue(GFP_KERNEL);
         if (!new->queue) {
@@ -589,14 +591,41 @@ abort:
         return ret;
 }
 
+
+static u32 md_csum_fold(u32 csum)
+{
+        csum = (csum & 0xffff) + (csum >> 16);
+        return (csum & 0xffff) + (csum >> 16);
+}
+
 static unsigned int calc_sb_csum(mdp_super_t * sb)
 {
+        u64 newcsum = 0;
+        u32 *sb32 = (u32*)sb;
+        int i;
         unsigned int disk_csum, csum;
 
         disk_csum = sb->sb_csum;
         sb->sb_csum = 0;
-        csum = csum_partial((void *)sb, MD_SB_BYTES, 0);
+
+        for (i = 0; i < MD_SB_BYTES/4 ; i++)
+                newcsum += sb32[i];
+        csum = (newcsum & 0xffffffff) + (newcsum>>32);
+
+
+#ifdef CONFIG_ALPHA
+        /* This used to use csum_partial, which was wrong for several
+         * reasons including that different results are returned on
+         * different architectures.  It isn't critical that we get exactly
+         * the same return value as before (we always csum_fold before
+         * testing, and that removes any differences).  However as we
+         * know that csum_partial always returned a 16bit value on
+         * alphas, do a fold to maximise conformity to previous behaviour.
+         */
+        sb->sb_csum = md_csum_fold(disk_csum);
+#else
         sb->sb_csum = disk_csum;
+#endif
         return csum;
 }
 
@@ -684,7 +713,7 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
         if (sb->raid_disks <= 0)
                 goto abort;
 
-        if (csum_fold(calc_sb_csum(sb)) != csum_fold(sb->sb_csum)) {
+        if (md_csum_fold(calc_sb_csum(sb)) != md_csum_fold(sb->sb_csum)) {
                 printk(KERN_WARNING "md: invalid superblock checksum on %s\n",
                         b);
                 goto abort;
@@ -694,6 +723,17 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
         rdev->data_offset = 0;
         rdev->sb_size = MD_SB_BYTES;
 
+        if (sb->state & (1<<MD_SB_BITMAP_PRESENT)) {
+                if (sb->level != 1 && sb->level != 4
+                    && sb->level != 5 && sb->level != 6
+                    && sb->level != 10) {
+                        /* FIXME use a better test */
+                        printk(KERN_WARNING
+                               "md: bitmaps not supported for this level.\n");
+                        goto abort;
+                }
+        }
+
         if (sb->level == LEVEL_MULTIPATH)
                 rdev->desc_nr = -1;
         else
@@ -792,16 +832,8 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 mddev->max_disks = MD_SB_DISKS;
 
                 if (sb->state & (1<<MD_SB_BITMAP_PRESENT) &&
-                    mddev->bitmap_file == NULL) {
-                        if (mddev->level != 1 && mddev->level != 4
-                            && mddev->level != 5 && mddev->level != 6
-                            && mddev->level != 10) {
-                                /* FIXME use a better test */
-                                printk(KERN_WARNING "md: bitmaps not supported for this level.\n");
-                                return -EINVAL;
-                        }
+                    mddev->bitmap_file == NULL)
                         mddev->bitmap_offset = mddev->default_bitmap_offset;
-                }
 
         } else if (mddev->pers == NULL) {
                 /* Insist on good event counter while assembling */
@@ -1058,6 +1090,18 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
                        bdevname(rdev->bdev,b));
                 return -EINVAL;
         }
+        if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_BITMAP_OFFSET)) {
+                if (sb->level != cpu_to_le32(1) &&
+                    sb->level != cpu_to_le32(4) &&
+                    sb->level != cpu_to_le32(5) &&
+                    sb->level != cpu_to_le32(6) &&
+                    sb->level != cpu_to_le32(10)) {
+                        printk(KERN_WARNING
+                               "md: bitmaps not supported for this level.\n");
+                        return -EINVAL;
+                }
+        }
+
         rdev->preferred_minor = 0xffff;
         rdev->data_offset = le64_to_cpu(sb->data_offset);
         atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
@@ -1141,14 +1185,9 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 mddev->max_disks =  (4096-256)/2;
 
                 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_BITMAP_OFFSET) &&
-                    mddev->bitmap_file == NULL ) {
-                        if (mddev->level != 1 && mddev->level != 5 && mddev->level != 6
-                            && mddev->level != 10) {
-                                printk(KERN_WARNING "md: bitmaps not supported for this level.\n");
-                                return -EINVAL;
-                        }
+                    mddev->bitmap_file == NULL )
                         mddev->bitmap_offset = (__s32)le32_to_cpu(sb->bitmap_offset);
-                }
+
                 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE)) {
                         mddev->reshape_position = le64_to_cpu(sb->reshape_position);
                         mddev->delta_disks = le32_to_cpu(sb->delta_disks);
@@ -2204,6 +2243,10 @@ static ssize_t
 layout_show(mddev_t *mddev, char *page)
 {
         /* just a number, not meaningful for all levels */
+        if (mddev->reshape_position != MaxSector &&
+            mddev->layout != mddev->new_layout)
+                return sprintf(page, "%d (%d)\n",
+                               mddev->new_layout, mddev->layout);
         return sprintf(page, "%d\n", mddev->layout);
 }
 
@@ -2212,13 +2255,16 @@ layout_store(mddev_t *mddev, const char *buf, size_t len)
 {
         char *e;
         unsigned long n = simple_strtoul(buf, &e, 10);
-        if (mddev->pers)
-                return -EBUSY;
 
         if (!*buf || (*e && *e != '\n'))
                 return -EINVAL;
 
-        mddev->layout = n;
+        if (mddev->pers)
+                return -EBUSY;
+        if (mddev->reshape_position != MaxSector)
+                mddev->new_layout = n;
+        else
+                mddev->layout = n;
         return len;
 }
 static struct md_sysfs_entry md_layout =
@@ -2230,6 +2276,10 @@ raid_disks_show(mddev_t *mddev, char *page)
 {
         if (mddev->raid_disks == 0)
                 return 0;
+        if (mddev->reshape_position != MaxSector &&
+            mddev->delta_disks != 0)
+                return sprintf(page, "%d (%d)\n", mddev->raid_disks,
+                               mddev->raid_disks - mddev->delta_disks);
         return sprintf(page, "%d\n", mddev->raid_disks);
 }
 
@@ -2247,7 +2297,11 @@ raid_disks_store(mddev_t *mddev, const char *buf, size_t len)
 
         if (mddev->pers)
                 rv = update_raid_disks(mddev, n);
-        else
+        else if (mddev->reshape_position != MaxSector) {
+                int olddisks = mddev->raid_disks - mddev->delta_disks;
+                mddev->delta_disks = n - olddisks;
+                mddev->raid_disks = n;
+        } else
                 mddev->raid_disks = n;
         return rv ? rv : len;
 }
@@ -2257,6 +2311,10 @@ __ATTR(raid_disks, S_IRUGO|S_IWUSR, raid_disks_show, raid_disks_store);
 static ssize_t
 chunk_size_show(mddev_t *mddev, char *page)
 {
+        if (mddev->reshape_position != MaxSector &&
+            mddev->chunk_size != mddev->new_chunk)
+                return sprintf(page, "%d (%d)\n", mddev->new_chunk,
+                               mddev->chunk_size);
         return sprintf(page, "%d\n", mddev->chunk_size);
 }
 
@@ -2267,12 +2325,15 @@ chunk_size_store(mddev_t *mddev, const char *buf, size_t len)
         char *e;
         unsigned long n = simple_strtoul(buf, &e, 10);
 
-        if (mddev->pers)
-                return -EBUSY;
         if (!*buf || (*e && *e != '\n'))
                 return -EINVAL;
 
-        mddev->chunk_size = n;
+        if (mddev->pers)
+                return -EBUSY;
+        else if (mddev->reshape_position != MaxSector)
+                mddev->new_chunk = n;
+        else
+                mddev->chunk_size = n;
         return len;
 }
 static struct md_sysfs_entry md_chunk_size =
@@ -2637,8 +2698,7 @@ metadata_store(mddev_t *mddev, const char *buf, size_t len)
         minor = simple_strtoul(buf, &e, 10);
         if (e==buf || (*e && *e != '\n') )
                 return -EINVAL;
-        if (major >= sizeof(super_types)/sizeof(super_types[0]) ||
-            super_types[major].name == NULL)
+        if (major >= ARRAY_SIZE(super_types) || super_types[major].name == NULL)
                 return -ENOENT;
         mddev->major_version = major;
         mddev->minor_version = minor;
@@ -2859,6 +2919,37 @@ suspend_hi_store(mddev_t *mddev, const char *buf, size_t len)
 static struct md_sysfs_entry md_suspend_hi =
 __ATTR(suspend_hi, S_IRUGO|S_IWUSR, suspend_hi_show, suspend_hi_store);
 
+static ssize_t
+reshape_position_show(mddev_t *mddev, char *page)
+{
+        if (mddev->reshape_position != MaxSector)
+                return sprintf(page, "%llu\n",
+                               (unsigned long long)mddev->reshape_position);
+        strcpy(page, "none\n");
+        return 5;
+}
+
+static ssize_t
+reshape_position_store(mddev_t *mddev, const char *buf, size_t len)
+{
+        char *e;
+        unsigned long long new = simple_strtoull(buf, &e, 10);
+        if (mddev->pers)
+                return -EBUSY;
+        if (buf == e || (*e && *e != '\n'))
+                return -EINVAL;
+        mddev->reshape_position = new;
+        mddev->delta_disks = 0;
+        mddev->new_level = mddev->level;
+        mddev->new_layout = mddev->layout;
+        mddev->new_chunk = mddev->chunk_size;
+        return len;
+}
+
+static struct md_sysfs_entry md_reshape_position =
+__ATTR(reshape_position, S_IRUGO|S_IWUSR, reshape_position_show,
+       reshape_position_store);
+
 
 static struct attribute *md_default_attrs[] = {
         &md_level.attr,
@@ -2871,6 +2962,7 @@ static struct attribute *md_default_attrs[] = {
         &md_new_device.attr,
         &md_safe_delay.attr,
         &md_array_state.attr,
+        &md_reshape_position.attr,
         NULL,
 };
 
@@ -3409,6 +3501,7 @@ static int do_md_stop(mddev_t * mddev, int mode)
                 mddev->size = 0;
                 mddev->raid_disks = 0;
                 mddev->recovery_cp = 0;
+                mddev->reshape_position = MaxSector;
 
         } else if (mddev->pers)
                 printk(KERN_INFO "md: %s switched to read-only mode.\n",
@@ -4019,7 +4112,7 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info)
         if (info->raid_disks == 0) {
                 /* just setting version number for superblock loading */
                 if (info->major_version < 0 ||
-                    info->major_version >= sizeof(super_types)/sizeof(super_types[0]) ||
+                    info->major_version >= ARRAY_SIZE(super_types) ||
                     super_types[info->major_version].name == NULL) {
                         /* maybe try to auto-load a module? */
                         printk(KERN_INFO 
@@ -4941,15 +5034,6 @@ static int md_seq_open(struct inode *inode, struct file *file)
         return error;
 }
 
-static int md_seq_release(struct inode *inode, struct file *file)
-{
-        struct seq_file *m = file->private_data;
-        struct mdstat_info *mi = m->private;
-        m->private = NULL;
-        kfree(mi);
-        return seq_release(inode, file);
-}
-
 static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
 {
         struct seq_file *m = filp->private_data;
@@ -4971,7 +5055,7 @@ static const struct file_operations md_seq_fops = {
         .open           = md_seq_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = md_seq_release,
+        .release        = seq_release_private,
         .poll           = mdstat_poll,
 };
 
@@ -5019,7 +5103,7 @@ static int is_mddev_idle(mddev_t *mddev)
                  *
                  * Note: the following is an unsigned comparison.
                  */
-                if ((curr_events - rdev->last_events + 4096) > 8192) {
+                if ((long)curr_events - (long)rdev->last_events > 4096) {
                         rdev->last_events = curr_events;
                         idle = 0;
                 }
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 97ee870b265d..3a95cc5e029c 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -271,21 +271,25 @@ static int raid1_end_read_request(struct bio *bio, unsigned int bytes_done, int
          */
         update_head_pos(mirror, r1_bio);
 
-        if (uptodate || (conf->raid_disks - conf->mddev->degraded) <= 1) {
-                /*
-                 * Set R1BIO_Uptodate in our master bio, so that
-                 * we will return a good error code for to the higher
-                 * levels even if IO on some other mirrored buffer fails.
-                 *
-                 * The 'master' represents the composite IO operation to
-                 * user-side. So if something waits for IO, then it will
-                 * wait for the 'master' bio.
+        if (uptodate)
+                set_bit(R1BIO_Uptodate, &r1_bio->state);
+        else {
+                /* If all other devices have failed, we want to return
+                 * the error upwards rather than fail the last device.
+                 * Here we redefine "uptodate" to mean "Don't want to retry"
                  */
-                if (uptodate)
-                        set_bit(R1BIO_Uptodate, &r1_bio->state);
+                unsigned long flags;
+                spin_lock_irqsave(&conf->device_lock, flags);
+                if (r1_bio->mddev->degraded == conf->raid_disks ||
+                    (r1_bio->mddev->degraded == conf->raid_disks-1 &&
+                     !test_bit(Faulty, &conf->mirrors[mirror].rdev->flags)))
+                        uptodate = 1;
+                spin_unlock_irqrestore(&conf->device_lock, flags);
+        }
 
+        if (uptodate)
                 raid_end_bio_io(r1_bio);
-        } else {
+        else {
                 /*
                  * oops, read error:
                  */
@@ -992,13 +996,14 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                 unsigned long flags;
                 spin_lock_irqsave(&conf->device_lock, flags);
                 mddev->degraded++;
+                set_bit(Faulty, &rdev->flags);
                 spin_unlock_irqrestore(&conf->device_lock, flags);
                 /*
                  * if recovery is running, make sure it aborts.
                  */
                 set_bit(MD_RECOVERY_ERR, &mddev->recovery);
-        }
-        set_bit(Faulty, &rdev->flags);
+        } else
+                set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
         printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n"
                 "       Operation continuing on %d devices\n",
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 8d59914f2057..061375ee6592 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -353,8 +353,8 @@ static int grow_stripes(raid5_conf_t *conf, int num)
         struct kmem_cache *sc;
         int devs = conf->raid_disks;
 
-        sprintf(conf->cache_name[0], "raid5/%s", mdname(conf->mddev));
-        sprintf(conf->cache_name[1], "raid5/%s-alt", mdname(conf->mddev));
+        sprintf(conf->cache_name[0], "raid5-%s", mdname(conf->mddev));
+        sprintf(conf->cache_name[1], "raid5-%s-alt", mdname(conf->mddev));
         conf->active_name = 0;
         sc = kmem_cache_create(conf->cache_name[conf->active_name],
                                sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 91d25798ae4a..624b21cef5b3 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Multimedia devices"
+        depends on HAS_IOMEM
 
 config VIDEO_DEV
         tristate "Video For Linux"
@@ -86,6 +87,14 @@ config VIDEO_TVEEPROM
         tristate
         depends on I2C
 
+config DAB
+        boolean "DAB adapters"
+        default y
+        ---help---
+          Allow selecting support for for Digital Audio Broadcasting (DAB)
+          Receiver adapters.
+
+if DAB
 config USB_DABUSB
         tristate "DABUSB driver"
         depends on USB
@@ -99,5 +108,6 @@ config USB_DABUSB
 
           To compile this driver as a module, choose M here: the
           module will be called dabusb.
+endif # DAB
 
 endmenu
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index c578a529e7a8..8fa19939c2b6 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -5,4 +5,4 @@
 obj-y := common/
 obj-$(CONFIG_VIDEO_DEV) += video/
 obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-$(CONFIG_DVB)       += dvb/
+obj-$(CONFIG_DVB_CORE)  += dvb/
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 86cbdbcf9d7d..ef3e54cd9407 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -136,28 +136,45 @@ char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa
         char *mem = vmalloc_32(length);
         int slen = 0;
 
-        if (NULL == mem) {
-                return NULL;
-        }
+        if (NULL == mem)
+                goto err_null;
 
-        if (!(pt->slist = vmalloc_to_sg(mem, pages))) {
-                vfree(mem);
-                return NULL;
-        }
+        if (!(pt->slist = vmalloc_to_sg(mem, pages)))
+                goto err_free_mem;
 
-        if (saa7146_pgtable_alloc(pci, pt)) {
-                kfree(pt->slist);
-                pt->slist = NULL;
-                vfree(mem);
-                return NULL;
-        }
+        if (saa7146_pgtable_alloc(pci, pt))
+                goto err_free_slist;
 
-        slen = pci_map_sg(pci,pt->slist,pages,PCI_DMA_FROMDEVICE);
-        if (0 != saa7146_pgtable_build_single(pci, pt, pt->slist, slen)) {
-                return NULL;
-        }
+        pt->nents = pages;
+        slen = pci_map_sg(pci,pt->slist,pt->nents,PCI_DMA_FROMDEVICE);
+        if (0 == slen)
+                goto err_free_pgtable;
+
+        if (0 != saa7146_pgtable_build_single(pci, pt, pt->slist, slen))
+                goto err_unmap_sg;
 
         return mem;
+
+err_unmap_sg:
+        pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE);
+err_free_pgtable:
+        saa7146_pgtable_free(pci, pt);
+err_free_slist:
+        kfree(pt->slist);
+        pt->slist = NULL;
+err_free_mem:
+        vfree(mem);
+err_null:
+        return NULL;
+}
+
+void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt)
+{
+        pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE);
+        saa7146_pgtable_free(pci, pt);
+        kfree(pt->slist);
+        pt->slist = NULL;
+        vfree(mem);
 }
 
 void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
@@ -166,8 +183,6 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
                 return;
         pci_free_consistent(pci, pt->size, pt->cpu, pt->dma);
         pt->cpu = NULL;
-        kfree(pt->slist);
-        pt->slist = NULL;
 }
 
 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
@@ -528,6 +543,7 @@ EXPORT_SYMBOL_GPL(saa7146_pgtable_alloc);
 EXPORT_SYMBOL_GPL(saa7146_pgtable_free);
 EXPORT_SYMBOL_GPL(saa7146_pgtable_build_single);
 EXPORT_SYMBOL_GPL(saa7146_vmalloc_build_pgtable);
+EXPORT_SYMBOL_GPL(saa7146_vfree_destroy_pgtable);
 EXPORT_SYMBOL_GPL(saa7146_wait_for_debi_done);
 
 EXPORT_SYMBOL_GPL(saa7146_setgpio);
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index c18a5da64934..b4770aecc01d 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -307,7 +307,6 @@ static int fops_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg);
 static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
 /*
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index a97c8f5e9a5d..efd2b7468158 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -2,24 +2,16 @@
 # Multimedia device configuration
 #
 
-menu "Digital Video Broadcasting Devices"
+source "drivers/media/dvb/dvb-core/Kconfig"
 
-config DVB
-        bool "DVB For Linux"
-        depends on NET && INET
+menuconfig DVB_CAPTURE_DRIVERS
+        bool "DVB/ATSC adapters"
+        depends on DVB_CORE
+        default y
         ---help---
-          Support Digital Video Broadcasting hardware.  Enable this if you
-          own a DVB adapter and want to use it or if you compile Linux for
-          a digital SetTopBox.
-
-          API specs and user tools are available from <http://www.linuxtv.org/>.
+          Say Y to select Digital TV adapters
 
-          Please report problems regarding this driver to the LinuxDVB
-          mailing list.
-
-          If unsure say N.
-
-source "drivers/media/dvb/dvb-core/Kconfig"
+if DVB_CAPTURE_DRIVERS
 
 comment "Supported SAA7146 based PCI Adapters"
         depends on DVB_CORE && PCI && I2C
@@ -48,4 +40,4 @@ comment "Supported DVB Frontends"
         depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
 
-endmenu
+endif # DVB_CAPTURE_DRIVERS
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 0393a3d19920..e908e3cf1e50 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1721,9 +1721,6 @@ static void dst_release(struct dvb_frontend *fe)
                 symbol_put(dst_ca_attach);
 #endif
         }
-#ifdef CONFIG_DVB_CORE_ATTACH
-        symbol_put(dst_attach);
-#endif
         kfree(state);
 }
 
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 3bf084f2e522..87623d203a89 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -22,7 +22,6 @@
 #ifndef DST_COMMON_H
 #define DST_COMMON_H
 
-#include <linux/smp_lock.h>
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
diff --git a/drivers/media/dvb/dvb-core/Kconfig b/drivers/media/dvb/dvb-core/Kconfig
index 1990eda10c46..e3e6839f8073 100644
--- a/drivers/media/dvb/dvb-core/Kconfig
+++ b/drivers/media/dvb/dvb-core/Kconfig
@@ -1,12 +1,22 @@
 config DVB_CORE
-        tristate "DVB Core Support"
-        depends on DVB
+        tristate "DVB for Linux"
+        depends on NET && INET
         select CRC32
         help
+          Support Digital Video Broadcasting hardware.  Enable this if you
+          own a DVB adapter and want to use it or if you compile Linux for
+          a digital SetTopBox.
+
           DVB core utility functions for device handling, software fallbacks etc.
           Say Y when you have a DVB card and want to use it. Say Y if your want
           to build your drivers outside the kernel, but need the DVB core. All
           in-kernel drivers will select this automatically if needed.
+
+          API specs and user tools are available from <http://www.linuxtv.org/>.
+
+          Please report problems regarding this driver to the LinuxDVB
+          mailing list.
+
           If unsure say N.
 
 config DVB_CORE_ATTACH
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index e23d8a0ea1d3..a9fa3337dd81 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -200,7 +200,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 {
         struct dvb_device *dvbdev;
         struct file_operations *dvbdevfops;
-
+        struct class_device *clsdev;
         int id;
 
         mutex_lock(&dvbdev_register_lock);
@@ -242,8 +242,15 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 
         mutex_unlock(&dvbdev_register_lock);
 
-        class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
-                            adap->device, "dvb%d.%s%d", adap->num, dnames[type], id);
+        clsdev = class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR,
+                                     nums2minor(adap->num, type, id)),
+                                     adap->device, "dvb%d.%s%d", adap->num,
+                                     dnames[type], id);
+        if (IS_ERR(clsdev)) {
+                printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n",
+                       __FUNCTION__, adap->num, dnames[type], id, PTR_ERR(clsdev));
+                return PTR_ERR(clsdev);
+        }
 
         dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
                 adap->num, dnames[type], id, nums2minor(adap->num, type, id),
@@ -431,7 +438,7 @@ static void __exit exit_dvbdev(void)
         unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }
 
-module_init(init_dvbdev);
+subsys_initcall(init_dvbdev);
 module_exit(exit_dvbdev);
 
 MODULE_DESCRIPTION("DVB Core Driver");
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 97715f7514d6..403081689de1 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -19,6 +19,7 @@
 #define USB_VID_COMPRO_UNK                      0x145f
 #define USB_VID_CYPRESS                         0x04b4
 #define USB_VID_DIBCOM                          0x10b8
+#define USB_VID_DPOSH                           0x1498
 #define USB_VID_DVICO                           0x0fe9
 #define USB_VID_EMPIA                           0xeb1a
 #define USB_VID_GENPIX                          0x09c0
@@ -61,6 +62,8 @@
 #define USB_PID_DIBCOM_STK7700P                         0x1e14
 #define USB_PID_DIBCOM_STK7700P_PC                      0x1e78
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD                 0x2131
+#define USB_PID_DPOSH_M9206_COLD                        0x9206
+#define USB_PID_DPOSH_M9206_WARM                        0xa090
 #define USB_PID_UNIWILL_STK7700P                        0x6003
 #define USB_PID_GRANDTEC_DVBT_USB_COLD                  0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
@@ -145,6 +148,8 @@
 #define USB_PID_MSI_DIGI_VOX_MINI_II                    0x1513
 #define USB_PID_OPERA1_COLD                             0x2830
 #define USB_PID_OPERA1_WARM                             0x3829
+#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD            0x0514
+#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM            0x0513
 
 
 #endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 68ed3a788083..9200a30dd1b9 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
  * see dvb-usb-init.c for copyright information.
  *
- * This file contains functions for initializing the the input-device and for handling remote-control-queries.
+ * This file contains functions for initializing the input-device and for handling remote-control-queries.
  */
 #include "dvb-usb-common.h"
 #include <linux/usb/input.h>
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 0d721731a524..6f824a569e14 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -119,7 +119,7 @@ struct usb_data_stream_properties {
  * @caps: capabilities of the DVB USB device.
  * @pid_filter_count: number of PID filter position in the optional hardware
  *  PID-filter.
- * @streaming_crtl: called to start and stop the MPEG2-TS streaming of the
+ * @streaming_ctrl: called to start and stop the MPEG2-TS streaming of the
  *  device (not URB submitting/killing).
  * @pid_filter_ctrl: called to en/disable the PID filter, if any.
  * @pid_filter: called to set/unset a PID for filtering.
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 45d7bc214c18..c546ddeda5d4 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -3,8 +3,8 @@
  * Copyright (C) 2006 Aapo Tahkola (aet@rasterburn.org)
  *
  *      This program is free software; you can redistribute it and/or modify it
- *      under the terms of the GNU General Public License as published by the Free
- *      Software Foundation, version 2.
+ *      under the terms of the GNU General Public License as published by the
+ *      Free Software Foundation, version 2.
  *
  * see Documentation/dvb/README.dvb-usb for more information
  */
@@ -22,26 +22,7 @@ static int dvb_usb_m920x_debug;
 module_param_named(debug,dvb_usb_m920x_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
 
-static struct dvb_usb_rc_key megasky_rc_keys [] = {
-        { 0x0, 0x12, KEY_POWER },
-        { 0x0, 0x1e, KEY_CYCLEWINDOWS }, /* min/max */
-        { 0x0, 0x02, KEY_CHANNELUP },
-        { 0x0, 0x05, KEY_CHANNELDOWN },
-        { 0x0, 0x03, KEY_VOLUMEUP },
-        { 0x0, 0x06, KEY_VOLUMEDOWN },
-        { 0x0, 0x04, KEY_MUTE },
-        { 0x0, 0x07, KEY_OK }, /* TS */
-        { 0x0, 0x08, KEY_STOP },
-        { 0x0, 0x09, KEY_MENU }, /* swap */
-        { 0x0, 0x0a, KEY_REWIND },
-        { 0x0, 0x1b, KEY_PAUSE },
-        { 0x0, 0x1f, KEY_FASTFORWARD },
-        { 0x0, 0x0c, KEY_RECORD },
-        { 0x0, 0x0d, KEY_CAMERA }, /* screenshot */
-        { 0x0, 0x0e, KEY_COFFEE }, /* "MTS" */
-};
-
-static inline int m9206_read(struct usb_device *udev, u8 request, u16 value,\
+static inline int m920x_read(struct usb_device *udev, u8 request, u16 value,
                              u16 index, void *data, int size)
 {
         int ret;
@@ -55,14 +36,14 @@ static inline int m9206_read(struct usb_device *udev, u8 request, u16 value,\
         }
 
         if (ret != size) {
-                deb_rc("m920x_read = no data\n");
+                deb("m920x_read = no data\n");
                 return -EIO;
         }
 
         return 0;
 }
 
-static inline int m9206_write(struct usb_device *udev, u8 request,
+static inline int m920x_write(struct usb_device *udev, u8 request,
                               u16 value, u16 index)
 {
         int ret;
@@ -74,32 +55,40 @@ static inline int m9206_write(struct usb_device *udev, u8 request,
         return ret;
 }
 
-static int m9206_init(struct dvb_usb_device *d)
+static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
 {
         int ret = 0;
 
         /* Remote controller init. */
         if (d->props.rc_query) {
-                if ((ret = m9206_write(d->udev, M9206_CORE, 0xa8, M9206_RC_INIT2)) != 0)
-                        return ret;
+                deb("Initialising remote control\n");
+                while (rc_seq->address) {
+                        if ((ret = m920x_write(d->udev, M9206_CORE,
+                                               rc_seq->data,
+                                               rc_seq->address)) != 0) {
+                                deb("Initialising remote control failed\n");
+                                return ret;
+                        }
 
-                if ((ret = m9206_write(d->udev, M9206_CORE, 0x51, M9206_RC_INIT1)) != 0)
-                        return ret;
+                        rc_seq++;
+                }
+
+                deb("Initialising remote control success\n");
         }
 
         return ret;
 }
 
-static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-        struct m9206_state *m = d->priv;
+        struct m920x_state *m = d->priv;
         int i, ret = 0;
         u8 rc_state[2];
 
-        if ((ret = m9206_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, rc_state, 1)) != 0)
+        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, rc_state, 1)) != 0)
                 goto unlock;
 
-        if ((ret = m9206_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
+        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
                 goto unlock;
 
         for (i = 0; i < d->props.rc_key_map_size; i++)
@@ -111,6 +100,14 @@ static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                                 *state = REMOTE_NO_KEY_PRESSED;
                                 goto unlock;
 
+                        case 0x88: /* framing error or "invalid code" */
+                        case 0x99:
+                        case 0xc0:
+                        case 0xd8:
+                                *state = REMOTE_NO_KEY_PRESSED;
+                                m->rep_count = 0;
+                                goto unlock;
+
                         case 0x93:
                         case 0x92:
                                 m->rep_count = 0;
@@ -118,31 +115,32 @@ static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                                 goto unlock;
 
                         case 0x91:
-                                /* For comfort. */
+                                /* prevent immediate auto-repeat */
                                 if (++m->rep_count > 2)
                                         *state = REMOTE_KEY_REPEAT;
+                                else
+                                        *state = REMOTE_NO_KEY_PRESSED;
                                 goto unlock;
 
                         default:
-                                deb_rc("Unexpected rc response %x\n", rc_state[0]);
+                                deb("Unexpected rc state %02x\n", rc_state[0]);
                                 *state = REMOTE_NO_KEY_PRESSED;
                                 goto unlock;
                         }
                 }
 
         if (rc_state[1] != 0)
-                deb_rc("Unknown rc key %x\n", rc_state[1]);
+                deb("Unknown rc key %02x\n", rc_state[1]);
 
         *state = REMOTE_NO_KEY_PRESSED;
 
-        unlock:
+ unlock:
 
         return ret;
 }
 
 /* I2C */
-static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
-                          int num)
+static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
 {
         struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int i, j;
@@ -155,33 +153,40 @@ static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 return -EAGAIN;
 
         for (i = 0; i < num; i++) {
-                if (msg[i].flags & (I2C_M_NO_RD_ACK|I2C_M_IGNORE_NAK|I2C_M_TEN) ||
-                    msg[i].len == 0) {
-                        /* For a 0 byte message, I think sending the address to index 0x80|0x40
-                         * would be the correct thing to do.  However, zero byte messages are
-                         * only used for probing, and since we don't know how to get the slave's
-                         * ack, we can't probe. */
+                if (msg[i].flags & (I2C_M_NO_RD_ACK | I2C_M_IGNORE_NAK | I2C_M_TEN) || msg[i].len == 0) {
+                        /* For a 0 byte message, I think sending the address
+                         * to index 0x80|0x40 would be the correct thing to
+                         * do.  However, zero byte messages are only used for
+                         * probing, and since we don't know how to get the
+                         * slave's ack, we can't probe. */
                         ret = -ENOTSUPP;
                         goto unlock;
                 }
                 /* Send START & address/RW bit */
                 if (!(msg[i].flags & I2C_M_NOSTART)) {
-                        if ((ret = m9206_write(d->udev, M9206_I2C, (msg[i].addr<<1)|(msg[i].flags&I2C_M_RD?0x01:0), 0x80)) != 0)
+                        if ((ret = m920x_write(d->udev, M9206_I2C,
+                                        (msg[i].addr << 1) |
+                                        (msg[i].flags & I2C_M_RD ? 0x01 : 0), 0x80)) != 0)
                                 goto unlock;
                         /* Should check for ack here, if we knew how. */
                 }
                 if (msg[i].flags & I2C_M_RD) {
                         for (j = 0; j < msg[i].len; j++) {
-                                /* Last byte of transaction? Send STOP, otherwise send ACK. */
-                                int stop = (i+1 == num && j+1 == msg[i].len)?0x40:0x01;
-                                if ((ret = m9206_read(d->udev, M9206_I2C, 0x0, 0x20|stop, &msg[i].buf[j], 1)) != 0)
+                                /* Last byte of transaction?
+                                 * Send STOP, otherwise send ACK. */
+                                int stop = (i+1 == num && j+1 == msg[i].len) ? 0x40 : 0x01;
+
+                                if ((ret = m920x_read(d->udev, M9206_I2C, 0x0,
+                                                      0x20 | stop,
+                                                      &msg[i].buf[j], 1)) != 0)
                                         goto unlock;
                         }
                 } else {
                         for (j = 0; j < msg[i].len; j++) {
                                 /* Last byte of transaction? Then send STOP. */
-                                int stop = (i+1 == num && j+1 == msg[i].len)?0x40:0x00;
-                                if ((ret = m9206_write(d->udev, M9206_I2C, msg[i].buf[j], stop)) != 0)
+                                int stop = (i+1 == num && j+1 == msg[i].len) ? 0x40 : 0x00;
+
+                                if ((ret = m920x_write(d->udev, M9206_I2C, msg[i].buf[j], stop)) != 0)
                                         goto unlock;
                                 /* Should check for ack here too. */
                         }
@@ -189,25 +194,25 @@ static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
         }
         ret = num;
 
-unlock:
+ unlock:
         mutex_unlock(&d->i2c_mutex);
 
         return ret;
 }
 
-static u32 m9206_i2c_func(struct i2c_adapter *adapter)
+static u32 m920x_i2c_func(struct i2c_adapter *adapter)
 {
         return I2C_FUNC_I2C;
 }
 
-static struct i2c_algorithm m9206_i2c_algo = {
-        .master_xfer   = m9206_i2c_xfer,
-        .functionality = m9206_i2c_func,
+static struct i2c_algorithm m920x_i2c_algo = {
+        .master_xfer   = m920x_i2c_xfer,
+        .functionality = m920x_i2c_func,
 };
 
-
-static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx,
-                            int pid)
+/* pid filter */
+static int m920x_set_filter(struct dvb_usb_adapter *adap,
+                            int type, int idx, int pid)
 {
         int ret = 0;
 
@@ -216,18 +221,18 @@ static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx,
 
         pid |= 0x8000;
 
-        if ((ret = m9206_write(adap->dev->udev, M9206_FILTER, pid, (type << 8) | (idx * 4) )) != 0)
+        if ((ret = m920x_write(adap->dev->udev, M9206_FILTER, pid, (type << 8) | (idx * 4) )) != 0)
                 return ret;
 
-        if ((ret = m9206_write(adap->dev->udev, M9206_FILTER, 0, (type << 8) | (idx * 4) )) != 0)
+        if ((ret = m920x_write(adap->dev->udev, M9206_FILTER, 0, (type << 8) | (idx * 4) )) != 0)
                 return ret;
 
         return ret;
 }
 
-static int m9206_update_filters(struct dvb_usb_adapter *adap)
+static int m920x_update_filters(struct dvb_usb_adapter *adap)
 {
-        struct m9206_state *m = adap->dev->priv;
+        struct m920x_state *m = adap->dev->priv;
         int enabled = m->filtering_enabled;
         int i, ret = 0, filter = 0;
 
@@ -236,14 +241,14 @@ static int m9206_update_filters(struct dvb_usb_adapter *adap)
                         enabled = 0;
 
         /* Disable all filters */
-        if ((ret = m9206_set_filter(adap, 0x81, 1, enabled)) != 0)
+        if ((ret = m920x_set_filter(adap, 0x81, 1, enabled)) != 0)
                 return ret;
 
         for (i = 0; i < M9206_MAX_FILTERS; i++)
-                if ((ret = m9206_set_filter(adap, 0x81, i + 2, 0)) != 0)
+                if ((ret = m920x_set_filter(adap, 0x81, i + 2, 0)) != 0)
                         return ret;
 
-        if ((ret = m9206_set_filter(adap, 0x82, 0, 0x0)) != 0)
+        if ((ret = m920x_set_filter(adap, 0x82, 0, 0x0)) != 0)
                 return ret;
 
         /* Set */
@@ -252,40 +257,38 @@ static int m9206_update_filters(struct dvb_usb_adapter *adap)
                         if (m->filters[i] == 0)
                                 continue;
 
-                        if ((ret = m9206_set_filter(adap, 0x81, filter + 2, m->filters[i])) != 0)
+                        if ((ret = m920x_set_filter(adap, 0x81, filter + 2, m->filters[i])) != 0)
                                 return ret;
 
                         filter++;
                 }
         }
 
-        if ((ret = m9206_set_filter(adap, 0x82, 0, 0x02f5)) != 0)
+        if ((ret = m920x_set_filter(adap, 0x82, 0, 0x02f5)) != 0)
                 return ret;
 
         return ret;
 }
 
-static int m9206_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
+static int m920x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
-        struct m9206_state *m = adap->dev->priv;
+        struct m920x_state *m = adap->dev->priv;
 
         m->filtering_enabled = onoff ? 1 : 0;
 
-        return m9206_update_filters(adap);
+        return m920x_update_filters(adap);
 }
 
-static int m9206_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
-                            int onoff)
+static int m920x_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff)
 {
-        struct m9206_state *m = adap->dev->priv;
+        struct m920x_state *m = adap->dev->priv;
 
         m->filters[index] = onoff ? pid : 0;
 
-        return m9206_update_filters(adap);
+        return m920x_update_filters(adap);
 }
 
-static int m9206_firmware_download(struct usb_device *udev,
-                                   const struct firmware *fw)
+static int m920x_firmware_download(struct usb_device *udev, const struct firmware *fw)
 {
         u16 value, index, size;
         u8 read[4], *buff;
@@ -293,13 +296,13 @@ static int m9206_firmware_download(struct usb_device *udev,
 
         buff = kmalloc(65536, GFP_KERNEL);
 
-        if ((ret = m9206_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0)
+        if ((ret = m920x_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0)
                 goto done;
-        deb_rc("%x %x %x %x\n", read[0], read[1], read[2], read[3]);
+        deb("%x %x %x %x\n", read[0], read[1], read[2], read[3]);
 
-        if ((ret = m9206_read(udev, M9206_FW, 0x0, 0x0, read, 1)) != 0)
+        if ((ret = m920x_read(udev, M9206_FW, 0x0, 0x0, read, 1)) != 0)
                 goto done;
-        deb_rc("%x\n", read[0]);
+        deb("%x\n", read[0]);
 
         for (pass = 0; pass < 2; pass++) {
                 for (i = 0; i + (sizeof(u16) * 3) < fw->size;) {
@@ -317,11 +320,11 @@ static int m9206_firmware_download(struct usb_device *udev,
                                 memcpy(buff, fw->data + i, size);
 
                                 ret = usb_control_msg(udev, usb_sndctrlpipe(udev,0),
-                                            M9206_FW,
-                                            USB_TYPE_VENDOR | USB_DIR_OUT,
-                                            value, index, buff, size, 20);
+                                                      M9206_FW,
+                                                      USB_TYPE_VENDOR | USB_DIR_OUT,
+                                                      value, index, buff, size, 20);
                                 if (ret != size) {
-                                        deb_rc("error while uploading fw!\n");
+                                        deb("error while uploading fw!\n");
                                         ret = -EIO;
                                         goto done;
                                 }
@@ -330,7 +333,7 @@ static int m9206_firmware_download(struct usb_device *udev,
                         i += size;
                 }
                 if (i != fw->size) {
-                        deb_rc("bad firmware file!\n");
+                        deb("bad firmware file!\n");
                         ret = -EINVAL;
                         goto done;
                 }
@@ -338,11 +341,11 @@ static int m9206_firmware_download(struct usb_device *udev,
 
         msleep(36);
 
-        /* m9206 will disconnect itself from the bus after this. */
-        (void) m9206_write(udev, M9206_CORE, 0x01, M9206_FW_GO);
-        deb_rc("firmware uploaded!\n");
+        /* m920x will disconnect itself from the bus after this. */
+        (void) m920x_write(udev, M9206_CORE, 0x01, M9206_FW_GO);
+        deb("firmware uploaded!\n");
 
-        done:
+ done:
         kfree(buff);
 
         return ret;
@@ -362,7 +365,8 @@ static int m920x_identify_state(struct usb_device *udev,
         return 0;
 }
 
-static int megasky_mt352_demod_init(struct dvb_frontend *fe)
+/* demod configurations */
+static int m920x_mt352_demod_init(struct dvb_frontend *fe)
 {
         u8 config[] = { CONFIG, 0x3d };
         u8 clock[] = { CLOCK_CTL, 0x30 };
@@ -382,74 +386,174 @@ static int megasky_mt352_demod_init(struct dvb_frontend *fe)
         mt352_write(fe, unk1, ARRAY_SIZE(unk1));
         mt352_write(fe, unk2, ARRAY_SIZE(unk2));
 
-        deb_rc("Demod init!\n");
+        deb("Demod init!\n");
 
         return 0;
 }
 
-static struct mt352_config megasky_mt352_config = {
+static struct mt352_config m920x_mt352_config = {
         .demod_address = 0x0f,
         .no_tuner = 1,
-        .demod_init = megasky_mt352_demod_init,
+        .demod_init = m920x_mt352_demod_init,
+};
+
+static struct tda1004x_config m920x_tda10046_08_config = {
+        .demod_address = 0x08,
+        .invert = 0,
+        .invert_oclk = 0,
+        .ts_mode = TDA10046_TS_SERIAL,
+        .xtal_freq = TDA10046_XTAL_16M,
+        .if_freq = TDA10046_FREQ_045,
+        .agc_config = TDA10046_AGC_TDA827X,
+        .gpio_config = TDA10046_GPTRI,
+        .request_firmware = NULL,
+};
+
+static struct tda1004x_config m920x_tda10046_0b_config = {
+        .demod_address = 0x0b,
+        .invert = 0,
+        .invert_oclk = 0,
+        .ts_mode = TDA10046_TS_SERIAL,
+        .xtal_freq = TDA10046_XTAL_16M,
+        .if_freq = TDA10046_FREQ_045,
+        .agc_config = TDA10046_AGC_TDA827X,
+        .gpio_config = TDA10046_GPTRI,
+        .request_firmware = NULL, /* uses firmware EEPROM */
+};
+
+/* tuner configurations */
+static struct qt1010_config m920x_qt1010_config = {
+        .i2c_address = 0x62
 };
 
-static int megasky_mt352_frontend_attach(struct dvb_usb_adapter *adap)
+/* Callbacks for DVB USB */
+static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
 {
-        deb_rc("megasky_frontend_attach!\n");
+        deb("%s\n",__FUNCTION__);
 
-        if ((adap->fe = dvb_attach(mt352_attach, &megasky_mt352_config, &adap->dev->i2c_adap)) == NULL)
+        if ((adap->fe = dvb_attach(mt352_attach,
+                                   &m920x_mt352_config,
+                                   &adap->dev->i2c_adap)) == NULL)
                 return -EIO;
 
         return 0;
 }
 
-static struct qt1010_config megasky_qt1010_config = {
-        .i2c_address = 0x62
-};
-
-static int megasky_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
+static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)
 {
-        if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap,
-                       &megasky_qt1010_config) == NULL)
-                return -ENODEV;
+        deb("%s\n",__FUNCTION__);
+
+        if ((adap->fe = dvb_attach(tda10046_attach,
+                                   &m920x_tda10046_08_config,
+                                   &adap->dev->i2c_adap)) == NULL)
+                return -EIO;
 
         return 0;
 }
 
-static struct tda1004x_config digivox_tda10046_config = {
-        .demod_address = 0x08,
-        .invert = 0,
-        .invert_oclk = 0,
-        .ts_mode = TDA10046_TS_SERIAL,
-        .xtal_freq = TDA10046_XTAL_16M,
-        .if_freq = TDA10046_FREQ_045,
-        .agc_config = TDA10046_AGC_TDA827X,
-        .gpio_config = TDA10046_GPTRI,
-        .request_firmware = NULL,
-};
-
-static int digivox_tda10046_frontend_attach(struct dvb_usb_adapter *adap)
+static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap)
 {
-        deb_rc("digivox_tda10046_frontend_attach!\n");
+        deb("%s\n",__FUNCTION__);
 
-        if ((adap->fe = dvb_attach(tda10046_attach, &digivox_tda10046_config,
+        if ((adap->fe = dvb_attach(tda10046_attach,
+                                   &m920x_tda10046_0b_config,
                                    &adap->dev->i2c_adap)) == NULL)
                 return -EIO;
 
         return 0;
 }
 
-static int digivox_tda8275_tuner_attach(struct dvb_usb_adapter *adap)
+static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap,
-                       NULL) == NULL)
+        deb("%s\n",__FUNCTION__);
+
+        if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap, &m920x_qt1010_config) == NULL)
                 return -ENODEV;
+
         return 0;
 }
 
+static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        deb("%s\n",__FUNCTION__);
+
+        if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, NULL) == NULL)
+                return -ENODEV;
+
+        return 0;
+}
+
+static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        deb("%s\n",__FUNCTION__);
+
+        if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL)
+                return -ENODEV;
+
+        return 0;
+}
+
+/* device-specific initialization */
+static struct m920x_inits megasky_rc_init [] = {
+        { M9206_RC_INIT2, 0xa8 },
+        { M9206_RC_INIT1, 0x51 },
+        { } /* terminating entry */
+};
+
+static struct m920x_inits tvwalkertwin_rc_init [] = {
+        { M9206_RC_INIT2, 0x00 },
+        { M9206_RC_INIT1, 0xef },
+        { 0xff28,         0x00 },
+        { 0xff23,         0x00 },
+        { 0xff21,         0x30 },
+        { } /* terminating entry */
+};
+
+/* ir keymaps */
+static struct dvb_usb_rc_key megasky_rc_keys [] = {
+        { 0x0, 0x12, KEY_POWER },
+        { 0x0, 0x1e, KEY_CYCLEWINDOWS }, /* min/max */
+        { 0x0, 0x02, KEY_CHANNELUP },
+        { 0x0, 0x05, KEY_CHANNELDOWN },
+        { 0x0, 0x03, KEY_VOLUMEUP },
+        { 0x0, 0x06, KEY_VOLUMEDOWN },
+        { 0x0, 0x04, KEY_MUTE },
+        { 0x0, 0x07, KEY_OK }, /* TS */
+        { 0x0, 0x08, KEY_STOP },
+        { 0x0, 0x09, KEY_MENU }, /* swap */
+        { 0x0, 0x0a, KEY_REWIND },
+        { 0x0, 0x1b, KEY_PAUSE },
+        { 0x0, 0x1f, KEY_FASTFORWARD },
+        { 0x0, 0x0c, KEY_RECORD },
+        { 0x0, 0x0d, KEY_CAMERA }, /* screenshot */
+        { 0x0, 0x0e, KEY_COFFEE }, /* "MTS" */
+};
+
+static struct dvb_usb_rc_key tvwalkertwin_rc_keys [] = {
+        { 0x0, 0x01, KEY_ZOOM }, /* Full Screen */
+        { 0x0, 0x02, KEY_CAMERA }, /* snapshot */
+        { 0x0, 0x03, KEY_MUTE },
+        { 0x0, 0x04, KEY_REWIND },
+        { 0x0, 0x05, KEY_PLAYPAUSE }, /* Play/Pause */
+        { 0x0, 0x06, KEY_FASTFORWARD },
+        { 0x0, 0x07, KEY_RECORD },
+        { 0x0, 0x08, KEY_STOP },
+        { 0x0, 0x09, KEY_TIME }, /* Timeshift */
+        { 0x0, 0x0c, KEY_COFFEE }, /* Recall */
+        { 0x0, 0x0e, KEY_CHANNELUP },
+        { 0x0, 0x12, KEY_POWER },
+        { 0x0, 0x15, KEY_MENU }, /* source */
+        { 0x0, 0x18, KEY_CYCLEWINDOWS }, /* TWIN PIP */
+        { 0x0, 0x1a, KEY_CHANNELDOWN },
+        { 0x0, 0x1b, KEY_VOLUMEDOWN },
+        { 0x0, 0x1e, KEY_VOLUMEUP },
+};
+
 /* DVB USB Driver stuff */
 static struct dvb_usb_device_properties megasky_properties;
 static struct dvb_usb_device_properties digivox_mini_ii_properties;
+static struct dvb_usb_device_properties tvwalkertwin_properties;
+static struct dvb_usb_device_properties dposh_properties;
 
 static int m920x_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
@@ -457,19 +561,57 @@ static int m920x_probe(struct usb_interface *intf,
         struct dvb_usb_device *d;
         struct usb_host_interface *alt;
         int ret;
+        struct m920x_inits *rc_init_seq = NULL;
+        int bInterfaceNumber = intf->cur_altsetting->desc.bInterfaceNumber;
 
-        deb_rc("Probed!\n");
+        deb("Probing for m920x device at interface %d\n", bInterfaceNumber);
 
-        if (((ret = dvb_usb_device_init(intf, &megasky_properties, THIS_MODULE, &d)) == 0) ||
-            ((ret = dvb_usb_device_init(intf, &digivox_mini_ii_properties, THIS_MODULE, &d)) == 0))
-                goto found;
+        if (bInterfaceNumber == 0) {
+                /* Single-tuner device, or first interface on
+                 * multi-tuner device
+                 */
 
-        return ret;
+                if ((ret = dvb_usb_device_init(intf, &megasky_properties,
+                                               THIS_MODULE, &d)) == 0) {
+                        rc_init_seq = megasky_rc_init;
+                        goto found;
+                }
+
+                if ((ret = dvb_usb_device_init(intf, &digivox_mini_ii_properties,
+                                               THIS_MODULE, &d)) == 0) {
+                        /* No remote control, so no rc_init_seq */
+                        goto found;
+                }
+
+                /* This configures both tuners on the TV Walker Twin */
+                if ((ret = dvb_usb_device_init(intf, &tvwalkertwin_properties,
+                                               THIS_MODULE, &d)) == 0) {
+                        rc_init_seq = tvwalkertwin_rc_init;
+                        goto found;
+                }
+
+                if ((ret = dvb_usb_device_init(intf, &dposh_properties,
+                                               THIS_MODULE, &d)) == 0) {
+                        /* Remote controller not supported yet. */
+                        goto found;
+                }
+
+                return ret;
+        } else {
+                /* Another interface on a multi-tuner device */
 
-found:
+                /* The LifeView TV Walker Twin gets here, but struct
+                 * tvwalkertwin_properties already configured both
+                 * tuners, so there is nothing for us to do here
+                 */
+
+                return -ENODEV;
+        }
+
+ found:
         alt = usb_altnum_to_altsetting(intf, 1);
         if (alt == NULL) {
-                deb_rc("No alt found!\n");
+                deb("No alt found!\n");
                 return -ENODEV;
         }
 
@@ -478,7 +620,7 @@ found:
         if (ret < 0)
                 return ret;
 
-        if ((ret = m9206_init(d)) != 0)
+        if ((ret = m920x_init(d, rc_init_seq)) != 0)
                 return ret;
 
         return ret;
@@ -488,6 +630,12 @@ static struct usb_device_id m920x_table [] = {
                 { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) },
                 { USB_DEVICE(USB_VID_ANUBIS_ELECTRONIC,
                              USB_PID_MSI_DIGI_VOX_MINI_II) },
+                { USB_DEVICE(USB_VID_ANUBIS_ELECTRONIC,
+                             USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD) },
+                { USB_DEVICE(USB_VID_ANUBIS_ELECTRONIC,
+                             USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM) },
+                { USB_DEVICE(USB_VID_DPOSH, USB_PID_DPOSH_M9206_COLD) },
+                { USB_DEVICE(USB_VID_DPOSH, USB_PID_DPOSH_M9206_WARM) },
                 { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, m920x_table);
@@ -497,14 +645,14 @@ static struct dvb_usb_device_properties megasky_properties = {
 
         .usb_ctrl = DEVICE_SPECIFIC,
         .firmware = "dvb-usb-megasky-02.fw",
-        .download_firmware = m9206_firmware_download,
+        .download_firmware = m920x_firmware_download,
 
         .rc_interval      = 100,
         .rc_key_map       = megasky_rc_keys,
         .rc_key_map_size  = ARRAY_SIZE(megasky_rc_keys),
-        .rc_query         = m9206_rc_query,
+        .rc_query         = m920x_rc_query,
 
-        .size_of_priv     = sizeof(struct m9206_state),
+        .size_of_priv     = sizeof(struct m920x_state),
 
         .identify_state   = m920x_identify_state,
         .num_adapters = 1,
@@ -513,11 +661,11 @@ static struct dvb_usb_device_properties megasky_properties = {
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
                 .pid_filter_count = 8,
-                .pid_filter       = m9206_pid_filter,
-                .pid_filter_ctrl  = m9206_pid_filter_ctrl,
+                .pid_filter       = m920x_pid_filter,
+                .pid_filter_ctrl  = m920x_pid_filter_ctrl,
 
-                .frontend_attach  = megasky_mt352_frontend_attach,
-                .tuner_attach     = megasky_qt1010_tuner_attach,
+                .frontend_attach  = m920x_mt352_frontend_attach,
+                .tuner_attach     = m920x_qt1010_tuner_attach,
 
                 .stream = {
                         .type = USB_BULK,
@@ -530,7 +678,7 @@ static struct dvb_usb_device_properties megasky_properties = {
                         }
                 },
         }},
-        .i2c_algo         = &m9206_i2c_algo,
+        .i2c_algo         = &m920x_i2c_algo,
 
         .num_device_descs = 1,
         .devices = {
@@ -546,22 +694,22 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties = {
 
         .usb_ctrl = DEVICE_SPECIFIC,
         .firmware = "dvb-usb-digivox-02.fw",
-        .download_firmware = m9206_firmware_download,
+        .download_firmware = m920x_firmware_download,
 
-        .size_of_priv     = sizeof(struct m9206_state),
+        .size_of_priv     = sizeof(struct m920x_state),
 
         .identify_state   = m920x_identify_state,
         .num_adapters = 1,
         .adapter = {{
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
-                DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
                 .pid_filter_count = 8,
-                .pid_filter       = m9206_pid_filter,
-                .pid_filter_ctrl  = m9206_pid_filter_ctrl,
+                .pid_filter       = m920x_pid_filter,
+                .pid_filter_ctrl  = m920x_pid_filter_ctrl,
 
-                .frontend_attach  = digivox_tda10046_frontend_attach,
-                .tuner_attach     = digivox_tda8275_tuner_attach,
+                .frontend_attach  = m920x_tda10046_08_frontend_attach,
+                .tuner_attach     = m920x_tda8275_60_tuner_attach,
 
                 .stream = {
                         .type = USB_BULK,
@@ -574,7 +722,7 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties = {
                         }
                 },
         }},
-        .i2c_algo         = &m9206_i2c_algo,
+        .i2c_algo         = &m920x_i2c_algo,
 
         .num_device_descs = 1,
         .devices = {
@@ -585,6 +733,122 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties = {
         }
 };
 
+/* LifeView TV Walker Twin support by Nick Andrew <nick@nick-andrew.net>
+ *
+ * LifeView TV Walker Twin has 1 x M9206, 2 x TDA10046, 2 x TDA8275A
+ * TDA10046 #0 is located at i2c address 0x08
+ * TDA10046 #1 is located at i2c address 0x0b (presently disabled - not yet working)
+ * TDA8275A #0 is located at i2c address 0x60
+ * TDA8275A #1 is located at i2c address 0x61 (presently disabled - not yet working)
+ */
+static struct dvb_usb_device_properties tvwalkertwin_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-tvwalkert.fw",
+        .download_firmware = m920x_firmware_download,
+
+        .rc_interval      = 100,
+        .rc_key_map       = tvwalkertwin_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(tvwalkertwin_rc_keys),
+        .rc_query         = m920x_rc_query,
+
+        .size_of_priv     = sizeof(struct m920x_state),
+
+        .identify_state   = m920x_identify_state,
+        .num_adapters = 1,
+        .adapter = {{
+                .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
+                .pid_filter_count = 8,
+                .pid_filter       = m920x_pid_filter,
+                .pid_filter_ctrl  = m920x_pid_filter_ctrl,
+
+                .frontend_attach  = m920x_tda10046_08_frontend_attach,
+                .tuner_attach     = m920x_tda8275_60_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 8,
+                        .endpoint = 0x81,
+                        .u = {
+                                 .bulk = {
+                                         .buffersize = 512,
+                                 }
+                        }
+                }},{
+                .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
+                .pid_filter_count = 8,
+                .pid_filter       = m920x_pid_filter,
+                .pid_filter_ctrl  = m920x_pid_filter_ctrl,
+
+                .frontend_attach  = m920x_tda10046_0b_frontend_attach,
+                .tuner_attach     = m920x_tda8275_61_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 8,
+                        .endpoint = 0x82,
+                        .u = {
+                                 .bulk = {
+                                         .buffersize = 512,
+                                 }
+                        }
+                },
+        }},
+        .i2c_algo         = &m920x_i2c_algo,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   .name = "LifeView TV Walker Twin DVB-T USB2.0",
+                    .cold_ids = { &m920x_table[2], NULL },
+                    .warm_ids = { &m920x_table[3], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_device_properties dposh_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-dposh-01.fw",
+        .download_firmware = m920x_firmware_download,
+
+        .size_of_priv     = sizeof(struct m920x_state),
+
+        .identify_state   = m920x_identify_state,
+        .num_adapters = 1,
+        .adapter = {{
+                /* Hardware pid filters don't work with this device/firmware */
+
+                .frontend_attach  = m920x_mt352_frontend_attach,
+                .tuner_attach     = m920x_qt1010_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 8,
+                        .endpoint = 0x81,
+                        .u = {
+                                 .bulk = {
+                                         .buffersize = 512,
+                                 }
+                        }
+                },
+        }},
+        .i2c_algo         = &m920x_i2c_algo,
+
+        .num_device_descs = 1,
+        .devices = {
+                 {   .name = "Dposh DVB-T USB2.0",
+                     .cold_ids = { &m920x_table[4], NULL },
+                     .warm_ids = { &m920x_table[5], NULL },
+                 },
+         }
+};
+
 static struct usb_driver m920x_driver = {
         .name           = "dvb_usb_m920x",
         .probe          = m920x_probe,
@@ -615,6 +879,11 @@ module_init (m920x_module_init);
 module_exit (m920x_module_exit);
 
 MODULE_AUTHOR("Aapo Tahkola <aet@rasterburn.org>");
-MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / Uli m920x");
+MODULE_DESCRIPTION("DVB Driver for ULI M920x");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ */
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/dvb/dvb-usb/m920x.h
index 7dd3db65c80e..2c8942d04222 100644
--- a/drivers/media/dvb/dvb-usb/m920x.h
+++ b/drivers/media/dvb/dvb-usb/m920x.h
@@ -4,7 +4,7 @@
 #define DVB_USB_LOG_PREFIX "m920x"
 #include "dvb-usb.h"
 
-#define deb_rc(args...)   dprintk(dvb_usb_m920x_debug,0x01,args)
+#define deb(args...)   dprintk(dvb_usb_m920x_debug,0x01,args)
 
 #define M9206_CORE      0x22
 #define M9206_RC_STATE  0xff51
@@ -59,9 +59,18 @@ What any other bits might mean, or how to get the slave's ACK/NACK
 response to a write, is unknown.
 */
 
-struct m9206_state {
+struct m920x_state {
         u16 filters[M9206_MAX_FILTERS];
         int filtering_enabled;
         int rep_count;
 };
+
+/* Initialisation data for the m920x
+ */
+
+struct m920x_inits {
+        u16 address;
+        u8  data;
+};
+
 #endif
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index 3ecb2e0ce80f..c3fdc7cd094e 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -204,8 +204,8 @@ static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
 static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
                                     struct dvb_diseqc_master_cmd *m)
 {
-        //struct vp702x_fe_state *st = fe->demodulator_priv;
-        u8 cmd[8];//,ibuf[10];
+        struct vp702x_fe_state *st = fe->demodulator_priv;
+        u8 cmd[8],ibuf[10];
         memset(cmd,0,8);
 
         deb_fe("%s\n",__FUNCTION__);
@@ -218,12 +218,12 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
         memcpy(&cmd[3], m->msg, m->msg_len);
         cmd[7] = vp702x_chksum(cmd,0,7);
 
-//      vp702x_usb_inout_op(st->d,cmd,8,ibuf,10,100);
+        vp702x_usb_inout_op(st->d,cmd,8,ibuf,10,100);
 
-//      if (ibuf[2] == 0 && ibuf[3] == 0)
-//              deb_fe("diseqc cmd failed.\n");
-//      else
-//              deb_fe("diseqc cmd succeeded.\n");
+        if (ibuf[2] == 0 && ibuf[3] == 0)
+                deb_fe("diseqc cmd failed.\n");
+        else
+                deb_fe("diseqc cmd succeeded.\n");
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
index f5d40aa3d27f..f64546c6aeb5 100644
--- a/drivers/media/dvb/frontends/dib7000m.c
+++ b/drivers/media/dvb/frontends/dib7000m.c
@@ -266,7 +266,7 @@ static int dib7000m_sad_calib(struct dib7000m_state *state)
 {
 
 /* internal */
-//      dib7000m_write_word(state, 928, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth
+//      dib7000m_write_word(state, 928, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is written in set_bandwidth
         dib7000m_write_word(state, 929, (0 << 1) | (0 << 0));
         dib7000m_write_word(state, 930, 776); // 0.625*3.3 / 4096
 
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 0349a4b5da3f..aece458cfe12 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -223,7 +223,7 @@ static int dib7000p_set_bandwidth(struct dvb_frontend *demod, u8 BW_Idx)
 static int dib7000p_sad_calib(struct dib7000p_state *state)
 {
 /* internal */
-//      dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth
+//      dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is written in set_bandwidth
         dib7000p_write_word(state, 73, (0 << 1) | (0 << 0));
         dib7000p_write_word(state, 74, 776); // 0.625*3.3 / 4096
 
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 110536843e8e..e725f612a6b7 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -1,6 +1,6 @@
 /*
     TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+               used on the Siemens DVB-C cards
 
     Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
     Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index 54d7b07571b8..23fd0303c91b 100644
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -306,7 +306,7 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
          * The ves1893 sometimes returns sync values that make no sense,
          * because, e.g., the SIGNAL bit is 0, while some of the higher
          * bits are 1 (and how can there be a CARRIER w/o a SIGNAL?).
-         * Tests showed that the the VITERBI and SYNC bits are returned
+         * Tests showed that the VITERBI and SYNC bits are returned
          * reliably, while the SIGNAL and CARRIER bits ar sometimes wrong.
          * If such a case occurs, we read the value again, until we get a
          * valid value.
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 058df5c10034..08a2599ed74a 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -293,12 +293,20 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets)
          *     but no packets have been transfered.
          * [2] Sometimes (actually very often) NBPACKETS stays at zero
          *     although one packet has been transfered.
+         * [3] Sometimes (actually rarely), the card gets into an erroneous
+         *     mode where it continuously generates interrupts, claiming it
+         *     has recieved nbpackets>TS_DMA_PACKETS packets, but no packet
+         *     has been transfered. Only a reset seems to solve this
          */
         if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) {
                 unsigned int i = 0;
                 while (pluto->dma_buf[i] == 0x47)
                         i += 188;
                 nbpackets = i / 188;
+                if (i == 0) {
+                        pluto_reset_ts(pluto, 1);
+                        dev_printk(KERN_DEBUG, &pluto->pdev->dev, "resetting TS because of invalid packet counter\n");
+                }
         }
 
         dvb_dmx_swfilter_packets(&pluto->demux, pluto->dma_buf, nbpackets);
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 67becdd4db60..ef1108c0bf11 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1246,6 +1246,9 @@ static void vpeirq(unsigned long data)
         if (!budget->feeding1 || (newdma == olddma))
                 return;
 
+        /* Ensure streamed PCI data is synced to CPU */
+        pci_dma_sync_sg_for_cpu(budget->dev->pci, budget->pt.slist, budget->pt.nents, PCI_DMA_FROMDEVICE);
+
 #if 0
         /* track rps1 activity */
         printk("vpeirq: %02x Event Counter 1 0x%04x\n",
@@ -2679,8 +2682,8 @@ err_iobuf_vfree_6:
 err_pci_free_5:
         pci_free_consistent(pdev, 8192, av7110->debi_virt, av7110->debi_bus);
 err_saa71466_vfree_4:
-        if (!av7110->grabbing)
-                saa7146_pgtable_free(pdev, &av7110->pt);
+        if (av7110->grabbing)
+                saa7146_vfree_destroy_pgtable(pdev, av7110->grabbing, &av7110->pt);
 err_i2c_del_3:
         i2c_del_adapter(&av7110->i2c_adap);
 err_dvb_unregister_adapter_2:
@@ -2710,7 +2713,7 @@ static int __devexit av7110_detach(struct saa7146_dev* saa)
                 SAA7146_ISR_CLEAR(saa, MASK_10);
                 msleep(50);
                 tasklet_kill(&av7110->vpe_tasklet);
-                saa7146_pgtable_free(saa->pci, &av7110->pt);
+                saa7146_vfree_destroy_pgtable(saa->pci, av7110->grabbing, &av7110->pt);
         }
         av7110_exit_v4l(av7110);
 
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 654c9e919e04..58678c05aa53 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -32,7 +32,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
 #include <linux/fs.h>
 
 #include "av7110.h"
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index e9b4e88e7932..e1c1294bb767 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -34,7 +34,6 @@
 #include <linux/fs.h>
 #include <linux/timer.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 
 #include "av7110.h"
 #include "av7110_hw.h"
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 4d7150e15d1e..70aee4eb5da4 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -33,7 +33,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
 #include <linux/fs.h>
 
 #include "av7110.h"
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index cde5d3ae7ec7..fcd9994058d0 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -31,7 +31,6 @@
 #include <linux/fs.h>
 #include <linux/timer.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 
 #include "av7110.h"
 #include "av7110_hw.h"
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 4ed4599ce816..9d42f88ebb0e 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -904,7 +904,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
                 band = 1;
         } else if (tuner_frequency < 200000000) {
                 cp = 6;
-                band = 2;
+                band = 1;
         } else if (tuner_frequency < 290000000) {
                 cp = 3;
                 band = 2;
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 6b97dc1e6b65..2557ac9620d0 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -195,6 +195,9 @@ static void vpeirq(unsigned long data)
         u32 newdma = saa7146_read(budget->dev, PCI_VDP3);
         u32 count;
 
+        /* Ensure streamed PCI data is synced to CPU */
+        pci_dma_sync_sg_for_cpu(budget->dev->pci, budget->pt.slist, budget->pt.nents, PCI_DMA_FROMDEVICE);
+
         /* nearest lower position divisible by 188 */
         newdma -= newdma % 188;
 
@@ -504,16 +507,16 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         strcpy(budget->i2c_adap.name, budget->card->name);
 
         if (i2c_add_adapter(&budget->i2c_adap) < 0) {
-                dvb_unregister_adapter(&budget->dvb_adapter);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err_dvb_unregister;
         }
 
         ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter.proposed_mac);
 
-        if (NULL ==
-            (budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, budget->buffer_size, &budget->pt))) {
+        budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, budget->buffer_size, &budget->pt);
+        if (NULL == budget->grabbing) {
                 ret = -ENOMEM;
-                goto err;
+                goto err_del_i2c;
         }
 
         saa7146_write(dev, PCI_BT_V1, 0x001c0000);
@@ -526,14 +529,16 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         if (bi->type != BUDGET_FS_ACTIVY)
                 saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI);
 
-        if (budget_register(budget) == 0) {
-                return 0;
-        }
-err:
-        i2c_del_adapter(&budget->i2c_adap);
+        if (budget_register(budget) == 0)
+                return 0; /* Everything OK */
+
+        /* An error occurred, cleanup resources */
+        saa7146_vfree_destroy_pgtable(dev->pci, budget->grabbing, &budget->pt);
 
-        vfree(budget->grabbing);
+err_del_i2c:
+        i2c_del_adapter(&budget->i2c_adap);
 
+err_dvb_unregister:
         dvb_unregister_adapter(&budget->dvb_adapter);
 
         return ret;
@@ -555,15 +560,13 @@ int ttpci_budget_deinit(struct budget *budget)
 
         budget_unregister(budget);
 
-        i2c_del_adapter(&budget->i2c_adap);
-
-        dvb_unregister_adapter(&budget->dvb_adapter);
-
         tasklet_kill(&budget->vpe_tasklet);
 
-        saa7146_pgtable_free(dev->pci, &budget->pt);
+        saa7146_vfree_destroy_pgtable(dev->pci, budget->grabbing, &budget->pt);
 
-        vfree(budget->grabbing);
+        i2c_del_adapter(&budget->i2c_adap);
+
+        dvb_unregister_adapter(&budget->dvb_adapter);
 
         return 0;
 }
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index af66a5d5ecd8..a6ac82a609d4 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -2,8 +2,14 @@
 # Multimedia Video device configuration
 #
 
-menu "Radio Adapters"
+menuconfig RADIO_ADAPTERS
+        bool "Radio Adapters"
         depends on VIDEO_DEV
+        default y
+        ---help---
+          Say Y here to enable selecting AM/FM radio adapters.
+
+if RADIO_ADAPTERS
 
 config RADIO_CADET
         tristate "ADS Cadet AM/FM Tuner"
@@ -328,4 +334,5 @@ config USB_DSBR
 
           To compile this driver as a module, choose M here: the
           module will be called dsbr100.
-endmenu
+
+endif # RADIO_ADAPTERS
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index df8d0520d1d1..3bd07f7e3774 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -33,6 +33,10 @@
 
  History:
 
+ Version 0.42:
+        Converted dsbr100 to use video_ioctl2
+        by Douglas Landgraf <dougsland@gmail.com>
+
  Version 0.41-ac1:
         Alan Cox: Some cleanups and fixes
 
@@ -79,7 +83,6 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 
 /*
  * Version Information
@@ -122,8 +125,6 @@ devices, that would be 76 and 91.  */
 static int usb_dsbr100_probe(struct usb_interface *intf,
                              const struct usb_device_id *id);
 static void usb_dsbr100_disconnect(struct usb_interface *intf);
-static int usb_dsbr100_ioctl(struct inode *inode, struct file *file,
-                             unsigned int cmd, unsigned long arg);
 static int usb_dsbr100_open(struct inode *inode, struct file *file);
 static int usb_dsbr100_close(struct inode *inode, struct file *file);
 
@@ -143,26 +144,6 @@ struct dsbr100_device {
 };
 
 
-/* File system interface */
-static const struct file_operations usb_dsbr100_fops = {
-        .owner =        THIS_MODULE,
-        .open =         usb_dsbr100_open,
-        .release =      usb_dsbr100_close,
-        .ioctl =        usb_dsbr100_ioctl,
-        .compat_ioctl = v4l_compat_ioctl32,
-        .llseek =       no_llseek,
-};
-
-/* V4L interface */
-static struct video_device dsbr100_videodev_template=
-{
-        .owner =        THIS_MODULE,
-        .name =         "D-Link DSB-R 100",
-        .type =         VID_TYPE_TUNER,
-        .fops =         &usb_dsbr100_fops,
-        .release = video_device_release,
-};
-
 static struct usb_device_id usb_dsbr100_device_table [] = {
         { USB_DEVICE(DSB100_VENDOR, DSB100_PRODUCT) },
         { }                                             /* Terminating entry */
@@ -253,37 +234,6 @@ static void dsbr100_getstat(struct dsbr100_device *radio)
 
 /* USB subsystem interface begins here */
 
-/* check if the device is present and register with v4l and
-usb if it is */
-static int usb_dsbr100_probe(struct usb_interface *intf,
-                         const struct usb_device_id *id)
-{
-        struct dsbr100_device *radio;
-
-        if (!(radio = kmalloc(sizeof(struct dsbr100_device), GFP_KERNEL)))
-                return -ENOMEM;
-        if (!(radio->videodev = video_device_alloc())) {
-                kfree(radio);
-                return -ENOMEM;
-        }
-        memcpy(radio->videodev, &dsbr100_videodev_template,
-                sizeof(dsbr100_videodev_template));
-        radio->removed = 0;
-        radio->users = 0;
-        radio->usbdev = interface_to_usbdev(intf);
-        radio->curfreq = FREQ_MIN*FREQ_MUL;
-        video_set_drvdata(radio->videodev, radio);
-        if (video_register_device(radio->videodev, VFL_TYPE_RADIO,
-                radio_nr)) {
-                warn("Could not register video device");
-                video_device_release(radio->videodev);
-                kfree(radio);
-                return -EIO;
-        }
-        usb_set_intfdata(intf, radio);
-        return 0;
-}
-
 /* handle unplugging of the device, release data structures
 if nothing keeps us from doing it.  If something is still
 keeping us busy, the release callback of v4l will take care
@@ -308,133 +258,147 @@ static void usb_dsbr100_disconnect(struct usb_interface *intf)
 }
 
 
-/* Video for Linux interface */
+static int vidioc_querycap(struct file *file, void *priv,
+                                        struct v4l2_capability *v)
+{
+        strlcpy(v->driver, "dsbr100", sizeof(v->driver));
+        strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card));
+        sprintf(v->bus_info, "ISA");
+        v->version = RADIO_VERSION;
+        v->capabilities = V4L2_CAP_TUNER;
+        return 0;
+}
 
-static int usb_dsbr100_do_ioctl(struct inode *inode, struct file *file,
-                                unsigned int cmd, void *arg)
+static int vidioc_g_tuner(struct file *file, void *priv,
+                                struct v4l2_tuner *v)
 {
-        struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+
+        if (v->index > 0)
+                return -EINVAL;
+
+        dsbr100_getstat(radio);
+        strcpy(v->name, "FM");
+        v->type = V4L2_TUNER_RADIO;
+        v->rangelow = FREQ_MIN*FREQ_MUL;
+        v->rangehigh = FREQ_MAX*FREQ_MUL;
+        v->rxsubchans = V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
+        v->capability = V4L2_TUNER_CAP_LOW;
+        if(radio->stereo)
+                v->audmode = V4L2_TUNER_MODE_STEREO;
+        else
+                v->audmode = V4L2_TUNER_MODE_MONO;
+        v->signal = 0xffff;     /* We can't get the signal strength */
+        return 0;
+}
 
-        if (!radio)
-                return -EIO;
+static int vidioc_s_tuner(struct file *file, void *priv,
+                                struct v4l2_tuner *v)
+{
+        if (v->index > 0)
+                return -EINVAL;
 
-        switch(cmd) {
-                case VIDIOC_QUERYCAP:
-                {
-                        struct v4l2_capability *v = arg;
-                        memset(v,0,sizeof(*v));
-                        strlcpy(v->driver, "dsbr100", sizeof (v->driver));
-                        strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof (v->card));
-                        sprintf(v->bus_info,"ISA");
-                        v->version = RADIO_VERSION;
-                        v->capabilities = V4L2_CAP_TUNER;
+        return 0;
+}
 
-                        return 0;
-                }
-                case VIDIOC_G_TUNER:
-                {
-                        struct v4l2_tuner *v = arg;
+static int vidioc_s_frequency(struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
 
-                        if (v->index > 0)
-                                return -EINVAL;
+        radio->curfreq = f->frequency;
+        if (dsbr100_setfreq(radio, radio->curfreq)==-1)
+                warn("Set frequency failed");
+        return 0;
+}
 
-                        dsbr100_getstat(radio);
+static int vidioc_g_frequency(struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
 
-                        memset(v,0,sizeof(*v));
-                        strcpy(v->name, "FM");
-                        v->type = V4L2_TUNER_RADIO;
+        f->type = V4L2_TUNER_RADIO;
+        f->frequency = radio->curfreq;
+        return 0;
+}
 
-                        v->rangelow = FREQ_MIN*FREQ_MUL;
-                        v->rangehigh = FREQ_MAX*FREQ_MUL;
-                        v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
-                        v->capability=V4L2_TUNER_CAP_LOW;
-                        if(radio->stereo)
-                                v->audmode = V4L2_TUNER_MODE_STEREO;
-                        else
-                                v->audmode = V4L2_TUNER_MODE_MONO;
-                        v->signal = 0xFFFF;     /* We can't get the signal strength */
+static int vidioc_queryctrl(struct file *file, void *priv,
+                                struct v4l2_queryctrl *qc)
+{
+        int i;
 
+        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
+                if (qc->id && qc->id == radio_qctrl[i].id) {
+                        memcpy(qc, &(radio_qctrl[i]),
+                                                sizeof(*qc));
                         return 0;
                 }
-                case VIDIOC_S_TUNER:
-                {
-                        struct v4l2_tuner *v = arg;
-
-                        if (v->index > 0)
-                                return -EINVAL;
+        }
+        return -EINVAL;
+}
 
-                        return 0;
-                }
-                case VIDIOC_S_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
 
-                        radio->curfreq = f->frequency;
-                        if (dsbr100_setfreq(radio, radio->curfreq)==-1)
-                                warn("Set frequency failed");
-                        return 0;
-                }
-                case VIDIOC_G_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                ctrl->value = radio->muted;
+                return 0;
+        }
+        return -EINVAL;
+}
 
-                        f->type = V4L2_TUNER_RADIO;
-                        f->frequency = radio->curfreq;
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
 
-                        return 0;
-                }
-                case VIDIOC_QUERYCTRL:
-                {
-                        struct v4l2_queryctrl *qc = arg;
-                        int i;
-
-                        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
-                                if (qc->id && qc->id == radio_qctrl[i].id) {
-                                        memcpy(qc, &(radio_qctrl[i]),
-                                                                sizeof(*qc));
-                                        return 0;
-                                }
-                        }
-                        return -EINVAL;
-                }
-                case VIDIOC_G_CTRL:
-                {
-                        struct v4l2_control *ctrl= arg;
-
-                        switch (ctrl->id) {
-                        case V4L2_CID_AUDIO_MUTE:
-                                ctrl->value=radio->muted;
-                                return 0;
-                        }
-                        return -EINVAL;
-                }
-                case VIDIOC_S_CTRL:
-                {
-                        struct v4l2_control *ctrl= arg;
-
-                        switch (ctrl->id) {
-                        case V4L2_CID_AUDIO_MUTE:
-                                if (ctrl->value) {
-                                        if (dsbr100_stop(radio)==-1)
-                                                warn("Radio did not respond properly");
-                                } else {
-                                        if (dsbr100_start(radio)==-1)
-                                                warn("Radio did not respond properly");
-                                }
-                                return 0;
-                        }
-                        return -EINVAL;
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                if (ctrl->value) {
+                        if (dsbr100_stop(radio)==-1)
+                                warn("Radio did not respond properly");
+                } else {
+                        if (dsbr100_start(radio)==-1)
+                                warn("Radio did not respond properly");
                 }
-                default:
-                        return v4l_compat_translate_ioctl(inode,file,cmd,arg,
-                                                          usb_dsbr100_do_ioctl);
+                return 0;
         }
+        return -EINVAL;
 }
 
-static int usb_dsbr100_ioctl(struct inode *inode, struct file *file,
-                             unsigned int cmd, unsigned long arg)
+static int vidioc_g_audio(struct file *file, void *priv,
+                                struct v4l2_audio *a)
 {
-        return video_usercopy(inode, file, cmd, arg, usb_dsbr100_do_ioctl);
+        if (a->index > 1)
+                return -EINVAL;
+
+        strcpy(a->name, "Radio");
+        a->capability = V4L2_AUDCAP_STEREO;
+        return 0;
+}
+
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+        *i = 0;
+        return 0;
+}
+
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+        if (i != 0)
+                return -EINVAL;
+        return 0;
+}
+
+static int vidioc_s_audio(struct file *file, void *priv,
+                                        struct v4l2_audio *a)
+{
+        if (a->index != 0)
+                return -EINVAL;
+        return 0;
 }
 
 static int usb_dsbr100_open(struct inode *inode, struct file *file)
@@ -466,6 +430,68 @@ static int usb_dsbr100_close(struct inode *inode, struct file *file)
         return 0;
 }
 
+/* File system interface */
+static const struct file_operations usb_dsbr100_fops = {
+        .owner          = THIS_MODULE,
+        .open           = usb_dsbr100_open,
+        .release        = usb_dsbr100_close,
+        .ioctl          = video_ioctl2,
+        .compat_ioctl   = v4l_compat_ioctl32,
+        .llseek         = no_llseek,
+};
+
+/* V4L2 interface */
+static struct video_device dsbr100_videodev_template =
+{
+        .owner          = THIS_MODULE,
+        .name           = "D-Link DSB-R 100",
+        .type           = VID_TYPE_TUNER,
+        .fops           = &usb_dsbr100_fops,
+        .release        = video_device_release,
+        .vidioc_querycap    = vidioc_querycap,
+        .vidioc_g_tuner     = vidioc_g_tuner,
+        .vidioc_s_tuner     = vidioc_s_tuner,
+        .vidioc_g_frequency = vidioc_g_frequency,
+        .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_queryctrl   = vidioc_queryctrl,
+        .vidioc_g_ctrl      = vidioc_g_ctrl,
+        .vidioc_s_ctrl      = vidioc_s_ctrl,
+        .vidioc_g_audio     = vidioc_g_audio,
+        .vidioc_s_audio     = vidioc_s_audio,
+        .vidioc_g_input     = vidioc_g_input,
+        .vidioc_s_input     = vidioc_s_input,
+};
+
+/* check if the device is present and register with v4l and
+usb if it is */
+static int usb_dsbr100_probe(struct usb_interface *intf,
+                                const struct usb_device_id *id)
+{
+        struct dsbr100_device *radio;
+
+        if (!(radio = kmalloc(sizeof(struct dsbr100_device), GFP_KERNEL)))
+                return -ENOMEM;
+        if (!(radio->videodev = video_device_alloc())) {
+                kfree(radio);
+                return -ENOMEM;
+        }
+        memcpy(radio->videodev, &dsbr100_videodev_template,
+                sizeof(dsbr100_videodev_template));
+        radio->removed = 0;
+        radio->users = 0;
+        radio->usbdev = interface_to_usbdev(intf);
+        radio->curfreq = FREQ_MIN*FREQ_MUL;
+        video_set_drvdata(radio->videodev, radio);
+        if (video_register_device(radio->videodev, VFL_TYPE_RADIO,radio_nr)) {
+                warn("Could not register video device");
+                video_device_release(radio->videodev);
+                kfree(radio);
+                return -EIO;
+        }
+        usb_set_intfdata(intf, radio);
+        return 0;
+}
+
 static int __init dsbr100_init(void)
 {
         int retval = usb_register(&usb_dsbr100_driver);
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 8fbf0d8bd278..8cf2e9df5c8a 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -48,6 +48,25 @@
 
 #define CADET_VERSION KERNEL_VERSION(0,3,3)
 
+static struct v4l2_queryctrl radio_qctrl[] = {
+        {
+                .id            = V4L2_CID_AUDIO_MUTE,
+                .name          = "Mute",
+                .minimum       = 0,
+                .maximum       = 1,
+                .default_value = 1,
+                .type          = V4L2_CTRL_TYPE_BOOLEAN,
+        },{
+                .id            = V4L2_CID_AUDIO_VOLUME,
+                .name          = "Volume",
+                .minimum       = 0,
+                .maximum       = 0xff,
+                .step          = 1,
+                .default_value = 0xff,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+        }
+};
+
 static int io=-1;               /* default to isapnp activation */
 static int radio_nr = -1;
 static int users=0;
@@ -347,135 +366,165 @@ cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 }
 
 
+static int vidioc_querycap(struct file *file, void *priv,
+                                struct v4l2_capability *v)
+{
+        v->capabilities =
+                V4L2_CAP_TUNER |
+                V4L2_CAP_READWRITE;
+        v->version = CADET_VERSION;
+        strcpy(v->driver, "ADS Cadet");
+        strcpy(v->card, "ADS Cadet");
+        return 0;
+}
 
-static int cadet_do_ioctl(struct inode *inode, struct file *file,
-                          unsigned int cmd, void *arg)
+static int vidioc_g_tuner(struct file *file, void *priv,
+                                struct v4l2_tuner *v)
 {
-        switch(cmd)
-        {
-                case VIDIOC_QUERYCAP:
-                {
-                        struct v4l2_capability *cap = arg;
-                        memset(cap,0,sizeof(*cap));
-                        cap->capabilities =
-                                V4L2_CAP_TUNER |
-                                V4L2_CAP_READWRITE;
-                        cap->version = CADET_VERSION;
-                        strcpy(cap->driver, "ADS Cadet");
-                        strcpy(cap->card, "ADS Cadet");
-                        return 0;
+        v->type = V4L2_TUNER_RADIO;
+        switch (v->index) {
+        case 0:
+                strcpy(v->name, "FM");
+                v->capability = V4L2_TUNER_CAP_STEREO;
+                v->rangelow = 1400;     /* 87.5 MHz */
+                v->rangehigh = 1728;    /* 108.0 MHz */
+                v->rxsubchans=cadet_getstereo();
+                switch (v->rxsubchans){
+                case V4L2_TUNER_SUB_MONO:
+                        v->audmode = V4L2_TUNER_MODE_MONO;
+                        break;
+                case V4L2_TUNER_SUB_STEREO:
+                        v->audmode = V4L2_TUNER_MODE_STEREO;
+                        break;
+                default: ;
                 }
-                case VIDIOC_G_TUNER:
-                {
-                        struct v4l2_tuner *t = arg;
-                        memset(t,0,sizeof(*t));
-                        t->type = V4L2_TUNER_RADIO;
-                        switch (t->index)
-                        {
-                                case 0: strcpy(t->name, "FM");
-                                        t->capability = V4L2_TUNER_CAP_STEREO;
-                                        t->rangelow = 1400;     /* 87.5 MHz */
-                                        t->rangehigh = 1728;    /* 108.0 MHz */
-                                        t->rxsubchans=cadet_getstereo();
-                                        switch (t->rxsubchans){
-                                                case V4L2_TUNER_SUB_MONO:
-                                                        t->audmode = V4L2_TUNER_MODE_MONO;
-                                                        break;
-                                                case V4L2_TUNER_SUB_STEREO:
-                                                        t->audmode = V4L2_TUNER_MODE_STEREO;
-                                                        break;
-                                                default: ;
-                                        }
-                                        break;
-                                case 1: strcpy(t->name, "AM");
-                                        t->capability = V4L2_TUNER_CAP_LOW;
-                                        t->rangelow = 8320;      /* 520 kHz */
-                                        t->rangehigh = 26400;    /* 1650 kHz */
-                                        t->rxsubchans = V4L2_TUNER_SUB_MONO;
-                                        t->audmode = V4L2_TUNER_MODE_MONO;
-                                        break;
-                                default:
-                                        return -EINVAL;
-                        }
+                break;
+        case 1:
+                strcpy(v->name, "AM");
+                v->capability = V4L2_TUNER_CAP_LOW;
+                v->rangelow = 8320;      /* 520 kHz */
+                v->rangehigh = 26400;    /* 1650 kHz */
+                v->rxsubchans = V4L2_TUNER_SUB_MONO;
+                v->audmode = V4L2_TUNER_MODE_MONO;
+                break;
+        default:
+                return -EINVAL;
+        }
+        v->signal = sigstrength; /* We might need to modify scaling of this */
+        return 0;
+}
 
-                        t->signal = sigstrength; /* We might need to modify scaling of this */
-                        return 0;
-                }
-                case VIDIOC_S_TUNER:
-                {
-                        struct v4l2_tuner *t = arg;
-                        if((t->index != 0)&&(t->index != 1))
-                                return -EINVAL;
+static int vidioc_s_tuner(struct file *file, void *priv,
+                                struct v4l2_tuner *v)
+{
+        if((v->index != 0)&&(v->index != 1))
+                return -EINVAL;
+        curtuner = v->index;
+        return 0;
+}
 
-                        curtuner = t->index;
-                        return 0;
-                }
-                case VIDIOC_G_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
-                        memset(f,0,sizeof(*f));
-                        f->tuner = curtuner;
-                        f->type = V4L2_TUNER_RADIO;
-                        f->frequency = cadet_getfreq();
-                        return 0;
-                }
-                case VIDIOC_S_FREQUENCY:
-                {
-                        struct v4l2_frequency *f = arg;
-                        if (f->type != V4L2_TUNER_RADIO){
-                                return -EINVAL;
-                        }
-                        if((curtuner==0)&&((f->frequency<1400)||(f->frequency>1728))) {
-                                return -EINVAL;
-                        }
-                        if((curtuner==1)&&((f->frequency<8320)||(f->frequency>26400))) {
-                                return -EINVAL;
-                        }
-                        cadet_setfreq(f->frequency);
-                        return 0;
-                }
-                case VIDIOC_G_CTRL:
-                {
-                        struct v4l2_control *c = arg;
-                        switch (c->id){
-                                case V4L2_CID_AUDIO_MUTE: /* TODO: Handle this correctly */
-                                        c->value = (cadet_getvol() == 0);
-                                        break;
-                                case V4L2_CID_AUDIO_VOLUME:
-                                        c->value = cadet_getvol();
-                                        break;
-                                default:
-                                        return -EINVAL;
-                        }
-                        return 0;
-                }
-                case VIDIOC_S_CTRL:
-                {
-                        struct v4l2_control *c = arg;
-                        switch (c->id){
-                                case V4L2_CID_AUDIO_MUTE: /* TODO: Handle this correctly */
-                                        if (c->value) cadet_setvol(0);
-                                                else cadet_setvol(0xffff);
-                                        break;
-                                case V4L2_CID_AUDIO_VOLUME:
-                                        cadet_setvol(c->value);
-                                        break;
-                                default:
-                                        return -EINVAL;
-                        }
+static int vidioc_g_frequency(struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        f->tuner = curtuner;
+        f->type = V4L2_TUNER_RADIO;
+        f->frequency = cadet_getfreq();
+        return 0;
+}
+
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        if (f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
+        if((curtuner==0)&&((f->frequency<1400)||(f->frequency>1728)))
+                return -EINVAL;
+        if((curtuner==1)&&((f->frequency<8320)||(f->frequency>26400)))
+                return -EINVAL;
+        cadet_setfreq(f->frequency);
+        return 0;
+}
+
+static int vidioc_queryctrl(struct file *file, void *priv,
+                                struct v4l2_queryctrl *qc)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
+                if (qc->id && qc->id == radio_qctrl[i].id) {
+                        memcpy(qc, &(radio_qctrl[i]),
+                                                sizeof(*qc));
                         return 0;
                 }
+        }
+        return -EINVAL;
+}
 
-                default:
-                        return -ENOIOCTLCMD;
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        switch (ctrl->id){
+        case V4L2_CID_AUDIO_MUTE: /* TODO: Handle this correctly */
+                ctrl->value = (cadet_getvol() == 0);
+                break;
+        case V4L2_CID_AUDIO_VOLUME:
+                ctrl->value = cadet_getvol();
+                break;
+        default:
+                return -EINVAL;
         }
+        return 0;
 }
 
-static int
-cadet_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
 {
-        return video_usercopy(inode, file, cmd, arg, cadet_do_ioctl);
+        switch (ctrl->id){
+        case V4L2_CID_AUDIO_MUTE: /* TODO: Handle this correctly */
+                if (ctrl->value)
+                        cadet_setvol(0);
+                else
+                        cadet_setvol(0xffff);
+                break;
+        case V4L2_CID_AUDIO_VOLUME:
+                cadet_setvol(ctrl->value);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int vidioc_g_audio(struct file *file, void *priv,
+                                struct v4l2_audio *a)
+{
+        if (a->index > 1)
+                return -EINVAL;
+        strcpy(a->name, "Radio");
+        a->capability = V4L2_AUDCAP_STEREO;
+        return 0;
+}
+
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+        *i = 0;
+        return 0;
+}
+
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+        if (i != 0)
+                return -EINVAL;
+        return 0;
+}
+
+static int vidioc_s_audio(struct file *file, void *priv,
+                                struct v4l2_audio *a)
+{
+        if (a->index != 0)
+                return -EINVAL;
+        return 0;
 }
 
 static int
@@ -512,7 +561,7 @@ static const struct file_operations cadet_fops = {
         .open           = cadet_open,
         .release        = cadet_release,
         .read           = cadet_read,
-        .ioctl          = cadet_ioctl,
+        .ioctl          = video_ioctl2,
         .poll           = cadet_poll,
         .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
@@ -524,6 +573,18 @@ static struct video_device cadet_radio=
         .name           = "Cadet radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &cadet_fops,
+        .vidioc_querycap    = vidioc_querycap,
+        .vidioc_g_tuner     = vidioc_g_tuner,
+        .vidioc_s_tuner     = vidioc_s_tuner,
+        .vidioc_g_frequency = vidioc_g_frequency,
+        .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_queryctrl   = vidioc_queryctrl,
+        .vidioc_g_ctrl      = vidioc_g_ctrl,
+        .vidioc_s_ctrl      = vidioc_s_ctrl,
+        .vidioc_g_audio     = vidioc_g_audio,
+        .vidioc_s_audio     = vidioc_s_audio,
+        .vidioc_g_input     = vidioc_g_input,
+        .vidioc_s_input     = vidioc_s_input,
 };
 
 static struct pnp_device_id cadet_pnp_devices[] = {
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 11f80cacd6ed..8e33a19a22a3 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -24,7 +24,6 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <linux/mutex.h>
 #include <linux/pci.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
@@ -110,7 +109,6 @@ struct radio_device {
                 muted,  /* VIDEO_AUDIO_MUTE */
                 stereo, /* VIDEO_TUNER_STEREO_ON */
                 tuned;  /* signal strength (0 or 0xffff) */
-        struct mutex lock;
 };
 
 static u32 radio_bits_get(struct radio_device *dev)
@@ -394,7 +392,6 @@ static int __devinit maestro_probe(struct pci_dev *pdev,
         }
 
         radio_unit->io = pci_resource_start(pdev, 0) + GPIO_DATA;
-        mutex_init(&radio_unit->lock);
 
         maestro_radio_inst = video_device_alloc();
         if (maestro_radio_inst == NULL) {
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index a4715901512d..203f4373eeb8 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -410,7 +410,6 @@ static struct video_device zoltrix_radio =
         .owner          = THIS_MODULE,
         .name           = "Zoltrix Radio Plus",
         .type           = VID_TYPE_TUNER,
-        .hardware       = 0,
         .fops           = &zoltrix_fops,
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bc773781993a..5cb3f54b548b 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -2,14 +2,19 @@
 # Multimedia Video device configuration
 #
 
-menu "Video Capture Adapters"
+menuconfig VIDEO_CAPTURE_DRIVERS
+        bool "Video capture adapters"
         depends on VIDEO_DEV
+        default y
+        ---help---
+          Say Y here to enable selecting the video adapters for
+          webcams, analog TV, and hybrid analog/digital TV.
+          Some of those devices also supports FM radio.
 
-comment "Video Capture Adapters"
+if VIDEO_CAPTURE_DRIVERS
 
 config VIDEO_ADV_DEBUG
         bool "Enable advanced debug functionality"
-        depends on VIDEO_DEV
         default n
         ---help---
           Say Y here to enable advanced debugging functionality on some
@@ -34,7 +39,7 @@ config VIDEO_HELPER_CHIPS_AUTO
 #
 
 menu "Encoders/decoders and other helper chips"
-        depends on VIDEO_DEV && !VIDEO_HELPER_CHIPS_AUTO
+        depends on !VIDEO_HELPER_CHIPS_AUTO
 
 comment "Audio decoders"
 
@@ -61,7 +66,7 @@ config VIDEO_TDA7432
 
 config VIDEO_TDA9840
         tristate "Philips TDA9840 audio processor"
-        depends on VIDEO_DEV && I2C
+        depends on I2C
         ---help---
           Support for tda9840 audio decoder chip found on some Zoran boards.
 
@@ -79,7 +84,7 @@ config VIDEO_TDA9875
 
 config VIDEO_TEA6415C
         tristate "Philips TEA6415C audio processor"
-        depends on VIDEO_DEV && I2C
+        depends on I2C
         ---help---
           Support for tea6415c audio decoder chip found on some bt8xx boards.
 
@@ -88,7 +93,7 @@ config VIDEO_TEA6415C
 
 config VIDEO_TEA6420
         tristate "Philips TEA6420 audio processor"
-        depends on VIDEO_DEV && I2C
+        depends on I2C
         ---help---
           Support for tea6420 audio decoder chip found on some bt8xx boards.
 
@@ -469,7 +474,7 @@ config VIDEO_SAA5246A
 
 config VIDEO_SAA5249
         tristate "SAA5249 Teletext processor"
-        depends on VIDEO_DEV && I2C && VIDEO_V4L2
+        depends on I2C && VIDEO_V4L2
         help
           Support for I2C bus based teletext using the SAA5249 chip. At the
           moment this is only useful on some European WinTV cards.
@@ -479,7 +484,7 @@ config VIDEO_SAA5249
 
 config TUNER_3036
         tristate "SAB3036 tuner"
-        depends on VIDEO_DEV && I2C && VIDEO_V4L1
+        depends on I2C && VIDEO_V4L1
         help
           Say Y here to include support for Philips SAB3036 compatible tuners.
           If in doubt, say N.
@@ -681,8 +686,12 @@ config VIDEO_CAFE_CCIC
 # USB Multimedia device configuration
 #
 
-menu "V4L USB devices"
-        depends on USB && VIDEO_DEV
+menuconfig V4L_USB_DRIVERS
+        bool "V4L USB devices"
+        depends on USB
+        default y
+
+if V4L_USB_DRIVERS
 
 source "drivers/media/video/pvrusb2/Kconfig"
 
@@ -707,7 +716,7 @@ config VIDEO_OVCAMCHIP
 
 config USB_W9968CF
         tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on USB && VIDEO_V4L1 && I2C
+        depends on VIDEO_V4L1 && I2C
         select VIDEO_OVCAMCHIP
         ---help---
           Say Y here if you want support for cameras based on OV681 or
@@ -725,7 +734,7 @@ config USB_W9968CF
 
 config USB_OV511
         tristate "USB OV511 Camera support"
-        depends on USB && VIDEO_V4L1
+        depends on VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. See <file:Documentation/video4linux/ov511.txt>
@@ -736,7 +745,7 @@ config USB_OV511
 
 config USB_SE401
         tristate "USB SE401 Camera support"
-        depends on USB && VIDEO_V4L1
+        depends on VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. See <file:Documentation/video4linux/se401.txt>
@@ -749,7 +758,7 @@ source "drivers/media/video/sn9c102/Kconfig"
 
 config USB_STV680
         tristate "USB STV680 (Pencam) Camera support"
-        depends on USB && VIDEO_V4L1
+        depends on VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. This includes the Pencam line of cameras.
@@ -765,7 +774,7 @@ source "drivers/media/video/pwc/Kconfig"
 
 config USB_ZR364XX
         tristate "USB ZR364XX Camera support"
-        depends on USB && VIDEO_V4L2
+        depends on VIDEO_V4L2
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port.
@@ -775,6 +784,6 @@ config USB_ZR364XX
           To compile this driver as a module, choose M here: the
           module will be called zr364xx.
 
-endmenu # V4L USB devices
+endif # V4L_USB_DRIVERS
 
-endmenu
+endif # VIDEO_CAPTURE_DRIVERS
diff --git a/drivers/media/video/cafe_ccic-regs.h b/drivers/media/video/cafe_ccic-regs.h
index b2c22a0d6643..8e2a87cdc791 100644
--- a/drivers/media/video/cafe_ccic-regs.h
+++ b/drivers/media/video/cafe_ccic-regs.h
@@ -150,6 +150,12 @@
 #define REG_GL_IMASK   0x300c  /* Interrupt mask register */
 #define   GIMSK_CCIC_EN          0x00000004    /* CCIC Interrupt enable */
 
+#define REG_GL_FCR      0x3038  /* GPIO functional control register */
+#define   GFCR_GPIO_ON    0x08          /* Camera GPIO enabled */
+#define REG_GL_GPIOR    0x315c  /* GPIO register */
+#define   GGPIO_OUT             0x80000 /* GPIO output */
+#define   GGPIO_VAL             0x00008 /* Output pin value */
+
 #define REG_LEN                REG_GL_IMASK + 4
 
 
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 96254dbaf625..c08f650df423 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -775,6 +775,12 @@ static void cafe_ctlr_power_up(struct cafe_camera *cam)
         spin_lock_irqsave(&cam->dev_lock, flags);
         cafe_reg_clear_bit(cam, REG_CTRL1, C1_PWRDWN);
         /*
+         * Part one of the sensor dance: turn the global
+         * GPIO signal on.
+         */
+        cafe_reg_write(cam, REG_GL_FCR, GFCR_GPIO_ON);
+        cafe_reg_write(cam, REG_GL_GPIOR, GGPIO_OUT|GGPIO_VAL);
+        /*
          * Put the sensor into operational mode (assumes OLPC-style
          * wiring).  Control 0 is reset - set to 1 to operate.
          * Control 1 is power down, set to 0 to operate.
@@ -784,6 +790,7 @@ static void cafe_ctlr_power_up(struct cafe_camera *cam)
         cafe_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C0);
 //      mdelay(1); /* Enough? */
         spin_unlock_irqrestore(&cam->dev_lock, flags);
+        msleep(5); /* Just to be sure */
 }
 
 static void cafe_ctlr_power_down(struct cafe_camera *cam)
@@ -792,6 +799,8 @@ static void cafe_ctlr_power_down(struct cafe_camera *cam)
 
         spin_lock_irqsave(&cam->dev_lock, flags);
         cafe_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C1);
+        cafe_reg_write(cam, REG_GL_FCR, GFCR_GPIO_ON);
+        cafe_reg_write(cam, REG_GL_GPIOR, GGPIO_OUT);
         cafe_reg_set_bit(cam, REG_CTRL1, C1_PWRDWN);
         spin_unlock_irqrestore(&cam->dev_lock, flags);
 }
@@ -851,6 +860,7 @@ static int cafe_cam_init(struct cafe_camera *cam)
         ret = 0;
         cam->state = S_IDLE;
   out:
+        cafe_ctlr_power_down(cam);
         mutex_unlock(&cam->s_mutex);
         return ret;
 }
@@ -2103,10 +2113,16 @@ static int cafe_pci_probe(struct pci_dev *pdev,
         ret = request_irq(pdev->irq, cafe_irq, IRQF_SHARED, "cafe-ccic", cam);
         if (ret)
                 goto out_iounmap;
+        /*
+         * Initialize the controller and leave it powered up.  It will
+         * stay that way until the sensor driver shows up.
+         */
         cafe_ctlr_init(cam);
         cafe_ctlr_power_up(cam);
         /*
-         * Set up I2C/SMBUS communications
+         * Set up I2C/SMBUS communications.  We have to drop the mutex here
+         * because the sensor could attach in this call chain, leading to
+         * unsightly deadlocks.
          */
         mutex_unlock(&cam->s_mutex);  /* attach can deadlock */
         ret = cafe_smbus_setup(cam);
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index 6eaa692021c5..78392fb6f94e 100644
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -47,7 +47,6 @@
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <linux/list.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 struct cpia_camera_ops
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index 19711aaf9a3e..c431df8248d6 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -34,7 +34,6 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
-#include <linux/smp_lock.h>
 #include <linux/sched.h>
 
 #include <linux/kmod.h>
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 1757a588970f..67bda9f9a44b 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -555,7 +555,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
 {
         struct v4l2_pix_format *pix;
         int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
-        int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_NTSC);
+        int is_50Hz = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
 
         switch (fmt->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
@@ -567,7 +567,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
                 Hsrc = (cx25840_read(client, 0x472) & 0x3f) << 4;
                 Hsrc |= (cx25840_read(client, 0x471) & 0xf0) >> 4;
 
-                Vlines = pix->height + (is_pal ? 4 : 7);
+                Vlines = pix->height + (is_50Hz ? 4 : 7);
 
                 if ((pix->width * 16 < Hsrc) || (Hsrc < pix->width) ||
                     (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) {
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 2ebde2fdbcbe..543b05ebc0e7 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -28,6 +28,7 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 #include <asm/delay.h>
 
 #include "cx88.h"
@@ -612,7 +613,7 @@ struct cx8802_driver * cx8802_get_driver(struct cx8802_dev *dev, enum cx88_board
 }
 
 /* Driver asked for hardware access. */
-int cx8802_request_acquire(struct cx8802_driver *drv)
+static int cx8802_request_acquire(struct cx8802_driver *drv)
 {
         struct cx88_core *core = drv->core;
 
@@ -632,7 +633,7 @@ int cx8802_request_acquire(struct cx8802_driver *drv)
 }
 
 /* Driver asked to release hardware. */
-int cx8802_request_release(struct cx8802_driver *drv)
+static int cx8802_request_release(struct cx8802_driver *drv)
 {
         struct cx88_core *core = drv->core;
 
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index e627062fde3a..259ea08e784f 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -49,7 +49,6 @@
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
 
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index b94ef8ab28c1..98fa35421bdd 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -36,6 +36,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/dma-mapping.h>
 #include <asm/div64.h>
 
 #include "cx88.h"
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 6068c9bf82cd..82bc3a28aa22 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -111,10 +111,6 @@ static struct i2c_adapter vp3054_i2c_adap_template = {
         .id                = I2C_HW_B_CX2388x,
 };
 
-static struct i2c_client vp3054_i2c_client_template = {
-        .name   = "VP-3054",
-};
-
 int vp3054_i2c_probe(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
@@ -133,8 +129,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
                sizeof(vp3054_i2c->adap));
         memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
                sizeof(vp3054_i2c->algo));
-        memcpy(&vp3054_i2c->client, &vp3054_i2c_client_template,
-               sizeof(vp3054_i2c->client));
 
         vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
 
@@ -144,7 +138,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
         vp3054_i2c->algo.data = dev;
         i2c_set_adapdata(&vp3054_i2c->adap, dev);
         vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;
-        vp3054_i2c->client.adapter = &vp3054_i2c->adap;
 
         vp3054_bit_setscl(dev,1);
         vp3054_bit_setsda(dev,1);
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.h b/drivers/media/video/cx88/cx88-vp3054-i2c.h
index b7a0a04d2423..637a7d232238 100644
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.h
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.h
@@ -26,7 +26,6 @@
 struct vp3054_i2c_state {
         struct i2c_adapter         adap;
         struct i2c_algo_bit_data   algo;
-        struct i2c_client          client;
         u32                        state;
 };
 
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index ff4b238090ac..a5731f90be0f 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -37,7 +37,6 @@
 #include <asm/atomic.h>
 #include <linux/delay.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 #include "dabusb.h"
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 9285a58e47aa..5b6a40371602 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,7 +1,6 @@
 config VIDEO_EM28XX
         tristate "Empia EM2800/2820/2840 USB video capture support"
-        depends on VIDEO_V4L1 && USB && I2C
-        select VIDEO_BUF
+        depends on VIDEO_V4L1 && I2C
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 563a8319e608..54ccc6e1f92e 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -70,7 +70,7 @@ static int em2800_i2c_send_max4(struct em28xx *dev, unsigned char addr,
 
         ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len);
         if (ret != 2 + len) {
-                em28xx_warn("writting to i2c device failed (error=%i)\n", ret);
+                em28xx_warn("writing to i2c device failed (error=%i)\n", ret);
                 return -EIO;
         }
         for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index bec67609500f..2c7b158ce7e1 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1729,7 +1729,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 
         endpoint = &interface->cur_altsetting->endpoint[1].desc;
 
-        /* check if the the device has the iso in endpoint at the correct place */
+        /* check if the device has the iso in endpoint at the correct place */
         if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
             USB_ENDPOINT_XFER_ISOC) {
                 em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n");
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig
index c6bff705688d..664676f44068 100644
--- a/drivers/media/video/et61x251/Kconfig
+++ b/drivers/media/video/et61x251/Kconfig
@@ -1,6 +1,6 @@
 config USB_ET61X251
         tristate "USB ET61X[12]51 PC Camera Controller support"
-        depends on USB && VIDEO_V4L1
+        depends on VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on Etoms ET61X151
           or ET61X251 PC Camera Controllers.
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index e854f3f1b70f..1aaeaa02f158 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_IVTV
         tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
-        depends on VIDEO_V4L1 && VIDEO_V4L2 && USB && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
         select FW_LOADER
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 45b9328a538f..e29f949adf57 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -74,7 +74,7 @@ int ivtv_first_minor = 0;
 struct ivtv *ivtv_cards[IVTV_MAX_CARDS];
 
 /* Protects ivtv_cards_active */
-spinlock_t ivtv_cards_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(ivtv_cards_lock);
 
 /* add your revision and whatnot here */
 static struct pci_device_id ivtv_pci_tbl[] __devinitdata = {
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 9a412d6c6d06..552f04511ead 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -67,14 +67,6 @@
 
 #include <media/ivtv.h>
 
-#ifdef CONFIG_LIRC_I2C
-#  error "This driver is not compatible with the LIRC I2C kernel configuration option."
-#endif /* CONFIG_LIRC_I2C */
-
-#ifndef CONFIG_PCI
-#  error "This driver requires kernel PCI support."
-#endif /* CONFIG_PCI */
-
 #define IVTV_ENCODER_OFFSET     0x00000000
 #define IVTV_ENCODER_SIZE       0x00800000      /* Last half isn't needed 0x01000000 */
 
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 1637097ddec7..8976487a65f3 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -804,7 +804,7 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
         struct ivtv_open_id *item;
         struct ivtv *itv = NULL;
         struct ivtv_stream *s = NULL;
-        int minor = MINOR(inode->i_rdev);
+        int minor = iminor(inode);
 
         /* Find which card this open was on */
         spin_lock(&ivtv_cards_lock);
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 794a6a02f82f..1989ec1cb973 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -362,8 +362,6 @@ static int ivtv_get_fmt(struct ivtv *itv, int streamtype, struct v4l2_format *fm
         case V4L2_BUF_TYPE_VIDEO_OUTPUT:
                 if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
                         return -EINVAL;
-                fmt->fmt.pix.left = itv->main_rect.left;
-                fmt->fmt.pix.top = itv->main_rect.top;
                 fmt->fmt.pix.width = itv->main_rect.width;
                 fmt->fmt.pix.height = itv->main_rect.height;
                 fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -402,8 +400,6 @@ static int ivtv_get_fmt(struct ivtv *itv, int streamtype, struct v4l2_format *fm
                 break;
 
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                fmt->fmt.pix.left = 0;
-                fmt->fmt.pix.top = 0;
                 fmt->fmt.pix.width = itv->params.width;
                 fmt->fmt.pix.height = itv->params.height;
                 fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -498,15 +494,13 @@ static int ivtv_try_or_set_fmt(struct ivtv *itv, int streamtype,
                 if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
                         return -EINVAL;
                 field = fmt->fmt.pix.field;
-                r.top = fmt->fmt.pix.top;
-                r.left = fmt->fmt.pix.left;
+                r.top = 0;
+                r.left = 0;
                 r.width = fmt->fmt.pix.width;
                 r.height = fmt->fmt.pix.height;
                 ivtv_get_fmt(itv, streamtype, fmt);
                 if (itv->output_mode != OUT_UDMA_YUV) {
                         /* TODO: would setting the rect also be valid for this mode? */
-                        fmt->fmt.pix.top = r.top;
-                        fmt->fmt.pix.left = r.left;
                         fmt->fmt.pix.width = r.width;
                         fmt->fmt.pix.height = r.height;
                 }
@@ -1141,8 +1135,6 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                 fb->fmt.pixelformat = itv->osd_pixelformat;
                 fb->fmt.width = itv->osd_rect.width;
                 fb->fmt.height = itv->osd_rect.height;
-                fb->fmt.left = itv->osd_rect.left;
-                fb->fmt.top = itv->osd_rect.top;
                 fb->base = (void *)itv->osd_video_pbase;
                 if (itv->osd_global_alpha_state)
                         fb->flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA;
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 68b082bcee1d..18c64222dd11 100644
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -4,7 +4,6 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 03bc369a9e49..3ceb8a6249dd 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -720,12 +720,22 @@ static int ov7670_s_fmt(struct i2c_client *c, struct v4l2_format *fmt)
         struct ov7670_format_struct *ovfmt;
         struct ov7670_win_size *wsize;
         struct ov7670_info *info = i2c_get_clientdata(c);
-        unsigned char com7;
+        unsigned char com7, clkrc;
 
         ret = ov7670_try_fmt(c, fmt, &ovfmt, &wsize);
         if (ret)
                 return ret;
         /*
+         * HACK: if we're running rgb565 we need to grab then rewrite
+         * CLKRC.  If we're *not*, however, then rewriting clkrc hoses
+         * the colors.
+         */
+        if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_RGB565) {
+                ret = ov7670_read(c, REG_CLKRC, &clkrc);
+                if (ret)
+                        return ret;
+        }
+        /*
          * COM7 is a pain in the ass, it doesn't like to be read then
          * quickly written afterward.  But we have everything we need
          * to set it absolutely here, as long as the format-specific
@@ -744,7 +754,10 @@ static int ov7670_s_fmt(struct i2c_client *c, struct v4l2_format *fmt)
         if (wsize->regs)
                 ret = ov7670_write_array(c, wsize->regs);
         info->fmt = ovfmt;
-        return 0;
+
+        if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_RGB565 && ret == 0)
+                ret = ov7670_write(c, REG_CLKRC, clkrc);
+        return ret;
 }
 
 /*
@@ -1267,7 +1280,9 @@ static int ov7670_attach(struct i2c_adapter *adapter)
         ret = ov7670_detect(client);
         if (ret)
                 goto out_free_info;
-        i2c_attach_client(client);
+        ret = i2c_attach_client(client);
+        if (ret)
+                goto out_free_info;
         return 0;
 
   out_free_info:
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 5645c9318890..d0c2cd785430 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_PVRUSB2
         tristate "Hauppauge WinTV-PVR USB2 support"
-        depends on VIDEO_V4L2 && USB && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         select FW_LOADER
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 5669c8ca9ca3..20b614436d2c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -391,22 +391,29 @@ static int pvr2_encoder_prep_config(struct pvr2_hdw *hdw)
 int pvr2_encoder_configure(struct pvr2_hdw *hdw)
 {
         int ret;
+        int val;
         pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure"
                    " (cx2341x module)");
         hdw->enc_ctl_state.port = CX2341X_PORT_STREAMING;
         hdw->enc_ctl_state.width = hdw->res_hor_val;
         hdw->enc_ctl_state.height = hdw->res_ver_val;
-        hdw->enc_ctl_state.is_50hz = ((hdw->std_mask_cur &
-                                       (V4L2_STD_NTSC|V4L2_STD_PAL_M)) ?
+        hdw->enc_ctl_state.is_50hz = ((hdw->std_mask_cur & V4L2_STD_525_60) ?
                                       0 : 1);
 
         ret = 0;
 
         ret |= pvr2_encoder_prep_config(hdw);
 
+        /* saa7115: 0xf0 */
+        val = 0xf0;
+        if (hdw->hdw_type == PVR2_HDW_TYPE_24XXX) {
+                /* ivtv cx25840: 0x140 */
+                val = 0x140;
+        }
+
         if (!ret) ret = pvr2_encoder_vcmd(
                 hdw,CX2341X_ENC_SET_NUM_VSYNC_LINES, 2,
-                0xf0, 0xf0);
+                val, val);
 
         /* setup firmware to notify us about some events (don't know why...) */
         if (!ret) ret = pvr2_encoder_vcmd(
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index acf651e01f94..1311891e7ee3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -83,7 +83,7 @@ static struct pvr2_string_table pvr2_client_lists[] = {
 };
 
 static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL};
-static DECLARE_MUTEX(pvr2_unit_sem);
+static DEFINE_MUTEX(pvr2_unit_mtx);
 
 static int ctlchg = 0;
 static int initusbreset = 1;
@@ -2076,14 +2076,14 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         hdw->ctl_read_urb = usb_alloc_urb(0,GFP_KERNEL);
         if (!hdw->ctl_read_urb) goto fail;
 
-        down(&pvr2_unit_sem); do {
+        mutex_lock(&pvr2_unit_mtx); do {
                 for (idx = 0; idx < PVR_NUM; idx++) {
                         if (unit_pointers[idx]) continue;
                         hdw->unit_number = idx;
                         unit_pointers[idx] = hdw;
                         break;
                 }
-        } while (0); up(&pvr2_unit_sem);
+        } while (0); mutex_unlock(&pvr2_unit_mtx);
 
         cnt1 = 0;
         cnt2 = scnprintf(hdw->name+cnt1,sizeof(hdw->name)-cnt1,"pvrusb2");
@@ -2186,13 +2186,13 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)
         }
         pvr2_i2c_core_done(hdw);
         pvr2_hdw_remove_usb_stuff(hdw);
-        down(&pvr2_unit_sem); do {
+        mutex_lock(&pvr2_unit_mtx); do {
                 if ((hdw->unit_number >= 0) &&
                     (hdw->unit_number < PVR_NUM) &&
                     (unit_pointers[hdw->unit_number] == hdw)) {
                         unit_pointers[hdw->unit_number] = NULL;
                 }
-        } while (0); up(&pvr2_unit_sem);
+        } while (0); mutex_unlock(&pvr2_unit_mtx);
         kfree(hdw->controls);
         kfree(hdw->mpeg_ctrl_info);
         kfree(hdw->std_defs);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 58fc3c730fe1..6786d3c0c98b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -23,6 +23,7 @@
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
 #include "pvrusb2-fx2-cmd.h"
+#include "pvrusb2.h"
 
 #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
 
@@ -38,6 +39,10 @@ static unsigned int i2c_scan = 0;
 module_param(i2c_scan, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
 
+static int ir_mode[PVR_NUM] = { [0 ... PVR_NUM-1] = 1 };
+module_param_array(ir_mode, int, NULL, 0444);
+MODULE_PARM_DESC(ir_mode,"specify: 0=disable IR reception, 1=normal IR");
+
 static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp,
                                              unsigned int detail,
                                              char *buf,unsigned int maxlen);
@@ -273,6 +278,15 @@ static int i2c_hack_wm8775(struct pvr2_hdw *hdw,
         return pvr2_i2c_basic_op(hdw,i2c_addr,wdata,wlen,rdata,rlen);
 }
 
+/* This is an entry point designed to always fail any attempt to perform a
+   transfer.  We use this to cause certain I2C addresses to not be
+   probed. */
+static int i2c_black_hole(struct pvr2_hdw *hdw,
+                           u8 i2c_addr,u8 *wdata,u16 wlen,u8 *rdata,u16 rlen)
+{
+        return -EIO;
+}
+
 /* This is a special entry point that is entered if an I2C operation is
    attempted to a cx25840 chip on model 24xxx hardware.  This chip can
    sometimes wedge itself.  Worse still, when this happens msp3400 can
@@ -994,10 +1008,17 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
         }
 
         /* However, deal with various special cases for 24xxx hardware. */
+        if (ir_mode[hdw->unit_number] == 0) {
+                printk(KERN_INFO "%s: IR disabled\n",hdw->name);
+                hdw->i2c_func[0x18] = i2c_black_hole;
+        } else if (ir_mode[hdw->unit_number] == 1) {
+                if (hdw->hdw_type == PVR2_HDW_TYPE_24XXX) {
+                        hdw->i2c_func[0x18] = i2c_24xxx_ir;
+                }
+        }
         if (hdw->hdw_type == PVR2_HDW_TYPE_24XXX) {
                 hdw->i2c_func[0x1b] = i2c_hack_wm8775;
                 hdw->i2c_func[0x44] = i2c_hack_cx25840;
-                hdw->i2c_func[0x18] = i2c_24xxx_ir;
         }
 
         // Configure the adapter and set up everything else related to it.
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index e976c484c058..9ea41c6699bb 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/videodev2.h>
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index a741c556a39a..7ab79baa1c8c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -518,40 +518,32 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         }
         sfp->item_last = cip;
 
-        cip->attr_name.attr.owner = THIS_MODULE;
         cip->attr_name.attr.name = "name";
         cip->attr_name.attr.mode = S_IRUGO;
         cip->attr_name.show = fp->show_name;
 
-        cip->attr_type.attr.owner = THIS_MODULE;
         cip->attr_type.attr.name = "type";
         cip->attr_type.attr.mode = S_IRUGO;
         cip->attr_type.show = fp->show_type;
 
-        cip->attr_min.attr.owner = THIS_MODULE;
         cip->attr_min.attr.name = "min_val";
         cip->attr_min.attr.mode = S_IRUGO;
         cip->attr_min.show = fp->show_min;
 
-        cip->attr_max.attr.owner = THIS_MODULE;
         cip->attr_max.attr.name = "max_val";
         cip->attr_max.attr.mode = S_IRUGO;
         cip->attr_max.show = fp->show_max;
 
-        cip->attr_val.attr.owner = THIS_MODULE;
         cip->attr_val.attr.name = "cur_val";
         cip->attr_val.attr.mode = S_IRUGO;
 
-        cip->attr_custom.attr.owner = THIS_MODULE;
         cip->attr_custom.attr.name = "custom_val";
         cip->attr_custom.attr.mode = S_IRUGO;
 
-        cip->attr_enum.attr.owner = THIS_MODULE;
         cip->attr_enum.attr.name = "enum_val";
         cip->attr_enum.attr.mode = S_IRUGO;
         cip->attr_enum.show = fp->show_enum;
 
-        cip->attr_bits.attr.owner = THIS_MODULE;
         cip->attr_bits.attr.name = "bit_val";
         cip->attr_bits.attr.mode = S_IRUGO;
         cip->attr_bits.show = fp->show_bits;
@@ -616,12 +608,10 @@ static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
 
         dip = kzalloc(sizeof(*dip),GFP_KERNEL);
         if (!dip) return;
-        dip->attr_debugcmd.attr.owner = THIS_MODULE;
         dip->attr_debugcmd.attr.name = "debugcmd";
         dip->attr_debugcmd.attr.mode = S_IRUGO|S_IWUSR|S_IWGRP;
         dip->attr_debugcmd.show = debugcmd_show;
         dip->attr_debugcmd.store = debugcmd_store;
-        dip->attr_debuginfo.attr.owner = THIS_MODULE;
         dip->attr_debuginfo.attr.name = "debuginfo";
         dip->attr_debuginfo.attr.mode = S_IRUGO;
         dip->attr_debuginfo.show = debuginfo_show;
@@ -811,7 +801,6 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 return;
         }
 
-        sfp->attr_v4l_minor_number.attr.owner = THIS_MODULE;
         sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number";
         sfp->attr_v4l_minor_number.attr.mode = S_IRUGO;
         sfp->attr_v4l_minor_number.show = v4l_minor_number_show;
@@ -825,7 +814,6 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->v4l_minor_number_created_ok = !0;
         }
 
-        sfp->attr_v4l_radio_minor_number.attr.owner = THIS_MODULE;
         sfp->attr_v4l_radio_minor_number.attr.name = "v4l_radio_minor_number";
         sfp->attr_v4l_radio_minor_number.attr.mode = S_IRUGO;
         sfp->attr_v4l_radio_minor_number.show = v4l_radio_minor_number_show;
@@ -839,7 +827,6 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->v4l_radio_minor_number_created_ok = !0;
         }
 
-        sfp->attr_unit_number.attr.owner = THIS_MODULE;
         sfp->attr_unit_number.attr.name = "unit_number";
         sfp->attr_unit_number.attr.mode = S_IRUGO;
         sfp->attr_unit_number.show = unit_number_show;
@@ -852,7 +839,6 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->unit_number_created_ok = !0;
         }
 
-        sfp->attr_bus_info.attr.owner = THIS_MODULE;
         sfp->attr_bus_info.attr.name = "bus_info_str";
         sfp->attr_bus_info.attr.mode = S_IRUGO;
         sfp->attr_bus_info.show = bus_info_show;
diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig
index 8fdf7101d3bf..7298cf2e1650 100644
--- a/drivers/media/video/pwc/Kconfig
+++ b/drivers/media/video/pwc/Kconfig
@@ -1,6 +1,6 @@
 config USB_PWC
         tristate "USB Philips Cameras"
-        depends on USB && VIDEO_V4L1
+        depends on VIDEO_V4L1
         ---help---
           Say Y or M here if you want to use one of these Philips & OEM
           webcams:
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index f5e848410311..f9f3584281d8 100644
--- a/drivers/media/video/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -54,9 +54,9 @@ fps
    Specifies the desired framerate. Is an integer in the range of 4-30.
 
 fbufs
-   This paramter specifies the number of internal buffers to use for storing
+   This parameter specifies the number of internal buffers to use for storing
    frames from the cam. This will help if the process that reads images from
-   the cam is a bit slow or momentarely busy. However, on slow machines it
+   the cam is a bit slow or momentarily busy. However, on slow machines it
    only introduces lag, so choose carefully. The default is 3, which is
    reasonable. You can set it between 2 and 5.
 
@@ -209,7 +209,7 @@ trace
 
      128   0x80   PWCX debugging                                      Off
 
-   For example, to trace the open() & read() fuctions, sum 8 + 4 = 12,
+   For example, to trace the open() & read() functions, sum 8 + 4 = 12,
    so you would supply trace=12 during insmod or modprobe. If
    you want to turn the initialization and probing tracing off, set trace=0.
    The default value for trace is 35 (0x23).
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 4ea479baee74..50f15adfa7c8 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1170,6 +1170,42 @@ struct saa7134_board saa7134_boards[] = {
                         .amux   = LINE2,
                 },
         },
+    [SAA7134_BOARD_ECS_TVP3XP_4CB6] = {
+                /* Barry Scott <barry.scott@onelan.co.uk> */
+                .name           = "Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM)",
+                .audio_clock    = 0x187de7,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_tv_mono,
+                        .vmux   = 1,
+                        .amux   = LINE2,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                },{
+                        .name   = "CVid over SVid",
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                }},
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = LINE2,
+                },
+        },
         [SAA7134_BOARD_AVACSSMARTTV] = {
                 /* Roman Pszonczenko <romka@kolos.math.uni.lodz.pl> */
                 .name           = "AVACS SmartTV",
@@ -2754,6 +2790,35 @@ struct saa7134_board saa7134_boards[] = {
                         .amux   = LINE1,
                 },
         },
+        [SAA7134_BOARD_KWORLD_DVBT_210] = {
+                .name           = "KWorld DVB-T 210",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 1 << 21,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                }},
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
+                },
+        },
         [SAA7134_BOARD_KWORLD_ATSC110] = {
                 .name           = "Kworld ATSC110",
                 .audio_clock    = 0x00187de7,
@@ -3407,6 +3472,36 @@ struct saa7134_board saa7134_boards[] = {
                         .gpio = 0x0200000,
                 },
         },
+        [SAA7134_BOARD_SABRENT_TV_PCB05] = {
+                .name           = "Sabrent PCMCIA TV-PCB05",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                },{
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                }},
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3515,7 +3610,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
-                .subdevice    = 0x0214, /* Standard PCI, LR214WF */
+                .subdevice    = 0x0214, /* Standard PCI, LR214 Rev E and earlier (SAA7135) */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
+                .subdevice    = 0x5214, /* Standard PCI, LR214 Rev F onwards (SAA7131) */
                 .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3689,6 +3790,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_ECS_TVP3XP_4CB5,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x1019,
+                .subdevice    = 0x4cb6,
+                .driver_data  = SAA7134_BOARD_ECS_TVP3XP_4CB6,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x12ab,
                 .subdevice    = 0x0800,
@@ -3915,6 +4022,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_TEVION_DVBT_220RF,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x17de,
+                .subdevice    = 0x7250,
+                .driver_data  = SAA7134_BOARD_KWORLD_DVBT_210,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
                 .subvendor    = 0x17de,
                 .subdevice    = 0x7350,
@@ -4100,6 +4213,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x4857,
                 .driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x0919, /* SinoVideo PCI 2309 Proteus (7134) */
+                .subdevice    = 0x2003, /* OEM cardbus */
+                .driver_data  = SAA7134_BOARD_SABRENT_TV_PCB05,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -4178,6 +4297,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_CINERGY600_MK3:
         case SAA7134_BOARD_ECS_TVP3XP:
         case SAA7134_BOARD_ECS_TVP3XP_4CB5:
+        case SAA7134_BOARD_ECS_TVP3XP_4CB6:
         case SAA7134_BOARD_MD2819:
         case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:
         case SAA7134_BOARD_KWORLD_XPERT:
@@ -4426,6 +4546,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
+        case SAA7134_BOARD_KWORLD_DVBT_210:
         case SAA7134_BOARD_TEVION_DVBT_220RF:
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
         case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 65aec881bbde..e0eec80088c7 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -887,6 +887,20 @@ static struct tda1004x_config asus_p7131_hybrid_lna_config = {
         .antenna_switch= 2,
         .request_firmware = philips_tda1004x_request_firmware
 };
+static struct tda1004x_config kworld_dvb_t_210_config = {
+        .demod_address = 0x08,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_16M,
+        .agc_config    = TDA10046_AGC_TDA827X,
+        .gpio_config   = TDA10046_GP11_I,
+        .if_freq       = TDA10046_FREQ_045,
+        .i2c_gate      = 0x4b,
+        .tuner_address = 0x61,
+        .tuner_config  = 2,
+        .antenna_switch= 1,
+        .request_firmware = philips_tda1004x_request_firmware
+};
 /* ------------------------------------------------------------------
  * special case: this card uses saa713x GPIO22 for the mode switch
  */
@@ -1039,6 +1053,9 @@ static int dvb_init(struct saa7134_dev *dev)
                         dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
                 }
                 break;
+        case SAA7134_BOARD_KWORLD_DVBT_210:
+                configure_tda827x_fe(dev, &kworld_dvb_t_210_config);
+                break;
         case SAA7134_BOARD_PHILIPS_TIGER:
                 configure_tda827x_fe(dev, &philips_tiger_config);
                 break;
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index dd759d6d8d25..7b56041186dc 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -27,7 +27,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
 #include <asm/div64.h>
 
 #include "saa7134-reg.h"
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 62224cc958f1..15623b27ad2e 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -235,6 +235,9 @@ struct saa7134_format {
 #define SAA7134_BOARD_AVERMEDIA_M102       110
 #define SAA7134_BOARD_ASUS_P7131_4871      111
 #define SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA 112
+#define SAA7134_BOARD_ECS_TVP3XP_4CB6  113
+#define SAA7134_BOARD_KWORLD_DVBT_210 114
+#define SAA7134_BOARD_SABRENT_TV_PCB05     115
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h
index c0891b3e0018..835ef872e803 100644
--- a/drivers/media/video/se401.h
+++ b/drivers/media/video/se401.h
@@ -5,7 +5,6 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 #define se401_DEBUG     /* Turn on debug messages */
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig
index 19204f5686e1..f71f272776de 100644
--- a/drivers/media/video/sn9c102/Kconfig
+++ b/drivers/media/video/sn9c102/Kconfig
@@ -1,6 +1,6 @@
 config USB_SN9C102
         tristate "USB SN9C1xx PC Camera Controller support"
-        depends on USB && VIDEO_V4L2
+        depends on VIDEO_V4L2
         ---help---
           Say Y here if you want support for cameras based on SONiX SN9C101,
           SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers.
diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index 680e74634527..11fcb49f5b99 100644
--- a/drivers/media/video/sn9c102/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -141,7 +141,7 @@ sn9c102_match_id(struct sn9c102_device* cam, const struct usb_device_id *id)
 
 void
 sn9c102_attach_sensor(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor)
+                      const struct sn9c102_sensor* sensor)
 {
         memcpy(&cam->sensor, sensor, sizeof(struct sn9c102_sensor));
 }
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 89f83354de3b..74a204f8ebc8 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -48,8 +48,8 @@
 #define SN9C102_MODULE_AUTHOR   "(C) 2004-2007 Luca Risolia"
 #define SN9C102_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
 #define SN9C102_MODULE_LICENSE  "GPL"
-#define SN9C102_MODULE_VERSION  "1:1.39"
-#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 39)
+#define SN9C102_MODULE_VERSION  "1:1.44"
+#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 44)
 
 /*****************************************************************************/
 
@@ -209,38 +209,41 @@ static void sn9c102_queue_unusedframes(struct sn9c102_device* cam)
 }
 
 /*****************************************************************************/
+
 /*
- * Write a sequence of count value/register pairs.  Returns -1 after the
- * first failed write, or 0 for no errors.
- */
+   Write a sequence of count value/register pairs. Returns -1 after the first
+   failed write, or 0 for no errors.
+*/
 int sn9c102_write_regs(struct sn9c102_device* cam, const u8 valreg[][2],
                        int count)
 {
         struct usb_device* udev = cam->usbdev;
-        u8* value = cam->control_buffer;  /* Needed for DMA'able memory */
+        u8* buff = cam->control_buffer;
         int i, res;
 
         for (i = 0; i < count; i++) {
                 u8 index = valreg[i][1];
 
                 /*
-                 * index is a u8, so it must be <256 and can't be out of range.
-                 * If we put in a check anyway, gcc annoys us with a warning
-                 * that our check is useless.  People get all uppity when they
-                 * see warnings in the kernel compile.
-                 */
-
-                *value = valreg[i][0];
-                res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                                      0x08, 0x41, index, 0,
-                                      value, 1, SN9C102_CTRL_TIMEOUT);
+                   index is a u8, so it must be <256 and can't be out of range.
+                   If we put in a check anyway, gcc annoys us with a warning
+                   hat our check is useless. People get all uppity when they
+                   see warnings in the kernel compile.
+                */
+
+                *buff = valreg[i][0];
+
+                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);
+                               "index 0x%02X, error %d)", *buff, index, res);
                         return -1;
                 }
 
-                cam->reg[index] = *value;
+                cam->reg[index] = *buff;
         }
 
         return 0;
@@ -272,8 +275,8 @@ int sn9c102_write_reg(struct sn9c102_device* cam, u8 value, u16 index)
 }
 
 
-/* NOTE: reading some registers always returns 0 */
-static int sn9c102_read_reg(struct sn9c102_device* cam, u16 index)
+/* NOTE: with the SN9C10[123] reading some registers always returns 0 */
+int sn9c102_read_reg(struct sn9c102_device* cam, u16 index)
 {
         struct usb_device* udev = cam->usbdev;
         u8* buff = cam->control_buffer;
@@ -299,7 +302,8 @@ int sn9c102_pread_reg(struct sn9c102_device* cam, u16 index)
 
 
 static int
-sn9c102_i2c_wait(struct sn9c102_device* cam, struct sn9c102_sensor* sensor)
+sn9c102_i2c_wait(struct sn9c102_device* cam,
+                 const struct sn9c102_sensor* sensor)
 {
         int i, r;
 
@@ -320,7 +324,7 @@ sn9c102_i2c_wait(struct sn9c102_device* cam, struct sn9c102_sensor* sensor)
 
 static int
 sn9c102_i2c_detect_read_error(struct sn9c102_device* cam,
-                              struct sn9c102_sensor* sensor)
+                              const struct sn9c102_sensor* sensor)
 {
         int r , err = 0;
 
@@ -342,7 +346,7 @@ sn9c102_i2c_detect_read_error(struct sn9c102_device* cam,
 
 static int
 sn9c102_i2c_detect_write_error(struct sn9c102_device* cam,
-                               struct sn9c102_sensor* sensor)
+                               const struct sn9c102_sensor* sensor)
 {
         int r;
         r = sn9c102_read_reg(cam, 0x08);
@@ -352,12 +356,12 @@ sn9c102_i2c_detect_write_error(struct sn9c102_device* cam,
 
 int
 sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
-                         struct sn9c102_sensor* sensor, u8 data0, u8 data1,
-                         u8 n, u8 buffer[])
+                         const struct sn9c102_sensor* sensor, u8 data0,
+                         u8 data1, u8 n, u8 buffer[])
 {
         struct usb_device* udev = cam->usbdev;
         u8* data = cam->control_buffer;
-        int err = 0, res;
+        int i = 0, err = 0, res;
 
         /* Write cycle */
         data[0] = ((sensor->interface == SN9C102_I2C_2WIRES) ? 0x80 : 0) |
@@ -402,7 +406,8 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
         }
 
         if (buffer)
-                memcpy(buffer, data, sizeof(buffer));
+                for (i = 0; i < n && i < 5; i++)
+                        buffer[n-i-1] = data[4-i];
 
         return (int)data[4];
 }
@@ -410,7 +415,7 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
 
 int
 sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
-                          struct sn9c102_sensor* sensor, u8 n, u8 data0,
+                          const struct sn9c102_sensor* sensor, u8 n, u8 data0,
                           u8 data1, u8 data2, u8 data3, u8 data4, u8 data5)
 {
         struct usb_device* udev = cam->usbdev;
@@ -449,7 +454,7 @@ sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
 
 int
 sn9c102_i2c_try_read(struct sn9c102_device* cam,
-                     struct sn9c102_sensor* sensor, u8 address)
+                     const struct sn9c102_sensor* sensor, u8 address)
 {
         return sn9c102_i2c_try_raw_read(cam, sensor, sensor->i2c_slave_id,
                                         address, 1, NULL);
@@ -458,7 +463,7 @@ sn9c102_i2c_try_read(struct sn9c102_device* cam,
 
 int
 sn9c102_i2c_try_write(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor, u8 address, u8 value)
+                      const struct sn9c102_sensor* sensor, u8 address, u8 value)
 {
         return sn9c102_i2c_try_raw_write(cam, sensor, 3,
                                          sensor->i2c_slave_id, address,
@@ -657,16 +662,6 @@ sn9c102_write_jpegheader(struct sn9c102_device* cam, struct sn9c102_frame_t* f)
 }
 
 
-static void
-sn9c102_write_eoimarker(struct sn9c102_device* cam, struct sn9c102_frame_t* f)
-{
-        static const u8 eoi_marker[2] = {0xff, 0xd9};
-
-        memcpy(f->bufmem + f->buf.bytesused, eoi_marker, sizeof(eoi_marker));
-        f->buf.bytesused += sizeof(eoi_marker);
-}
-
-
 static void sn9c102_urb_complete(struct urb *urb)
 {
         struct sn9c102_device* cam = urb->context;
@@ -3181,14 +3176,14 @@ static int sn9c102_ioctl(struct inode* inode, struct file* filp,
 
 static const struct file_operations sn9c102_fops = {
         .owner = THIS_MODULE,
-        .open =    sn9c102_open,
+        .open = sn9c102_open,
         .release = sn9c102_release,
-        .ioctl =   sn9c102_ioctl,
+        .ioctl = sn9c102_ioctl,
         .compat_ioctl = v4l_compat_ioctl32,
-        .read =    sn9c102_read,
-        .poll =    sn9c102_poll,
-        .mmap =    sn9c102_mmap,
-        .llseek =  no_llseek,
+        .read = sn9c102_read,
+        .poll = sn9c102_poll,
+        .mmap = sn9c102_mmap,
+        .llseek = no_llseek,
 };
 
 /*****************************************************************************/
@@ -3251,7 +3246,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 break;
         }
 
-        for  (i = 0; sn9c102_sensor_table[i]; i++) {
+        for  (i = 0; i < ARRAY_SIZE(sn9c102_sensor_table); i++) {
                 err = sn9c102_sensor_table[i](cam);
                 if (!err)
                         break;
@@ -3262,7 +3257,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 DBG(3, "Support for %s maintained by %s",
                     cam->sensor.name, cam->sensor.maintainer);
         } else {
-                DBG(1, "No supported image sensor detected");
+                DBG(1, "No supported image sensor detected for this bridge");
                 err = -ENODEV;
                 goto fail;
         }
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
index f49bd8c5b86e..916054faf9be 100644
--- a/drivers/media/video/sn9c102/sn9c102_devtable.h
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -86,6 +86,8 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x60bc, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60be, BRIDGE_SN9C103), },
         /* SN9C105 */
+        { SN9C102_USB_DEVICE(0x045e, 0x00f5, BRIDGE_SN9C105), },
+        { SN9C102_USB_DEVICE(0x045e, 0x00f7, BRIDGE_SN9C105), },
         { SN9C102_USB_DEVICE(0x0471, 0x0327, BRIDGE_SN9C105), },
         { SN9C102_USB_DEVICE(0x0471, 0x0328, BRIDGE_SN9C105), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60c0, BRIDGE_SN9C105), },
@@ -100,6 +102,7 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x60fc, BRIDGE_SN9C105), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60fe, BRIDGE_SN9C105), },
         /* SN9C120 */
+        { SN9C102_USB_DEVICE(0x0458, 0x7025, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6102, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), },
@@ -148,7 +151,6 @@ static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {
         &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */
         &sn9c102_probe_tas5110d, /* detection based on USB pid/vid */
         &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */
-        NULL,
 };
 
 #endif /* _SN9C102_DEVTABLE_H_ */
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
index 28a861aed044..eaf9ad0dc8a6 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131d.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
@@ -144,7 +144,7 @@ static int hv7131d_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor hv7131d = {
+static const struct sn9c102_sensor hv7131d = {
         .name = "HV7131D",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102,
@@ -248,12 +248,10 @@ int sn9c102_probe_hv7131d(struct sn9c102_device* cam)
 
         err = sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x00, 0x01},
                                        {0x28, 0x17});
-        if (err)
-                return -EIO;
 
         r0 = sn9c102_i2c_try_read(cam, &hv7131d, 0x00);
         r1 = sn9c102_i2c_try_read(cam, &hv7131d, 0x01);
-        if (r0 < 0 || r1 < 0)
+        if (err || r0 < 0 || r1 < 0)
                 return -EIO;
 
         if (r0 != 0x00 || r1 != 0x04)
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
index 5a495baa5f95..0fc401223cfc 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131r.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
@@ -44,7 +44,6 @@ static int hv7131r_init(struct sn9c102_device* cam)
                                                {0xb0, 0x2b}, {0xc0, 0x2c},
                                                {0xd0, 0x2d}, {0xe0, 0x2e},
                                                {0xf0, 0x2f}, {0xff, 0x30});
-
                 break;
         case BRIDGE_SN9C105:
         case BRIDGE_SN9C120:
@@ -254,7 +253,7 @@ static int hv7131r_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor hv7131r = {
+static const struct sn9c102_sensor hv7131r = {
         .name = "HV7131R",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C103 | BRIDGE_SN9C105 | BRIDGE_SN9C120,
@@ -350,11 +349,8 @@ int sn9c102_probe_hv7131r(struct sn9c102_device* cam)
                                        {0x34, 0x01}, {0x20, 0x17},
                                        {0x34, 0x01}, {0x46, 0x01});
 
-        if (err)
-                return -EIO;
-
         devid = sn9c102_i2c_try_read(cam, &hv7131r, 0x00);
-        if (devid < 0)
+        if (err || devid < 0)
                 return -EIO;
 
         if (devid != 0x02)
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c
index 9200845d011b..00b134ca0a3d 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0343.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0343.c
@@ -55,45 +55,45 @@ static int mi0343_get_ctrl(struct sn9c102_device* cam,
                            struct v4l2_control* ctrl)
 {
         struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
-        u8 data[5+1];
+        u8 data[2];
 
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x09,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x09, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[2];
+                ctrl->value = data[0];
                 return 0;
         case V4L2_CID_GAIN:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x35,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x35, 2,
+                                             data) < 0)
                         return -EIO;
                 break;
         case V4L2_CID_HFLIP:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3] & 0x20 ? 1 : 0;
+                ctrl->value = data[1] & 0x20 ? 1 : 0;
                 return 0;
         case V4L2_CID_VFLIP:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3] & 0x80 ? 1 : 0;
+                ctrl->value = data[1] & 0x80 ? 1 : 0;
                 return 0;
         case V4L2_CID_RED_BALANCE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2d,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2d, 2,
+                                             data) < 0)
                         return -EIO;
                 break;
         case V4L2_CID_BLUE_BALANCE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2c,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2c, 2,
+                                             data) < 0)
                         return -EIO;
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2e,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2e, 2,
+                                             data) < 0)
                         return -EIO;
                 break;
         default:
@@ -105,7 +105,7 @@ static int mi0343_get_ctrl(struct sn9c102_device* cam,
         case V4L2_CID_RED_BALANCE:
         case V4L2_CID_BLUE_BALANCE:
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                ctrl->value = data[3] | (data[2] << 8);
+                ctrl->value = data[1] | (data[0] << 8);
                 if (ctrl->value >= 0x10 && ctrl->value <= 0x3f)
                         ctrl->value -= 0x10;
                 else if (ctrl->value >= 0x60 && ctrl->value <= 0x7f)
@@ -223,7 +223,7 @@ static int mi0343_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor mi0343 = {
+static const struct sn9c102_sensor mi0343 = {
         .name = "MI-0343",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102,
@@ -332,20 +332,17 @@ static struct sn9c102_sensor mi0343 = {
 
 int sn9c102_probe_mi0343(struct sn9c102_device* cam)
 {
-        u8 data[5+1];
-        int err = 0;
-
-        err = sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x00, 0x01},
-                                       {0x28, 0x17});
+        u8 data[2];
 
-        if (err)
+        if (sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x00, 0x01},
+                                     {0x28, 0x17}))
                 return -EIO;
 
         if (sn9c102_i2c_try_raw_read(cam, &mi0343, mi0343.i2c_slave_id, 0x00,
                                      2, data) < 0)
                 return -EIO;
 
-        if (data[4] != 0x32 || data[3] != 0xe3)
+        if (data[1] != 0x42 || data[0] != 0xe3)
                 return -ENODEV;
 
         sn9c102_attach_sensor(cam, &mi0343);
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0360.c b/drivers/media/video/sn9c102/sn9c102_mi0360.c
index 64698acb0b15..f8d81d82e8d5 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0360.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0360.c
@@ -27,20 +27,105 @@ static int mi0360_init(struct sn9c102_device* cam)
         struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
 
-        err = sn9c102_write_const_regs(cam, {0x00, 0x10}, {0x00, 0x11},
-                                       {0x0a, 0x14}, {0x40, 0x01},
-                                       {0x20, 0x17}, {0x07, 0x18},
-                                       {0xa0, 0x19}, {0x02, 0x1c},
-                                       {0x03, 0x1d}, {0x0f, 0x1e},
-                                       {0x0c, 0x1f}, {0x00, 0x20},
-                                       {0x10, 0x21}, {0x20, 0x22},
-                                       {0x30, 0x23}, {0x40, 0x24},
-                                       {0x50, 0x25}, {0x60, 0x26},
-                                       {0x70, 0x27}, {0x80, 0x28},
-                                       {0x90, 0x29}, {0xa0, 0x2a},
-                                       {0xb0, 0x2b}, {0xc0, 0x2c},
-                                       {0xd0, 0x2d}, {0xe0, 0x2e},
-                                       {0xf0, 0x2f}, {0xff, 0x30});
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C103:
+                err = sn9c102_write_const_regs(cam, {0x00, 0x10}, {0x00, 0x11},
+                                               {0x0a, 0x14}, {0x40, 0x01},
+                                               {0x20, 0x17}, {0x07, 0x18},
+                                               {0xa0, 0x19}, {0x02, 0x1c},
+                                               {0x03, 0x1d}, {0x0f, 0x1e},
+                                               {0x0c, 0x1f}, {0x00, 0x20},
+                                               {0x10, 0x21}, {0x20, 0x22},
+                                               {0x30, 0x23}, {0x40, 0x24},
+                                               {0x50, 0x25}, {0x60, 0x26},
+                                               {0x70, 0x27}, {0x80, 0x28},
+                                               {0x90, 0x29}, {0xa0, 0x2a},
+                                               {0xb0, 0x2b}, {0xc0, 0x2c},
+                                               {0xd0, 0x2d}, {0xe0, 0x2e},
+                                               {0xf0, 0x2f}, {0xff, 0x30});
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                err = sn9c102_write_const_regs(cam, {0x44, 0x01}, {0x40, 0x02},
+                                               {0x00, 0x03}, {0x1a, 0x04},
+                                               {0x50, 0x05}, {0x20, 0x06},
+                                               {0x10, 0x07}, {0x03, 0x10},
+                                               {0x08, 0x14}, {0xa2, 0x17},
+                                               {0x47, 0x18}, {0x00, 0x19},
+                                               {0x1d, 0x1a}, {0x10, 0x1b},
+                                               {0x02, 0x1c}, {0x03, 0x1d},
+                                               {0x0f, 0x1e}, {0x0c, 0x1f},
+                                               {0x00, 0x20}, {0x29, 0x21},
+                                               {0x40, 0x22}, {0x54, 0x23},
+                                               {0x66, 0x24}, {0x76, 0x25},
+                                               {0x85, 0x26}, {0x94, 0x27},
+                                               {0xa1, 0x28}, {0xae, 0x29},
+                                               {0xbb, 0x2a}, {0xc7, 0x2b},
+                                               {0xd3, 0x2c}, {0xde, 0x2d},
+                                               {0xea, 0x2e}, {0xf4, 0x2f},
+                                               {0xff, 0x30}, {0x00, 0x3F},
+                                               {0xC7, 0x40}, {0x01, 0x41},
+                                               {0x44, 0x42}, {0x00, 0x43},
+                                               {0x44, 0x44}, {0x00, 0x45},
+                                               {0x44, 0x46}, {0x00, 0x47},
+                                               {0xC7, 0x48}, {0x01, 0x49},
+                                               {0xC7, 0x4A}, {0x01, 0x4B},
+                                               {0xC7, 0x4C}, {0x01, 0x4D},
+                                               {0x44, 0x4E}, {0x00, 0x4F},
+                                               {0x44, 0x50}, {0x00, 0x51},
+                                               {0x44, 0x52}, {0x00, 0x53},
+                                               {0xC7, 0x54}, {0x01, 0x55},
+                                               {0xC7, 0x56}, {0x01, 0x57},
+                                               {0xC7, 0x58}, {0x01, 0x59},
+                                               {0x44, 0x5A}, {0x00, 0x5B},
+                                               {0x44, 0x5C}, {0x00, 0x5D},
+                                               {0x44, 0x5E}, {0x00, 0x5F},
+                                               {0xC7, 0x60}, {0x01, 0x61},
+                                               {0xC7, 0x62}, {0x01, 0x63},
+                                               {0xC7, 0x64}, {0x01, 0x65},
+                                               {0x44, 0x66}, {0x00, 0x67},
+                                               {0x44, 0x68}, {0x00, 0x69},
+                                               {0x44, 0x6A}, {0x00, 0x6B},
+                                               {0xC7, 0x6C}, {0x01, 0x6D},
+                                               {0xC7, 0x6E}, {0x01, 0x6F},
+                                               {0xC7, 0x70}, {0x01, 0x71},
+                                               {0x44, 0x72}, {0x00, 0x73},
+                                               {0x44, 0x74}, {0x00, 0x75},
+                                               {0x44, 0x76}, {0x00, 0x77},
+                                               {0xC7, 0x78}, {0x01, 0x79},
+                                               {0xC7, 0x7A}, {0x01, 0x7B},
+                                               {0xC7, 0x7C}, {0x01, 0x7D},
+                                               {0x44, 0x7E}, {0x00, 0x7F},
+                                               {0x14, 0x84}, {0x00, 0x85},
+                                               {0x27, 0x86}, {0x00, 0x87},
+                                               {0x07, 0x88}, {0x00, 0x89},
+                                               {0xEC, 0x8A}, {0x0f, 0x8B},
+                                               {0xD8, 0x8C}, {0x0f, 0x8D},
+                                               {0x3D, 0x8E}, {0x00, 0x8F},
+                                               {0x3D, 0x90}, {0x00, 0x91},
+                                               {0xCD, 0x92}, {0x0f, 0x93},
+                                               {0xf7, 0x94}, {0x0f, 0x95},
+                                               {0x0C, 0x96}, {0x00, 0x97},
+                                               {0x00, 0x98}, {0x66, 0x99},
+                                               {0x05, 0x9A}, {0x00, 0x9B},
+                                               {0x04, 0x9C}, {0x00, 0x9D},
+                                               {0x08, 0x9E}, {0x00, 0x9F},
+                                               {0x2D, 0xC0}, {0x2D, 0xC1},
+                                               {0x3A, 0xC2}, {0x05, 0xC3},
+                                               {0x04, 0xC4}, {0x3F, 0xC5},
+                                               {0x00, 0xC6}, {0x00, 0xC7},
+                                               {0x50, 0xC8}, {0x3C, 0xC9},
+                                               {0x28, 0xCA}, {0xD8, 0xCB},
+                                               {0x14, 0xCC}, {0xEC, 0xCD},
+                                               {0x32, 0xCE}, {0xDD, 0xCF},
+                                               {0x32, 0xD0}, {0xDD, 0xD1},
+                                               {0x6A, 0xD2}, {0x50, 0xD3},
+                                               {0x00, 0xD4}, {0x00, 0xD5},
+                                               {0x00, 0xD6});
+                break;
+        default:
+                break;
+        }
 
         err += sn9c102_i2c_try_raw_write(cam, s, 4, s->i2c_slave_id, 0x0d,
                                          0x00, 0x01, 0, 0);
@@ -65,50 +150,50 @@ static int mi0360_get_ctrl(struct sn9c102_device* cam,
                            struct v4l2_control* ctrl)
 {
         struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
-        u8 data[5+1];
+        u8 data[2];
 
         switch (ctrl->id) {
         case V4L2_CID_EXPOSURE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x09,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x09, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[2];
+                ctrl->value = data[0];
                 return 0;
         case V4L2_CID_GAIN:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x35,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x35, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3];
+                ctrl->value = data[1];
                 return 0;
         case V4L2_CID_RED_BALANCE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2c,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2c, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3];
+                ctrl->value = data[1];
                 return 0;
         case V4L2_CID_BLUE_BALANCE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2d,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2d, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3];
+                ctrl->value = data[1];
                 return 0;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2e,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x2e, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3];
+                ctrl->value = data[1];
                 return 0;
         case V4L2_CID_HFLIP:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3] & 0x20 ? 1 : 0;
+                ctrl->value = data[1] & 0x20 ? 1 : 0;
                 return 0;
         case V4L2_CID_VFLIP:
-                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20,
-                                             2+1, data) < 0)
+                if (sn9c102_i2c_try_raw_read(cam, s, s->i2c_slave_id, 0x20, 2,
+                                             data) < 0)
                         return -EIO;
-                ctrl->value = data[3] & 0x80 ? 1 : 0;
+                ctrl->value = data[1] & 0x80 ? 1 : 0;
                 return 0;
         default:
                 return -EINVAL;
@@ -178,8 +263,19 @@ static int mi0360_set_crop(struct sn9c102_device* cam,
 {
         struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
-        u8 h_start = (u8)(rect->left - s->cropcap.bounds.left) + 0,
-           v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
+        u8 h_start = 0, v_start = (u8)(rect->top - s->cropcap.bounds.top) + 1;
+
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C103:
+                h_start = (u8)(rect->left - s->cropcap.bounds.left) + 0;
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                h_start = (u8)(rect->left - s->cropcap.bounds.left) + 1;
+                break;
+        default:
+                break;
+        }
 
         err += sn9c102_write_reg(cam, h_start, 0x12);
         err += sn9c102_write_reg(cam, v_start, 0x13);
@@ -194,24 +290,30 @@ static int mi0360_set_pix_format(struct sn9c102_device* cam,
         struct sn9c102_sensor* s = sn9c102_get_sensor(cam);
         int err = 0;
 
-        if (pix->pixelformat == V4L2_PIX_FMT_SN9C10X) {
-                err += sn9c102_i2c_try_raw_write(cam, s, 4, s->i2c_slave_id,
-                                                 0x0a, 0x00, 0x02, 0, 0);
-                err += sn9c102_write_reg(cam, 0x20, 0x19);
-        } else {
+        if (pix->pixelformat == V4L2_PIX_FMT_SBGGR8) {
                 err += sn9c102_i2c_try_raw_write(cam, s, 4, s->i2c_slave_id,
                                                  0x0a, 0x00, 0x05, 0, 0);
                 err += sn9c102_write_reg(cam, 0x60, 0x19);
+                if (sn9c102_get_bridge(cam) == BRIDGE_SN9C105 ||
+                    sn9c102_get_bridge(cam) == BRIDGE_SN9C120)
+                        err += sn9c102_write_reg(cam, 0xa6, 0x17);
+        } else {
+                err += sn9c102_i2c_try_raw_write(cam, s, 4, s->i2c_slave_id,
+                                                 0x0a, 0x00, 0x02, 0, 0);
+                err += sn9c102_write_reg(cam, 0x20, 0x19);
+                if (sn9c102_get_bridge(cam) == BRIDGE_SN9C105 ||
+                    sn9c102_get_bridge(cam) == BRIDGE_SN9C120)
+                        err += sn9c102_write_reg(cam, 0xa2, 0x17);
         }
 
         return err;
 }
 
 
-static struct sn9c102_sensor mi0360 = {
+static const struct sn9c102_sensor mi0360 = {
         .name = "MI-0360",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
-        .supported_bridge = BRIDGE_SN9C103,
+        .supported_bridge = BRIDGE_SN9C103 | BRIDGE_SN9C105 | BRIDGE_SN9C120,
         .frequency = SN9C102_I2C_100KHZ,
         .interface = SN9C102_I2C_2WIRES,
         .i2c_slave_id = 0x5d,
@@ -317,19 +419,31 @@ static struct sn9c102_sensor mi0360 = {
 
 int sn9c102_probe_mi0360(struct sn9c102_device* cam)
 {
-        u8 data[5+1];
-        int err;
 
-        err = sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x00, 0x01},
-                                       {0x28, 0x17});
-        if (err)
-                return -EIO;
+        u8 data[2];
+
+        switch (sn9c102_get_bridge(cam)) {
+        case BRIDGE_SN9C103:
+                if (sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x00, 0x01},
+                                             {0x28, 0x17}))
+                        return -EIO;
+                break;
+        case BRIDGE_SN9C105:
+        case BRIDGE_SN9C120:
+                if (sn9c102_write_const_regs(cam, {0x01, 0xf1}, {0x00, 0xf1},
+                                             {0x01, 0x01}, {0x00, 0x01},
+                                             {0x28, 0x17}))
+                        return -EIO;
+                break;
+        default:
+                break;
+        }
 
         if (sn9c102_i2c_try_raw_read(cam, &mi0360, mi0360.i2c_slave_id, 0x00,
-                                     2+1, data) < 0)
+                                     2, data) < 0)
                 return -EIO;
 
-        if (data[2] != 0x82 || data[3] != 0x43)
+        if (data[0] != 0x82 || data[1] != 0x43)
                 return -ENODEV;
 
         sn9c102_attach_sensor(cam, &mi0360);
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c
index 31b6080b0615..e6832347894f 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7630.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c
@@ -29,9 +29,8 @@ static int ov7630_init(struct sn9c102_device* cam)
         switch (sn9c102_get_bridge(cam)) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
-                err = sn9c102_write_const_regs(cam, {0x00, 0x14},
-                                               {0x60, 0x17}, {0x0f, 0x18},
-                                               {0x50, 0x19});
+                err = sn9c102_write_const_regs(cam, {0x00, 0x14}, {0x60, 0x17},
+                                               {0x0f, 0x18}, {0x50, 0x19});
 
                 err += sn9c102_i2c_write(cam, 0x12, 0x8d);
                 err += sn9c102_i2c_write(cam, 0x12, 0x0d);
@@ -61,7 +60,6 @@ static int ov7630_init(struct sn9c102_device* cam)
                 err += sn9c102_i2c_write(cam, 0x71, 0x00);
                 err += sn9c102_i2c_write(cam, 0x74, 0x21);
                 err += sn9c102_i2c_write(cam, 0x7d, 0xf7);
-
                 break;
         case BRIDGE_SN9C103:
                 err = sn9c102_write_const_regs(cam, {0x00, 0x02}, {0x00, 0x03},
@@ -253,7 +251,7 @@ static int ov7630_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor ov7630 = {
+static const struct sn9c102_sensor ov7630 = {
         .name = "OV7630",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
@@ -408,19 +406,16 @@ int sn9c102_probe_ov7630(struct sn9c102_device* cam)
         switch (sn9c102_get_bridge(cam)) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
-                err = sn9c102_write_const_regs(cam, {0x01, 0x01},
-                                               {0x00, 0x01}, {0x28, 0x17});
-
+                err = sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x00, 0x01},
+                                               {0x28, 0x17});
                 break;
         case BRIDGE_SN9C103: /* do _not_ change anything! */
-                err = sn9c102_write_const_regs(cam, {0x09, 0x01},
-                                               {0x42, 0x01}, {0x28, 0x17},
-                                               {0x44, 0x02});
+                err = sn9c102_write_const_regs(cam, {0x09, 0x01}, {0x42, 0x01},
+                                               {0x28, 0x17}, {0x44, 0x02});
                 pid = sn9c102_i2c_try_read(cam, &ov7630, 0x0a);
-                if (err || pid < 0) { /* try a different initialization */
-                        err = sn9c102_write_reg(cam, 0x01, 0x01);
-                        err += sn9c102_write_reg(cam, 0x00, 0x01);
-                }
+                if (err || pid < 0) /* try a different initialization */
+                        err += sn9c102_write_const_regs(cam, {0x01, 0x01},
+                                                        {0x00, 0x01});
                 break;
         default:
                 break;
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c
index c898e948fe8d..4b6474048a72 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7660.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7660.c
@@ -104,8 +104,8 @@ static int ov7660_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x12, 0x80);
         err += sn9c102_i2c_write(cam, 0x11, 0x09);
         err += sn9c102_i2c_write(cam, 0x00, 0x0A);
-        err += sn9c102_i2c_write(cam, 0x01, 0x78);
-        err += sn9c102_i2c_write(cam, 0x02, 0x90);
+        err += sn9c102_i2c_write(cam, 0x01, 0x80);
+        err += sn9c102_i2c_write(cam, 0x02, 0x80);
         err += sn9c102_i2c_write(cam, 0x03, 0x00);
         err += sn9c102_i2c_write(cam, 0x04, 0x00);
         err += sn9c102_i2c_write(cam, 0x05, 0x08);
@@ -122,7 +122,7 @@ static int ov7660_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x10, 0x20);
         err += sn9c102_i2c_write(cam, 0x11, 0x03);
         err += sn9c102_i2c_write(cam, 0x12, 0x05);
-        err += sn9c102_i2c_write(cam, 0x13, 0xF8);
+        err += sn9c102_i2c_write(cam, 0x13, 0xC7);
         err += sn9c102_i2c_write(cam, 0x14, 0x2C);
         err += sn9c102_i2c_write(cam, 0x15, 0x00);
         err += sn9c102_i2c_write(cam, 0x16, 0x02);
@@ -162,7 +162,7 @@ static int ov7660_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x38, 0x02);
         err += sn9c102_i2c_write(cam, 0x39, 0x43);
         err += sn9c102_i2c_write(cam, 0x3A, 0x00);
-        err += sn9c102_i2c_write(cam, 0x3B, 0x02);
+        err += sn9c102_i2c_write(cam, 0x3B, 0x0A);
         err += sn9c102_i2c_write(cam, 0x3C, 0x6C);
         err += sn9c102_i2c_write(cam, 0x3D, 0x99);
         err += sn9c102_i2c_write(cam, 0x3E, 0x0E);
@@ -281,25 +281,34 @@ static int ov7660_get_ctrl(struct sn9c102_device* cam,
                         return -EIO;
                 break;
         case V4L2_CID_DO_WHITE_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x02);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x02)) < 0)
+                        return -EIO;
                 ctrl->value = (ctrl->value & 0x04) ? 1 : 0;
                 break;
         case V4L2_CID_RED_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x05);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x05)) < 0)
+                        return -EIO;
                 ctrl->value &= 0x7f;
                 break;
         case V4L2_CID_BLUE_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x06);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x06)) < 0)
+                        return -EIO;
                 ctrl->value &= 0x7f;
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x07);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x07)) < 0)
+                        return -EIO;
                 ctrl->value &= 0x7f;
                 break;
+        case SN9C102_V4L2_CID_BAND_FILTER:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x3b)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x08;
+                break;
         case V4L2_CID_GAIN:
                 if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0)
                         return -EIO;
-                ctrl->value &= 0x7f;
+                ctrl->value &= 0x1f;
                 break;
         case V4L2_CID_AUTOGAIN:
                 if ((ctrl->value = sn9c102_i2c_read(cam, 0x13)) < 0)
@@ -335,12 +344,15 @@ static int ov7660_set_ctrl(struct sn9c102_device* cam,
         case SN9C102_V4L2_CID_GREEN_BALANCE:
                 err += sn9c102_write_reg(cam, ctrl->value, 0x07);
                 break;
+        case SN9C102_V4L2_CID_BAND_FILTER:
+                err += sn9c102_i2c_write(cam, ctrl->value << 3, 0x3b);
+                break;
         case V4L2_CID_GAIN:
-                err += sn9c102_i2c_write(cam, 0x00, ctrl->value);
+                err += sn9c102_i2c_write(cam, 0x00, 0x60 + ctrl->value);
                 break;
         case V4L2_CID_AUTOGAIN:
-                err += sn9c102_i2c_write(cam, 0x13, 0xf0 | ctrl->value |
-                                                    (ctrl->value << 1));
+                err += sn9c102_i2c_write(cam, 0x13, 0xc0 |
+                                                    (ctrl->value * 0x07));
                 break;
         default:
                 return -EINVAL;
@@ -386,7 +398,7 @@ static int ov7660_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor ov7660 = {
+static const struct sn9c102_sensor ov7660 = {
         .name = "OV7660",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C105 | BRIDGE_SN9C120,
@@ -401,9 +413,9 @@ static struct sn9c102_sensor ov7660 = {
                         .type = V4L2_CTRL_TYPE_INTEGER,
                         .name = "global gain",
                         .minimum = 0x00,
-                        .maximum = 0x7f,
+                        .maximum = 0x1f,
                         .step = 0x01,
-                        .default_value = 0x0a,
+                        .default_value = 0x09,
                         .flags = 0,
                 },
                 {
@@ -413,7 +425,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0xff,
                         .step = 0x01,
-                        .default_value = 0x50,
+                        .default_value = 0x27,
                         .flags = 0,
                 },
                 {
@@ -433,7 +445,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x1f,
+                        .default_value = 0x14,
                         .flags = 0,
                 },
                 {
@@ -443,7 +455,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x1e,
+                        .default_value = 0x14,
                         .flags = 0,
                 },
                 {
@@ -453,7 +465,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x01,
                         .step = 0x01,
-                        .default_value = 0x00,
+                        .default_value = 0x01,
                         .flags = 0,
                 },
                 {
@@ -463,7 +475,17 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x20,
+                        .default_value = 0x14,
+                        .flags = 0,
+                },
+                {
+                        .id = SN9C102_V4L2_CID_BAND_FILTER,
+                        .type = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name = "band filter",
+                        .minimum = 0x00,
+                        .maximum = 0x01,
+                        .step = 0x01,
+                        .default_value = 0x00,
                         .flags = 0,
                 },
         },
@@ -508,6 +530,7 @@ int sn9c102_probe_ov7660(struct sn9c102_device* cam)
                 return -EIO;
         if (pid != 0x76 || ver != 0x60)
                 return -ENODEV;
+
         sn9c102_attach_sensor(cam, &ov7660);
 
         return 0;
diff --git a/drivers/media/video/sn9c102/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c
index 67151964801f..360f2a848bc0 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas106b.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas106b.c
@@ -163,7 +163,7 @@ static int pas106b_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor pas106b = {
+static const struct sn9c102_sensor pas106b = {
         .name = "PAS106B",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102,
@@ -273,23 +273,21 @@ static struct sn9c102_sensor pas106b = {
 
 int sn9c102_probe_pas106b(struct sn9c102_device* cam)
 {
-        int r0 = 0, r1 = 0, err;
+        int r0 = 0, r1 = 0;
         unsigned int pid = 0;
 
         /*
            Minimal initialization to enable the I2C communication
            NOTE: do NOT change the values!
         */
-        err = sn9c102_write_const_regs(cam,
-                                       {0x01, 0x01}, /* sensor power down */
-                                       {0x00, 0x01}, /* sensor power on */
-                                       {0x28, 0x17});/* sensor clock 24 MHz */
-        if (err)
+        if (sn9c102_write_const_regs(cam,
+                                     {0x01, 0x01}, /* sensor power down */
+                                     {0x00, 0x01}, /* sensor power on */
+                                    {0x28, 0x17})) /* sensor clock at 24 MHz */
                 return -EIO;
 
         r0 = sn9c102_i2c_try_read(cam, &pas106b, 0x00);
         r1 = sn9c102_i2c_try_read(cam, &pas106b, 0x01);
-
         if (r0 < 0 || r1 < 0)
                 return -EIO;
 
diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
index c1b8d6b63b47..ca4a1506ed3d 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
@@ -35,29 +35,28 @@ static int pas202bcb_init(struct sn9c102_device* cam)
         switch (sn9c102_get_bridge(cam)) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
-                err = sn9c102_write_const_regs(cam, {0x00, 0x10},
-                                               {0x00, 0x11}, {0x00, 0x14},
-                                               {0x20, 0x17}, {0x30, 0x19},
-                                               {0x09, 0x18});
+                err = sn9c102_write_const_regs(cam, {0x00, 0x10}, {0x00, 0x11},
+                                               {0x00, 0x14}, {0x20, 0x17},
+                                               {0x30, 0x19}, {0x09, 0x18});
                 break;
         case BRIDGE_SN9C103:
-                err = sn9c102_write_const_regs(cam, {0x00, 0x02},
-                                               {0x00, 0x03}, {0x1a, 0x04},
-                                               {0x20, 0x05}, {0x20, 0x06},
-                                               {0x20, 0x07}, {0x00, 0x10},
-                                               {0x00, 0x11}, {0x00, 0x14},
-                                               {0x20, 0x17}, {0x30, 0x19},
-                                               {0x09, 0x18}, {0x02, 0x1c},
-                                               {0x03, 0x1d}, {0x0f, 0x1e},
-                                               {0x0c, 0x1f}, {0x00, 0x20},
-                                               {0x10, 0x21}, {0x20, 0x22},
-                                               {0x30, 0x23}, {0x40, 0x24},
-                                               {0x50, 0x25}, {0x60, 0x26},
-                                               {0x70, 0x27}, {0x80, 0x28},
-                                               {0x90, 0x29}, {0xa0, 0x2a},
-                                               {0xb0, 0x2b}, {0xc0, 0x2c},
-                                               {0xd0, 0x2d}, {0xe0, 0x2e},
-                                               {0xf0, 0x2f}, {0xff, 0x30});
+                err = sn9c102_write_const_regs(cam, {0x00, 0x02}, {0x00, 0x03},
+                                               {0x1a, 0x04}, {0x20, 0x05},
+                                               {0x20, 0x06}, {0x20, 0x07},
+                                               {0x00, 0x10}, {0x00, 0x11},
+                                               {0x00, 0x14}, {0x20, 0x17},
+                                               {0x30, 0x19}, {0x09, 0x18},
+                                               {0x02, 0x1c}, {0x03, 0x1d},
+                                               {0x0f, 0x1e}, {0x0c, 0x1f},
+                                               {0x00, 0x20}, {0x10, 0x21},
+                                               {0x20, 0x22}, {0x30, 0x23},
+                                               {0x40, 0x24}, {0x50, 0x25},
+                                               {0x60, 0x26}, {0x70, 0x27},
+                                               {0x80, 0x28}, {0x90, 0x29},
+                                               {0xa0, 0x2a}, {0xb0, 0x2b},
+                                               {0xc0, 0x2c}, {0xd0, 0x2d},
+                                               {0xe0, 0x2e}, {0xf0, 0x2f},
+                                               {0xff, 0x30});
                 break;
         default:
                 break;
@@ -197,7 +196,7 @@ static int pas202bcb_set_crop(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor pas202bcb = {
+static const struct sn9c102_sensor pas202bcb = {
         .name = "PAS202BCB",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103,
@@ -313,9 +312,8 @@ int sn9c102_probe_pas202bcb(struct sn9c102_device* cam)
                                                {0x28, 0x17});/* clock 24 MHz */
                 break;
         case BRIDGE_SN9C103: /* do _not_ change anything! */
-                err = sn9c102_write_const_regs(cam, {0x09, 0x01},
-                                               {0x44, 0x01}, {0x44, 0x02},
-                                               {0x29, 0x17});
+                err = sn9c102_write_const_regs(cam, {0x09, 0x01}, {0x44, 0x01},
+                                               {0x44, 0x02}, {0x29, 0x17});
                 break;
         default:
                 break;
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h
index 1bbf64c897a2..2d7d786b8430 100644
--- a/drivers/media/video/sn9c102/sn9c102_sensor.h
+++ b/drivers/media/video/sn9c102/sn9c102_sensor.h
@@ -22,7 +22,7 @@
 #define _SN9C102_SENSOR_H_
 
 #include <linux/usb.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/device.h>
 #include <linux/stddef.h>
 #include <linux/errno.h>
@@ -74,7 +74,7 @@ sn9c102_match_id(struct sn9c102_device* cam, const struct usb_device_id *id);
 /* Attach a probed sensor to the camera. */
 extern void
 sn9c102_attach_sensor(struct sn9c102_device* cam,
-                      struct sn9c102_sensor* sensor);
+                      const struct sn9c102_sensor* sensor);
 
 /*
    Read/write routines: they always return -1 on error, 0 or the read value
@@ -85,10 +85,11 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
 */
 
 /* The "try" I2C I/O versions are used when probing the sensor */
-extern int sn9c102_i2c_try_write(struct sn9c102_device*,struct sn9c102_sensor*,
-                                 u8 address, u8 value);
-extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
-                                u8 address);
+extern int sn9c102_i2c_try_write(struct sn9c102_device*,
+                                 const struct sn9c102_sensor*, u8 address,
+                                 u8 value);
+extern int sn9c102_i2c_try_read(struct sn9c102_device*,
+                                const struct sn9c102_sensor*, u8 address);
 
 /*
    These must be used if and only if the sensor doesn't implement the standard
@@ -102,29 +103,31 @@ extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
    byte.
 */
 extern int sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
-                                     struct sn9c102_sensor* sensor, u8 n,
+                                     const struct sn9c102_sensor* sensor, u8 n,
                                      u8 data0, u8 data1, u8 data2, u8 data3,
                                      u8 data4, u8 data5);
 extern int sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
-                                    struct sn9c102_sensor* sensor, u8 data0,
-                                    u8 data1, u8 n, u8 buffer[]);
+                                    const struct sn9c102_sensor* sensor,
+                                    u8 data0, u8 data1, u8 n, u8 buffer[]);
 
 /* To be used after the sensor struct has been attached to the camera struct */
 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_read_reg(struct sn9c102_device*, u16 index);
 extern int sn9c102_pread_reg(struct sn9c102_device*, u16 index);
 extern int sn9c102_write_reg(struct sn9c102_device*, u8 value, u16 index);
 extern int sn9c102_write_regs(struct sn9c102_device*, const u8 valreg[][2],
                               int count);
 /*
- * Write multiple registers with constant values.  For example:
- * sn9c102_write_const_regs(cam, {0x00, 0x14}, {0x60, 0x17}, {0x0f, 0x18});
- */
-#define sn9c102_write_const_regs(device, data...) \
-        ({ const static u8 _data[][2] = {data}; \
-        sn9c102_write_regs(device, _data, ARRAY_SIZE(_data)); })
+   Write multiple registers with constant values. For example:
+   sn9c102_write_const_regs(cam, {0x00, 0x14}, {0x60, 0x17}, {0x0f, 0x18});
+   Register adresses must be < 256.
+*/
+#define sn9c102_write_const_regs(sn9c102_device, data...)                     \
+        ({ const static u8 _valreg[][2] = {data};                             \
+        sn9c102_write_regs(sn9c102_device, _valreg, ARRAY_SIZE(_valreg)); })
 
 /*****************************************************************************/
 
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
index 0e7ec8662c70..e7d2de2bace1 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
@@ -88,7 +88,7 @@ static int tas5110c1b_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor tas5110c1b = {
+static const struct sn9c102_sensor tas5110c1b = {
         .name = "TAS5110C1B",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102,
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110d.c b/drivers/media/video/sn9c102/sn9c102_tas5110d.c
index 83a39e8b5e71..d32fdbccdc5e 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110d.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110d.c
@@ -68,7 +68,7 @@ static int tas5110d_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor tas5110d = {
+static const struct sn9c102_sensor tas5110d = {
         .name = "TAS5110D",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102,
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
index 50406503fc40..56fb1d575a8a 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
@@ -89,7 +89,7 @@ static int tas5130d1b_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor tas5130d1b = {
+static const struct sn9c102_sensor tas5130d1b = {
         .name = "TAS5130D1B",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102,
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 1b9b0742f753..c40b92ce1fad 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -205,9 +205,13 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                 /* 0x01 -> ??? no change ??? */
                 /* 0x02 -> PAL BDGHI / SECAM L */
                 /* 0x04 -> ??? PAL others / SECAM others ??? */
-                cb &= ~0x02;
-                if (t->std & V4L2_STD_SECAM)
-                        cb |= 0x02;
+                cb &= ~0x03;
+                if (t->std & V4L2_STD_SECAM_L) //also valid for V4L2_STD_SECAM
+                        cb |= PHILIPS_MF_SET_PAL_L;
+                else if (t->std & V4L2_STD_SECAM_LC)
+                        cb |= PHILIPS_MF_SET_PAL_L2;
+                else /* V4L2_STD_B|V4L2_STD_GH */
+                        cb |= PHILIPS_MF_SET_BG;
                 break;
 
         case TUNER_TEMIC_4046FM5:
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index a2da5d2affff..c9bf9dbc2ea3 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -26,7 +26,6 @@
 #include <linux/videodev.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
 
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
index a0fd82b924f2..e4cb99c1f94b 100644
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
 
 config USB_VICAM
         tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && VIDEO_V4L1 && EXPERIMENTAL
+        depends on VIDEO_V4L1 && EXPERIMENTAL
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you have 3com homeconnect camera (vicam).
@@ -13,7 +13,7 @@ config USB_VICAM
 
 config USB_IBMCAM
         tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_DEV && VIDEO_V4L1
+        depends on VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -28,7 +28,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
         tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_DEV && VIDEO_V4L1
+        depends on VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you want support for webcams based on a Konica
@@ -39,7 +39,7 @@ config USB_KONICAWC
 
 config USB_QUICKCAM_MESSENGER
         tristate "USB Logitech Quickcam Messenger"
-        depends on USB && VIDEO_DEV && VIDEO_V4L1
+        depends on VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y or M here to enable support for the USB Logitech Quickcam
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 687f026753b2..37ce36b9e587 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 876fd2768242..982b115193f8 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -28,7 +28,7 @@
  *
  * Portions of this code were also copied from usbvideo.c
  *
- * Special thanks to the the whole team at Sourceforge for help making
+ * Special thanks to the whole team at Sourceforge for help making
  * this driver become a reality.  Notably:
  * Andy Armstrong who reverse engineered the color encoding and
  * Pavel Machek and Chris Cheney who worked on reverse engineering the
diff --git a/drivers/media/video/usbvision/Kconfig b/drivers/media/video/usbvision/Kconfig
index c43a5d899091..fc24ef05b3f3 100644
--- a/drivers/media/video/usbvision/Kconfig
+++ b/drivers/media/video/usbvision/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_USBVISION
         tristate "USB video devices based on Nogatech NT1003/1004/1005"
-        depends on I2C && VIDEO_V4L2 && USB
+        depends on I2C && VIDEO_V4L2
         select VIDEO_TUNER
         select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
         ---help---
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index bcb551adb7e6..9118a6227ea6 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -30,7 +30,6 @@
 #include <linux/mm.h>
 #include <linux/utsname.h>
 #include <linux/highmem.h>
-#include <linux/smp_lock.h>
 #include <linux/videodev.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 216704170a4c..aa3258bbb4af 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -52,7 +52,6 @@
 #include <linux/mm.h>
 #include <linux/utsname.h>
 #include <linux/highmem.h>
-#include <linux/smp_lock.h>
 #include <linux/videodev.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index d2c1ae0dbfba..ede8543818bf 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -23,7 +23,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/file.h>
@@ -128,7 +127,7 @@ set_v4l_control(struct inode            *inode,
 
 /* ----------------------------------------------------------------- */
 
-static int palette2pixelformat[] = {
+const static unsigned int palette2pixelformat[] = {
         [VIDEO_PALETTE_GREY]    = V4L2_PIX_FMT_GREY,
         [VIDEO_PALETTE_RGB555]  = V4L2_PIX_FMT_RGB555,
         [VIDEO_PALETTE_RGB565]  = V4L2_PIX_FMT_RGB565,
@@ -146,7 +145,7 @@ static int palette2pixelformat[] = {
         [VIDEO_PALETTE_YUV422P] = V4L2_PIX_FMT_YUV422P,
 };
 
-static unsigned int
+static unsigned int __attribute_pure__
 palette_to_pixelformat(unsigned int palette)
 {
         if (palette < ARRAY_SIZE(palette2pixelformat))
@@ -155,8 +154,8 @@ palette_to_pixelformat(unsigned int palette)
                 return 0;
 }
 
-static unsigned int
-pixelformat_to_palette(int pixelformat)
+static unsigned int __attribute_const__
+pixelformat_to_palette(unsigned int pixelformat)
 {
         int     palette = 0;
         switch (pixelformat)
@@ -617,6 +616,8 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         case VIDIOCSPICT: /*  set tone controls & partial capture format  */
         {
                 struct video_picture    *pict = arg;
+                int mem_err = 0, ovl_err = 0;
+
                 memset(&fbuf2, 0, sizeof(fbuf2));
 
                 set_v4l_control(inode, file,
@@ -629,33 +630,59 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                                 V4L2_CID_SATURATION, pict->colour, drv);
                 set_v4l_control(inode, file,
                                 V4L2_CID_WHITENESS, pict->whiteness, drv);
+                /*
+                 * V4L1 uses this ioctl to set both memory capture and overlay
+                 * pixel format, while V4L2 has two different ioctls for this.
+                 * Some cards may not support one or the other, and may support
+                 * different pixel formats for memory vs overlay.
+                 */
 
                 fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
-                if (err < 0)
+                /* If VIDIOC_G_FMT failed, then the driver likely doesn't
+                   support memory capture.  Trying to set the memory capture
+                   parameters would be pointless.  */
+                if (err < 0) {
                         dprintk("VIDIOCSPICT / VIDIOC_G_FMT: %d\n",err);
-                if (fmt2->fmt.pix.pixelformat !=
-                    palette_to_pixelformat(pict->palette)) {
+                        mem_err = -1000;  /* didn't even try */
+                } else if (fmt2->fmt.pix.pixelformat !=
+                         palette_to_pixelformat(pict->palette)) {
                         fmt2->fmt.pix.pixelformat = palette_to_pixelformat(
                                 pict->palette);
-                        err = drv(inode, file, VIDIOC_S_FMT, fmt2);
-                        if (err < 0)
-                                dprintk("VIDIOCSPICT / VIDIOC_S_FMT: %d\n",err);
+                        mem_err = drv(inode, file, VIDIOC_S_FMT, fmt2);
+                        if (mem_err < 0)
+                                dprintk("VIDIOCSPICT / VIDIOC_S_FMT: %d\n",
+                                        mem_err);
                 }
 
                 err = drv(inode, file, VIDIOC_G_FBUF, &fbuf2);
-                if (err < 0)
+                /* If VIDIOC_G_FBUF failed, then the driver likely doesn't
+                   support overlay.  Trying to set the overlay parameters
+                   would be quite pointless.  */
+                if (err < 0) {
                         dprintk("VIDIOCSPICT / VIDIOC_G_FBUF: %d\n",err);
-                if (fbuf2.fmt.pixelformat !=
-                    palette_to_pixelformat(pict->palette)) {
+                        ovl_err = -1000;  /* didn't even try */
+                } else if (fbuf2.fmt.pixelformat !=
+                         palette_to_pixelformat(pict->palette)) {
                         fbuf2.fmt.pixelformat = palette_to_pixelformat(
                                 pict->palette);
-                        err = drv(inode, file, VIDIOC_S_FBUF, &fbuf2);
-                        if (err < 0)
-                                dprintk("VIDIOCSPICT / VIDIOC_S_FBUF: %d\n",err);
-                        err = 0; /* likely fails for non-root */
+                        ovl_err = drv(inode, file, VIDIOC_S_FBUF, &fbuf2);
+                        if (ovl_err < 0)
+                                dprintk("VIDIOCSPICT / VIDIOC_S_FBUF: %d\n",
+                                        ovl_err);
                 }
+                if (ovl_err < 0 && mem_err < 0)
+                        /* ioctl failed, couldn't set either parameter */
+                        if (mem_err != -1000) {
+                            err = mem_err;
+                        } else if (ovl_err == -EPERM) {
+                            err = 0;
+                        } else {
+                            err = ovl_err;
+                        }
+                else
+                        err = 0;
                 break;
         }
         case VIDIOCGTUNER: /*  get tuner information  */
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 49f1df74aa21..13ee550d3215 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -47,7 +47,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 459786ff459a..a32dfbe0585a 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -702,9 +702,7 @@ videobuf_qbuf(struct videobuf_queue *q,
                 dprintk(1,"qbuf: memory type is wrong.\n");
                 goto done;
         }
-        if (buf->state == STATE_QUEUED ||
-            buf->state == STATE_PREPARED ||
-            buf->state == STATE_ACTIVE) {
+        if (buf->state != STATE_NEEDS_INIT && buf->state != STATE_IDLE) {
                 dprintk(1,"qbuf: buffer is already queued or active.\n");
                 goto done;
         }
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 80ac5f86d9e5..b876aca69c73 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -434,13 +433,43 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
         int                  ret = -EINVAL;
 
         if ( (vfd->debug & V4L2_DEBUG_IOCTL) &&
-                                !(vfd->debug | V4L2_DEBUG_IOCTL_ARG)) {
+                                !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
                 v4l_print_ioctl(vfd->name, cmd);
         }
 
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        /***********************************************************
+         Handles calls to the obsoleted V4L1 API
+         Due to the nature of VIDIOCGMBUF, each driver that supports
+         V4L1 should implement its own handler for this ioctl.
+         ***********************************************************/
+
+        /* --- streaming capture ------------------------------------- */
+        if (cmd == VIDIOCGMBUF) {
+                struct video_mbuf *p=arg;
+
+                memset(p,0,sizeof(p));
+
+                if (!vfd->vidiocgmbuf)
+                        return ret;
+                ret=vfd->vidiocgmbuf(file, fh, p);
+                if (!ret)
+                        dbgarg (cmd, "size=%d, frames=%d, offsets=0x%08lx\n",
+                                                p->size, p->frames,
+                                                (unsigned long)p->offsets);
+                return ret;
+        }
+
+        /********************************************************
+         All other V4L1 calls are handled by v4l1_compat module.
+         Those calls will be translated into V4L2 calls, and
+         __video_do_ioctl will be called again, with one or more
+         V4L2 ioctls.
+         ********************************************************/
         if (_IOC_TYPE(cmd)=='v')
                 return v4l_compat_translate_ioctl(inode,file,cmd,arg,
                                                 __video_do_ioctl);
+#endif
 
         switch(cmd) {
         /* --- capabilities ------------------------------------------ */
@@ -792,24 +821,6 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                 ret=vfd->vidioc_overlay(file, fh, *i);
                 break;
         }
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        /* --- streaming capture ------------------------------------- */
-        case VIDIOCGMBUF:
-        {
-                struct video_mbuf *p=arg;
-
-                memset(p,0,sizeof(p));
-
-                if (!vfd->vidiocgmbuf)
-                        break;
-                ret=vfd->vidiocgmbuf(file, fh, p);
-                if (!ret)
-                        dbgarg (cmd, "size=%d, frames=%d, offsets=0x%08lx\n",
-                                                p->size, p->frames,
-                                                (unsigned long)p->offsets);
-                break;
-        }
-#endif
         case VIDIOC_G_FBUF:
         {
                 struct v4l2_framebuffer *p=arg;
diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig
index a859a6920189..47cd93f9c7de 100644
--- a/drivers/media/video/zc0301/Kconfig
+++ b/drivers/media/video/zc0301/Kconfig
@@ -1,6 +1,6 @@
 config USB_ZC0301
         tristate "USB ZC0301[P] Image Processor and Control Chip support"
-        depends on USB && VIDEO_V4L1
+        depends on VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on the ZC0301 or
           ZC0301P Image Processors and Control Chips.
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 074323733352..cf0ed6cbb0e3 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -2034,7 +2034,7 @@ zoran_do_ioctl (struct inode *inode,
          * but moving the free code outside the munmap() handler fixes
          * all this... If someone knows why, please explain me (Ronald)
          */
-        if (!!mutex_trylock(&zr->resource_lock)) {
+        if (mutex_trylock(&zr->resource_lock)) {
                 /* we obtained it! Let's try to free some things */
                 if (fh->jpg_buffers.ready_to_be_freed)
                         jpg_fbuffer_free(file);
diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
index 71037f91c222..c88cc75ab49b 100644
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
@@ -1,5 +1,6 @@
 
 menu "Fusion MPT device support"
+        depends on PCI
 
 config FUSION
         bool
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt
index d6b4c607453b..ddc7ae029dd3 100644
--- a/drivers/message/fusion/lsi/mpi_history.txt
+++ b/drivers/message/fusion/lsi/mpi_history.txt
@@ -571,7 +571,7 @@ mpi_fc.h
  *  11-02-00  01.01.01  Original release for post 1.0 work
  *  12-04-00  01.01.02  Added messages for Common Transport Send and
  *                      Primitive Send.
- *  01-09-01  01.01.03  Modifed some of the new flags to have an MPI prefix
+ *  01-09-01  01.01.03  Modified some of the new flags to have an MPI prefix
  *                      and modified the FcPrimitiveSend flags.
  *  01-25-01  01.01.04  Move InitiatorIndex in LinkServiceRsp reply to a larger
  *                      field.
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 97471af4309c..5021d1a2a1d4 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -3585,7 +3585,7 @@ initChainBuffers(MPT_ADAPTER *ioc)
          * index = chain_idx
          *
          * Calculate the number of chain buffers needed(plus 1) per I/O
-         * then multiply the the maximum number of simultaneous cmds
+         * then multiply the maximum number of simultaneous cmds
          *
          * num_sge = num sge in request frame + last chain buffer
          * scale = num sge per chain buffer if no chain element
diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index 6443392bffff..f4ac21e5771e 100644
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -1,5 +1,6 @@
 
 menu "I2O device support"
+        depends on PCI
 
 config I2O
         tristate "I2O support"
diff --git a/drivers/message/i2o/i2o_lan.h b/drivers/message/i2o/i2o_lan.h
deleted file mode 100644
index 6502b817df58..000000000000
--- a/drivers/message/i2o/i2o_lan.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *      i2o_lan.h                       I2O LAN Class definitions
- *
- *      I2O LAN CLASS OSM               May 26th 2000
- *
- *      (C) Copyright 1999, 2000        University of Helsinki,
- *                                      Department of Computer Science
- *
- *      This code is still under development / test.
- *
- *      Author:         Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
- *                      Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
- *                      Taneli Vähäkangas <Taneli.Vahakangas@cs.Helsinki.FI>
- */
-
-#ifndef _I2O_LAN_H
-#define _I2O_LAN_H
-
-/* Default values for tunable parameters first */
-
-#define I2O_LAN_MAX_BUCKETS_OUT 96
-#define I2O_LAN_BUCKET_THRESH   18      /* 9 buckets in one message */
-#define I2O_LAN_RX_COPYBREAK    200
-#define I2O_LAN_TX_TIMEOUT      (1*HZ)
-#define I2O_LAN_TX_BATCH_MODE   2       /* 2=automatic, 1=on, 0=off */
-#define I2O_LAN_EVENT_MASK      0       /* 0=None, 0xFFC00002=All */
-
-/* LAN types */
-#define I2O_LAN_ETHERNET        0x0030
-#define I2O_LAN_100VG           0x0040
-#define I2O_LAN_TR              0x0050
-#define I2O_LAN_FDDI            0x0060
-#define I2O_LAN_FIBRE_CHANNEL   0x0070
-#define I2O_LAN_UNKNOWN         0x00000000
-
-/* Connector types */
-
-/* Ethernet */
-#define I2O_LAN_AUI             (I2O_LAN_ETHERNET << 4) + 0x00000001
-#define I2O_LAN_10BASE5         (I2O_LAN_ETHERNET << 4) + 0x00000002
-#define I2O_LAN_FIORL           (I2O_LAN_ETHERNET << 4) + 0x00000003
-#define I2O_LAN_10BASE2         (I2O_LAN_ETHERNET << 4) + 0x00000004
-#define I2O_LAN_10BROAD36       (I2O_LAN_ETHERNET << 4) + 0x00000005
-#define I2O_LAN_10BASE_T        (I2O_LAN_ETHERNET << 4) + 0x00000006
-#define I2O_LAN_10BASE_FP       (I2O_LAN_ETHERNET << 4) + 0x00000007
-#define I2O_LAN_10BASE_FB       (I2O_LAN_ETHERNET << 4) + 0x00000008
-#define I2O_LAN_10BASE_FL       (I2O_LAN_ETHERNET << 4) + 0x00000009
-#define I2O_LAN_100BASE_TX      (I2O_LAN_ETHERNET << 4) + 0x0000000A
-#define I2O_LAN_100BASE_FX      (I2O_LAN_ETHERNET << 4) + 0x0000000B
-#define I2O_LAN_100BASE_T4      (I2O_LAN_ETHERNET << 4) + 0x0000000C
-#define I2O_LAN_1000BASE_SX     (I2O_LAN_ETHERNET << 4) + 0x0000000D
-#define I2O_LAN_1000BASE_LX     (I2O_LAN_ETHERNET << 4) + 0x0000000E
-#define I2O_LAN_1000BASE_CX     (I2O_LAN_ETHERNET << 4) + 0x0000000F
-#define I2O_LAN_1000BASE_T      (I2O_LAN_ETHERNET << 4) + 0x00000010
-
-/* AnyLAN */
-#define I2O_LAN_100VG_ETHERNET  (I2O_LAN_100VG << 4) + 0x00000001
-#define I2O_LAN_100VG_TR        (I2O_LAN_100VG << 4) + 0x00000002
-
-/* Token Ring */
-#define I2O_LAN_4MBIT           (I2O_LAN_TR << 4) + 0x00000001
-#define I2O_LAN_16MBIT          (I2O_LAN_TR << 4) + 0x00000002
-
-/* FDDI */
-#define I2O_LAN_125MBAUD        (I2O_LAN_FDDI << 4) + 0x00000001
-
-/* Fibre Channel */
-#define I2O_LAN_POINT_POINT     (I2O_LAN_FIBRE_CHANNEL << 4) + 0x00000001
-#define I2O_LAN_ARB_LOOP        (I2O_LAN_FIBRE_CHANNEL << 4) + 0x00000002
-#define I2O_LAN_PUBLIC_LOOP     (I2O_LAN_FIBRE_CHANNEL << 4) + 0x00000003
-#define I2O_LAN_FABRIC          (I2O_LAN_FIBRE_CHANNEL << 4) + 0x00000004
-
-#define I2O_LAN_EMULATION       0x00000F00
-#define I2O_LAN_OTHER           0x00000F01
-#define I2O_LAN_DEFAULT         0xFFFFFFFF
-
-/* LAN class functions */
-
-#define LAN_PACKET_SEND         0x3B
-#define LAN_SDU_SEND            0x3D
-#define LAN_RECEIVE_POST        0x3E
-#define LAN_RESET               0x35
-#define LAN_SUSPEND             0x37
-
-/* LAN DetailedStatusCode defines */
-#define I2O_LAN_DSC_SUCCESS                     0x00
-#define I2O_LAN_DSC_DEVICE_FAILURE              0x01
-#define I2O_LAN_DSC_DESTINATION_NOT_FOUND       0x02
-#define I2O_LAN_DSC_TRANSMIT_ERROR              0x03
-#define I2O_LAN_DSC_TRANSMIT_ABORTED            0x04
-#define I2O_LAN_DSC_RECEIVE_ERROR               0x05
-#define I2O_LAN_DSC_RECEIVE_ABORTED             0x06
-#define I2O_LAN_DSC_DMA_ERROR                   0x07
-#define I2O_LAN_DSC_BAD_PACKET_DETECTED         0x08
-#define I2O_LAN_DSC_OUT_OF_MEMORY               0x09
-#define I2O_LAN_DSC_BUCKET_OVERRUN              0x0A
-#define I2O_LAN_DSC_IOP_INTERNAL_ERROR          0x0B
-#define I2O_LAN_DSC_CANCELED                    0x0C
-#define I2O_LAN_DSC_INVALID_TRANSACTION_CONTEXT 0x0D
-#define I2O_LAN_DSC_DEST_ADDRESS_DETECTED       0x0E
-#define I2O_LAN_DSC_DEST_ADDRESS_OMITTED        0x0F
-#define I2O_LAN_DSC_PARTIAL_PACKET_RETURNED     0x10
-#define I2O_LAN_DSC_SUSPENDED                   0x11
-
-struct i2o_packet_info {
-        u32 offset:24;
-        u32 flags:8;
-        u32 len:24;
-        u32 status:8;
-};
-
-struct i2o_bucket_descriptor {
-        u32 context;            /* FIXME: 64bit support */
-        struct i2o_packet_info packet_info[1];
-};
-
-/* Event Indicator Mask Flags for LAN OSM */
-
-#define I2O_LAN_EVT_LINK_DOWN           0x01
-#define I2O_LAN_EVT_LINK_UP             0x02
-#define I2O_LAN_EVT_MEDIA_CHANGE        0x04
-
-#include <linux/netdevice.h>
-#include <linux/fddidevice.h>
-
-struct i2o_lan_local {
-        u8 unit;
-        struct i2o_device *i2o_dev;
-
-        struct fddi_statistics stats;   /* see also struct net_device_stats */
-        unsigned short (*type_trans) (struct sk_buff *, struct net_device *);
-        atomic_t buckets_out;   /* nbr of unused buckets on DDM */
-        atomic_t tx_out;        /* outstanding TXes */
-        u8 tx_count;            /* packets in one TX message frame */
-        u16 tx_max_out;         /* DDM's Tx queue len */
-        u8 sgl_max;             /* max SGLs in one message frame */
-        u32 m;                  /* IOP address of the batch msg frame */
-
-        struct work_struct i2o_batch_send_task;
-        int send_active;
-        struct sk_buff **i2o_fbl;       /* Free bucket list (to reuse skbs) */
-        int i2o_fbl_tail;
-        spinlock_t fbl_lock;
-
-        spinlock_t tx_lock;
-
-        u32 max_size_mc_table;  /* max number of multicast addresses */
-
-        /* LAN OSM configurable parameters are here: */
-
-        u16 max_buckets_out;    /* max nbr of buckets to send to DDM */
-        u16 bucket_thresh;      /* send more when this many used */
-        u16 rx_copybreak;
-
-        u8 tx_batch_mode;       /* Set when using batch mode sends */
-        u32 i2o_event_mask;     /* To turn on interesting event flags */
-};
-
-#endif                          /* _I2O_LAN_H */
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ab6e985275b2..a20a51efe118 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Multifunction device drivers"
+        depends on HAS_IOMEM
 
 config MFD_SM501
         tristate "Support for Silicon Motion SM501"
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index b023eae3c3ec..7772bd1d92b4 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -21,7 +21,6 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a3c525b2616a..2f2fbffafbe0 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -25,6 +25,15 @@ config IBM_ASM
           information on the specific driver level and support statement
           for your IBM server.
 
+config PHANTOM
+        tristate "Sensable PHANToM"
+        depends on PCI
+        help
+          Say Y here if you want to build a driver for Sensable PHANToM device.
+
+          If you choose to build module, its name will be phantom. If unsure,
+          say N here.
+
 
           If unsure, say N.
 
@@ -121,7 +130,7 @@ config SONY_LAPTOP
 
           Read <file:Documentation/sony-laptop.txt> for more information.
 
-config SONY_LAPTOP_OLD
+config SONYPI_COMPAT
         bool "Sonypi compatibility"
         depends on SONY_LAPTOP
           ---help---
@@ -178,4 +187,13 @@ config THINKPAD_ACPI_BAY
 
           If you are not sure, say Y here.
 
+config BLINK
+        tristate "Keyboard blink driver"
+        help
+          Driver that when loaded will blink the keyboard LEDs continuously.
+          This is useful for debugging and for kernels that cannot necessarily
+          output something to the screen like kexec kernels to give the user
+          a visual indication that the kernel is doing something.
+
+
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index e32516459138..5b6d46de005c 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -7,9 +7,11 @@ obj-$(CONFIG_IBM_ASM)		+= ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)     += hdpuftrs/
 obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
 obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
+obj-$(CONFIG_BLINK)             += blink.o
 obj-$(CONFIG_LKDTM)             += lkdtm.o
 obj-$(CONFIG_TIFM_CORE)         += tifm_core.o
 obj-$(CONFIG_TIFM_7XX1)         += tifm_7xx1.o
+obj-$(CONFIG_PHANTOM)           += phantom.o
 obj-$(CONFIG_SGI_IOC4)          += ioc4.o
 obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
 obj-$(CONFIG_THINKPAD_ACPI)     += thinkpad_acpi.o
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index 65c32a95e121..4f9060a2a2f2 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -30,7 +30,7 @@
  *  Eric Burghard  - LED display support for W1N
  *  Josh Green     - Light Sens support
  *  Thomas Tuttle  - His first patch for led support was very helpfull
- *
+ *  Sam Lin        - GPS support
  */
 
 #include <linux/autoconf.h>
@@ -48,7 +48,7 @@
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
 
-#define ASUS_LAPTOP_VERSION "0.41"
+#define ASUS_LAPTOP_VERSION "0.42"
 
 #define ASUS_HOTK_NAME          "Asus Laptop Support"
 #define ASUS_HOTK_CLASS         "hotkey"
@@ -83,6 +83,7 @@
 #define PLED_ON     0x20        //Phone LED
 #define GLED_ON     0x40        //Gaming LED
 #define LCD_ON      0x80        //LCD backlight
+#define GPS_ON      0x100       //GPS
 
 #define ASUS_LOG    ASUS_HOTK_FILE ": "
 #define ASUS_ERR    KERN_ERR    ASUS_LOG
@@ -148,7 +149,7 @@ ASUS_HANDLE(display_set, ASUS_HOTK_PREFIX "SDSP");
 ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD",    /*  A6B, A6K A6R A7D F3JM L4R M6R A3G
                                                            M6A M6V VX-1 V6J V6V W3Z */
             "\\_SB.PCI0.P0P2.VGA.GETD", /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V
-                                           S5A M5A z33A W1Jc W2V */
+                                           S5A M5A z33A W1Jc W2V G1 */
             "\\_SB.PCI0.P0P3.VGA.GETD", /* A6V A6Q */
             "\\_SB.PCI0.P0PA.VGA.GETD", /* A6T, A6M */
             "\\_SB.PCI0.PCI1.VGAC.NMAP",        /* L3C */
@@ -162,6 +163,12 @@ ASUS_HANDLE(display_get, "\\_SB.PCI0.P0P1.VGA.GETD",	/*  A6B, A6K A6R A7D F3JM L
 ASUS_HANDLE(ls_switch, ASUS_HOTK_PREFIX "ALSC");        /* Z71A Z71V */
 ASUS_HANDLE(ls_level, ASUS_HOTK_PREFIX "ALSL"); /* Z71A Z71V */
 
+/* GPS */
+/* R2H use different handle for GPS on/off */
+ASUS_HANDLE(gps_on, ASUS_HOTK_PREFIX "SDON");   /* R2H */
+ASUS_HANDLE(gps_off, ASUS_HOTK_PREFIX "SDOF");  /* R2H */
+ASUS_HANDLE(gps_status, ASUS_HOTK_PREFIX "GPST");
+
 /*
  * This is the main structure, we can use it to store anything interesting
  * about the hotk device
@@ -278,12 +285,28 @@ static int read_wireless_status(int mask)
         return (hotk->status & mask) ? 1 : 0;
 }
 
+static int read_gps_status(void)
+{
+        ulong status;
+        acpi_status rv = AE_OK;
+
+        rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status);
+        if (ACPI_FAILURE(rv))
+                printk(ASUS_WARNING "Error reading GPS status\n");
+        else
+                return status ? 1 : 0;
+
+        return (hotk->status & GPS_ON) ? 1 : 0;
+}
+
 /* Generic LED functions */
 static int read_status(int mask)
 {
         /* There is a special method for both wireless devices */
         if (mask == BT_ON || mask == WL_ON)
                 return read_wireless_status(mask);
+        else if (mask == GPS_ON)
+                return read_gps_status();
 
         return (hotk->status & mask) ? 1 : 0;
 }
@@ -299,6 +322,10 @@ static void write_status(acpi_handle handle, int out, int mask)
         case GLED_ON:
                 out = (out & 0x1) + 1;
                 break;
+        case GPS_ON:
+                handle = (out) ? gps_on_handle : gps_off_handle;
+                out = 0x02;
+                break;
         default:
                 out &= 0x1;
                 break;
@@ -667,6 +694,21 @@ static ssize_t store_lslvl(struct device *dev, struct device_attribute *attr,
         return rv;
 }
 
+/*
+ * GPS
+ */
+static ssize_t show_gps(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", read_status(GPS_ON));
+}
+
+static ssize_t store_gps(struct device *dev, struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        return store_status(buf, count, NULL, GPS_ON);
+}
+
 static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
 {
         /* TODO Find a better way to handle events count. */
@@ -715,6 +757,7 @@ static ASUS_CREATE_DEVICE_ATTR(display);
 static ASUS_CREATE_DEVICE_ATTR(ledd);
 static ASUS_CREATE_DEVICE_ATTR(ls_switch);
 static ASUS_CREATE_DEVICE_ATTR(ls_level);
+static ASUS_CREATE_DEVICE_ATTR(gps);
 
 static struct attribute *asuspf_attributes[] = {
         &dev_attr_infos.attr,
@@ -724,6 +767,7 @@ static struct attribute *asuspf_attributes[] = {
         &dev_attr_ledd.attr,
         &dev_attr_ls_switch.attr,
         &dev_attr_ls_level.attr,
+        &dev_attr_gps.attr,
         NULL
 };
 
@@ -763,6 +807,9 @@ static void asus_hotk_add_fs(void)
                 ASUS_SET_DEVICE_ATTR(ls_level, 0644, show_lslvl, store_lslvl);
                 ASUS_SET_DEVICE_ATTR(ls_switch, 0644, show_lssw, store_lssw);
         }
+
+        if (gps_status_handle && gps_on_handle && gps_off_handle)
+                ASUS_SET_DEVICE_ATTR(gps, 0644, show_gps, store_gps);
 }
 
 static int asus_handle_init(char *name, acpi_handle * handle,
@@ -890,9 +937,13 @@ static int asus_hotk_get_info(void)
 
         /* There is a lot of models with "ALSL", but a few get
            a real light sens, so we need to check it. */
-        if (ASUS_HANDLE_INIT(ls_switch))
+        if (!ASUS_HANDLE_INIT(ls_switch))
                 ASUS_HANDLE_INIT(ls_level);
 
+        ASUS_HANDLE_INIT(gps_on);
+        ASUS_HANDLE_INIT(gps_off);
+        ASUS_HANDLE_INIT(gps_status);
+
         kfree(model);
 
         return AE_OK;
@@ -950,7 +1001,7 @@ static int asus_hotk_add(struct acpi_device *device)
          * We install the handler, it will receive the hotk in parameter, so, we
          * could add other data to the hotk struct
          */
-        status = acpi_install_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
+        status = acpi_install_notify_handler(hotk->handle, ACPI_ALL_NOTIFY,
                                              asus_hotk_notify, hotk);
         if (ACPI_FAILURE(status))
                 printk(ASUS_ERR "Error installing notify handler\n");
@@ -981,6 +1032,9 @@ static int asus_hotk_add(struct acpi_device *device)
         if (ls_level_handle)
                 set_light_sens_level(hotk->light_level);
 
+        /* GPS is on by default */
+        write_status(NULL, 1, GPS_ON);
+
       end:
         if (result) {
                 kfree(hotk->name);
@@ -997,7 +1051,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        status = acpi_remove_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
+        status = acpi_remove_notify_handler(hotk->handle, ACPI_ALL_NOTIFY,
                                             asus_hotk_notify);
         if (ACPI_FAILURE(status))
                 printk(ASUS_ERR "Error removing notify handler\n");
diff --git a/drivers/misc/blink.c b/drivers/misc/blink.c
new file mode 100644
index 000000000000..634431ce1184
--- /dev/null
+++ b/drivers/misc/blink.c
@@ -0,0 +1,27 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/timer.h>
+#include <linux/jiffies.h>
+
+static void do_blink(unsigned long data);
+
+static DEFINE_TIMER(blink_timer, do_blink, 0 ,0);
+
+static void do_blink(unsigned long data)
+{
+        static long count;
+        if (panic_blink)
+                panic_blink(count++);
+        blink_timer.expires = jiffies + msecs_to_jiffies(1);
+        add_timer(&blink_timer);
+}
+
+static int blink_init(void)
+{
+        printk(KERN_INFO "Enabling keyboard blinking\n");
+        do_blink(0);
+        return 0;
+}
+
+module_init(blink_init);
+
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index 68c4b58525ba..41e901f53e7c 100644
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -85,7 +85,7 @@ static int set_lcd_level(int level)
         buf[0] = 0x80;
         buf[1] = (u8) (level*31);
 
-        return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, buf, sizeof(buf), NULL, 0);
+        return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, buf, sizeof(buf), NULL, 0, 1);
 }
 
 static int get_lcd_level(void)
@@ -93,7 +93,7 @@ static int get_lcd_level(void)
         u8 wdata = 0, rdata;
         int result;
 
-        result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, &wdata, 1, &rdata, 1);
+        result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, &wdata, 1, &rdata, 1, 1);
         if (result < 0)
                 return result;
 
@@ -105,7 +105,7 @@ static int get_auto_brightness(void)
         u8 wdata = 4, rdata;
         int result;
 
-        result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, &wdata, 1, &rdata, 1);
+        result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, &wdata, 1, &rdata, 1, 1);
         if (result < 0)
                 return result;
 
@@ -119,14 +119,14 @@ static int set_auto_brightness(int enable)
 
         wdata[0] = 4;
 
-        result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 1, &rdata, 1);
+        result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 1, &rdata, 1, 1);
         if (result < 0)
                 return result;
 
         wdata[0] = 0x84;
         wdata[1] = (rdata & 0xF7) | (enable ? 8 : 0);
 
-        return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 2, NULL, 0);
+        return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 2, NULL, 0, 1);
 }
 
 static int get_wireless_state(int *wlan, int *bluetooth)
@@ -134,7 +134,7 @@ static int get_wireless_state(int *wlan, int *bluetooth)
         u8 wdata = 0, rdata;
         int result;
 
-        result = ec_transaction(MSI_EC_COMMAND_WIRELESS, &wdata, 1, &rdata, 1);
+        result = ec_transaction(MSI_EC_COMMAND_WIRELESS, &wdata, 1, &rdata, 1, 1);
         if (result < 0)
                 return -1;
 
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
new file mode 100644
index 000000000000..35b139b0e5f2
--- /dev/null
+++ b/drivers/misc/phantom.c
@@ -0,0 +1,463 @@
+/*
+ *  Copyright (C) 2005-2007 Jiri Slaby <jirislaby@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  You need an userspace library to cooperate with this driver. It (and other
+ *  info) may be obtained here:
+ *  http://www.fi.muni.cz/~xslaby/phantom.html
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+#include <linux/fs.h>
+#include <linux/poll.h>
+#include <linux/interrupt.h>
+#include <linux/cdev.h>
+#include <linux/phantom.h>
+
+#include <asm/atomic.h>
+#include <asm/io.h>
+
+#define PHANTOM_VERSION         "n0.9.5"
+
+#define PHANTOM_MAX_MINORS      8
+
+#define PHN_IRQCTL              0x4c    /* irq control in caddr space */
+
+#define PHB_RUNNING             1
+
+static struct class *phantom_class;
+static int phantom_major;
+
+struct phantom_device {
+        unsigned int opened;
+        void __iomem *caddr;
+        u32 __iomem *iaddr;
+        u32 __iomem *oaddr;
+        unsigned long status;
+        atomic_t counter;
+
+        wait_queue_head_t wait;
+        struct cdev cdev;
+
+        struct mutex open_lock;
+};
+
+static unsigned char phantom_devices[PHANTOM_MAX_MINORS];
+
+static int phantom_status(struct phantom_device *dev, unsigned long newstat)
+{
+        pr_debug("phantom_status %lx %lx\n", dev->status, newstat);
+
+        if (!(dev->status & PHB_RUNNING) && (newstat & PHB_RUNNING)) {
+                atomic_set(&dev->counter, 0);
+                iowrite32(PHN_CTL_IRQ, dev->iaddr + PHN_CONTROL);
+                iowrite32(0x43, dev->caddr + PHN_IRQCTL);
+        } else if ((dev->status & PHB_RUNNING) && !(newstat & PHB_RUNNING))
+                iowrite32(0, dev->caddr + PHN_IRQCTL);
+
+        dev->status = newstat;
+
+        return 0;
+}
+
+/*
+ * File ops
+ */
+
+static int phantom_ioctl(struct inode *inode, struct file *file, u_int cmd,
+        u_long arg)
+{
+        struct phantom_device *dev = file->private_data;
+        struct phm_regs rs;
+        struct phm_reg r;
+        void __user *argp = (void __user *)arg;
+        unsigned int i;
+
+        if (_IOC_TYPE(cmd) != PH_IOC_MAGIC ||
+                        _IOC_NR(cmd) > PH_IOC_MAXNR)
+                return -ENOTTY;
+
+        switch (cmd) {
+        case PHN_SET_REG:
+                if (copy_from_user(&r, argp, sizeof(r)))
+                        return -EFAULT;
+
+                if (r.reg > 7)
+                        return -EINVAL;
+
+                if (r.reg == PHN_CONTROL && (r.value & PHN_CTL_IRQ) &&
+                                phantom_status(dev, dev->status | PHB_RUNNING))
+                        return -ENODEV;
+
+                pr_debug("phantom: writing %x to %u\n", r.value, r.reg);
+                iowrite32(r.value, dev->iaddr + r.reg);
+
+                if (r.reg == PHN_CONTROL && !(r.value & PHN_CTL_IRQ))
+                        phantom_status(dev, dev->status & ~PHB_RUNNING);
+                break;
+        case PHN_SET_REGS:
+                if (copy_from_user(&rs, argp, sizeof(rs)))
+                        return -EFAULT;
+
+                pr_debug("phantom: SRS %u regs %x\n", rs.count, rs.mask);
+                for (i = 0; i < min(rs.count, 8U); i++)
+                        if ((1 << i) & rs.mask)
+                                iowrite32(rs.values[i], dev->oaddr + i);
+                break;
+        case PHN_GET_REG:
+                if (copy_from_user(&r, argp, sizeof(r)))
+                        return -EFAULT;
+
+                if (r.reg > 7)
+                        return -EINVAL;
+
+                r.value = ioread32(dev->iaddr + r.reg);
+
+                if (copy_to_user(argp, &r, sizeof(r)))
+                        return -EFAULT;
+                break;
+        case PHN_GET_REGS:
+                if (copy_from_user(&rs, argp, sizeof(rs)))
+                        return -EFAULT;
+
+                pr_debug("phantom: GRS %u regs %x\n", rs.count, rs.mask);
+                for (i = 0; i < min(rs.count, 8U); i++)
+                        if ((1 << i) & rs.mask)
+                                rs.values[i] = ioread32(dev->iaddr + i);
+
+                if (copy_to_user(argp, &rs, sizeof(rs)))
+                        return -EFAULT;
+                break;
+        default:
+                return -ENOTTY;
+        }
+
+        return 0;
+}
+
+static int phantom_open(struct inode *inode, struct file *file)
+{
+        struct phantom_device *dev = container_of(inode->i_cdev,
+                        struct phantom_device, cdev);
+
+        nonseekable_open(inode, file);
+
+        if (mutex_lock_interruptible(&dev->open_lock))
+                return -ERESTARTSYS;
+
+        if (dev->opened) {
+                mutex_unlock(&dev->open_lock);
+                return -EINVAL;
+        }
+
+        file->private_data = dev;
+
+        dev->opened++;
+        mutex_unlock(&dev->open_lock);
+
+        return 0;
+}
+
+static int phantom_release(struct inode *inode, struct file *file)
+{
+        struct phantom_device *dev = file->private_data;
+
+        mutex_lock(&dev->open_lock);
+
+        dev->opened = 0;
+        phantom_status(dev, dev->status & ~PHB_RUNNING);
+
+        mutex_unlock(&dev->open_lock);
+
+        return 0;
+}
+
+static unsigned int phantom_poll(struct file *file, poll_table *wait)
+{
+        struct phantom_device *dev = file->private_data;
+        unsigned int mask = 0;
+
+        pr_debug("phantom_poll: %d\n", atomic_read(&dev->counter));
+        poll_wait(file, &dev->wait, wait);
+        if (atomic_read(&dev->counter)) {
+                mask = POLLIN | POLLRDNORM;
+                atomic_dec(&dev->counter);
+        } else if ((dev->status & PHB_RUNNING) == 0)
+                mask = POLLIN | POLLRDNORM | POLLERR;
+        pr_debug("phantom_poll end: %x/%d\n", mask, atomic_read(&dev->counter));
+
+        return mask;
+}
+
+static struct file_operations phantom_file_ops = {
+        .open = phantom_open,
+        .release = phantom_release,
+        .ioctl = phantom_ioctl,
+        .poll = phantom_poll,
+};
+
+static irqreturn_t phantom_isr(int irq, void *data)
+{
+        struct phantom_device *dev = data;
+
+        if (!(ioread32(dev->iaddr + PHN_CONTROL) & PHN_CTL_IRQ))
+                return IRQ_NONE;
+
+        iowrite32(0, dev->iaddr);
+        iowrite32(0xc0, dev->iaddr);
+
+        atomic_inc(&dev->counter);
+        wake_up_interruptible(&dev->wait);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * Init and deinit driver
+ */
+
+static unsigned int __devinit phantom_get_free(void)
+{
+        unsigned int i;
+
+        for (i = 0; i < PHANTOM_MAX_MINORS; i++)
+                if (phantom_devices[i] == 0)
+                        break;
+
+        return i;
+}
+
+static int __devinit phantom_probe(struct pci_dev *pdev,
+        const struct pci_device_id *pci_id)
+{
+        struct phantom_device *pht;
+        unsigned int minor;
+        int retval;
+
+        retval = pci_enable_device(pdev);
+        if (retval)
+                goto err;
+
+        minor = phantom_get_free();
+        if (minor == PHANTOM_MAX_MINORS) {
+                dev_err(&pdev->dev, "too many devices found!\n");
+                retval = -EIO;
+                goto err_dis;
+        }
+
+        phantom_devices[minor] = 1;
+
+        retval = pci_request_regions(pdev, "phantom");
+        if (retval)
+                goto err_null;
+
+        retval = -ENOMEM;
+        pht = kzalloc(sizeof(*pht), GFP_KERNEL);
+        if (pht == NULL) {
+                dev_err(&pdev->dev, "unable to allocate device\n");
+                goto err_reg;
+        }
+
+        pht->caddr = pci_iomap(pdev, 0, 0);
+        if (pht->caddr == NULL) {
+                dev_err(&pdev->dev, "can't remap conf space\n");
+                goto err_fr;
+        }
+        pht->iaddr = pci_iomap(pdev, 2, 0);
+        if (pht->iaddr == NULL) {
+                dev_err(&pdev->dev, "can't remap input space\n");
+                goto err_unmc;
+        }
+        pht->oaddr = pci_iomap(pdev, 3, 0);
+        if (pht->oaddr == NULL) {
+                dev_err(&pdev->dev, "can't remap output space\n");
+                goto err_unmi;
+        }
+
+        mutex_init(&pht->open_lock);
+        init_waitqueue_head(&pht->wait);
+        cdev_init(&pht->cdev, &phantom_file_ops);
+        pht->cdev.owner = THIS_MODULE;
+
+        iowrite32(0, pht->caddr + PHN_IRQCTL);
+        retval = request_irq(pdev->irq, phantom_isr,
+                        IRQF_SHARED | IRQF_DISABLED, "phantom", pht);
+        if (retval) {
+                dev_err(&pdev->dev, "can't establish ISR\n");
+                goto err_unmo;
+        }
+
+        retval = cdev_add(&pht->cdev, MKDEV(phantom_major, minor), 1);
+        if (retval) {
+                dev_err(&pdev->dev, "chardev registration failed\n");
+                goto err_irq;
+        }
+
+        if (IS_ERR(device_create(phantom_class, &pdev->dev, MKDEV(phantom_major,
+                        minor), "phantom%u", minor)))
+                dev_err(&pdev->dev, "can't create device\n");
+
+        pci_set_drvdata(pdev, pht);
+
+        return 0;
+err_irq:
+        free_irq(pdev->irq, pht);
+err_unmo:
+        pci_iounmap(pdev, pht->oaddr);
+err_unmi:
+        pci_iounmap(pdev, pht->iaddr);
+err_unmc:
+        pci_iounmap(pdev, pht->caddr);
+err_fr:
+        kfree(pht);
+err_reg:
+        pci_release_regions(pdev);
+err_null:
+        phantom_devices[minor] = 0;
+err_dis:
+        pci_disable_device(pdev);
+err:
+        return retval;
+}
+
+static void __devexit phantom_remove(struct pci_dev *pdev)
+{
+        struct phantom_device *pht = pci_get_drvdata(pdev);
+        unsigned int minor = MINOR(pht->cdev.dev);
+
+        device_destroy(phantom_class, MKDEV(phantom_major, minor));
+
+        cdev_del(&pht->cdev);
+
+        iowrite32(0, pht->caddr + PHN_IRQCTL);
+        free_irq(pdev->irq, pht);
+
+        pci_iounmap(pdev, pht->oaddr);
+        pci_iounmap(pdev, pht->iaddr);
+        pci_iounmap(pdev, pht->caddr);
+
+        kfree(pht);
+
+        pci_release_regions(pdev);
+
+        phantom_devices[minor] = 0;
+
+        pci_disable_device(pdev);
+}
+
+#ifdef CONFIG_PM
+static int phantom_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct phantom_device *dev = pci_get_drvdata(pdev);
+
+        iowrite32(0, dev->caddr + PHN_IRQCTL);
+
+        return 0;
+}
+
+static int phantom_resume(struct pci_dev *pdev)
+{
+        struct phantom_device *dev = pci_get_drvdata(pdev);
+
+        iowrite32(0, dev->caddr + PHN_IRQCTL);
+
+        return 0;
+}
+#else
+#define phantom_suspend NULL
+#define phantom_resume  NULL
+#endif
+
+static struct pci_device_id phantom_pci_tbl[] __devinitdata = {
+        { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),
+                .class = PCI_CLASS_BRIDGE_OTHER << 8, .class_mask = 0xffff00 },
+        { 0, }
+};
+MODULE_DEVICE_TABLE(pci, phantom_pci_tbl);
+
+static struct pci_driver phantom_pci_driver = {
+        .name = "phantom",
+        .id_table = phantom_pci_tbl,
+        .probe = phantom_probe,
+        .remove = __devexit_p(phantom_remove),
+        .suspend = phantom_suspend,
+        .resume = phantom_resume
+};
+
+static ssize_t phantom_show_version(struct class *cls, char *buf)
+{
+        return sprintf(buf, PHANTOM_VERSION "\n");
+}
+
+static CLASS_ATTR(version, 0444, phantom_show_version, NULL);
+
+static int __init phantom_init(void)
+{
+        int retval;
+        dev_t dev;
+
+        phantom_class = class_create(THIS_MODULE, "phantom");
+        if (IS_ERR(phantom_class)) {
+                retval = PTR_ERR(phantom_class);
+                printk(KERN_ERR "phantom: can't register phantom class\n");
+                goto err;
+        }
+        retval = class_create_file(phantom_class, &class_attr_version);
+        if (retval) {
+                printk(KERN_ERR "phantom: can't create sysfs version file\n");
+                goto err_class;
+        }
+
+        retval = alloc_chrdev_region(&dev, 0, PHANTOM_MAX_MINORS, "phantom");
+        if (retval) {
+                printk(KERN_ERR "phantom: can't register character device\n");
+                goto err_attr;
+        }
+        phantom_major = MAJOR(dev);
+
+        retval = pci_register_driver(&phantom_pci_driver);
+        if (retval) {
+                printk(KERN_ERR "phantom: can't register pci driver\n");
+                goto err_unchr;
+        }
+
+        printk(KERN_INFO "Phantom Linux Driver, version " PHANTOM_VERSION ", "
+                        "init OK\n");
+
+        return 0;
+err_unchr:
+        unregister_chrdev_region(dev, PHANTOM_MAX_MINORS);
+err_attr:
+        class_remove_file(phantom_class, &class_attr_version);
+err_class:
+        class_destroy(phantom_class);
+err:
+        return retval;
+}
+
+static void __exit phantom_exit(void)
+{
+        pci_unregister_driver(&phantom_pci_driver);
+
+        unregister_chrdev_region(MKDEV(phantom_major, 0), PHANTOM_MAX_MINORS);
+
+        class_remove_file(phantom_class, &class_attr_version);
+        class_destroy(phantom_class);
+
+        pr_debug("phantom: module successfully removed\n");
+}
+
+module_init(phantom_init);
+module_exit(phantom_exit);
+
+MODULE_AUTHOR("Jiri Slaby <jirislaby@gmail.com>");
+MODULE_DESCRIPTION("Sensable Phantom driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(PHANTOM_VERSION);
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index c15c1f61bd1b..8ee0321ef1c8 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -63,7 +63,7 @@
 #include <asm/uaccess.h>
 #include <linux/sonypi.h>
 #include <linux/sony-laptop.h>
-#ifdef CONFIG_SONY_LAPTOP_OLD
+#ifdef CONFIG_SONYPI_COMPAT
 #include <linux/poll.h>
 #include <linux/miscdevice.h>
 #endif
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(camera,
                  "set this to 1 to enable Motion Eye camera controls "
                  "(only use it if you have a C1VE or C1VN model)");
 
-#ifdef CONFIG_SONY_LAPTOP_OLD
+#ifdef CONFIG_SONYPI_COMPAT
 static int minor = -1;
 module_param(minor, int, 0);
 MODULE_PARM_DESC(minor,
@@ -1504,7 +1504,7 @@ static struct attribute_group spic_attribute_group = {
 };
 
 /******** SONYPI compatibility **********/
-#ifdef CONFIG_SONY_LAPTOP_OLD
+#ifdef CONFIG_SONYPI_COMPAT
 
 /* battery / brightness / temperature  addresses */
 #define SONYPI_BAT_FLAGS        0x81
@@ -1798,7 +1798,7 @@ static void sonypi_compat_exit(void)
 static int sonypi_compat_init(void) { return 0; }
 static void sonypi_compat_exit(void) { }
 static void sonypi_compat_report_event(u8 event) { }
-#endif /* CONFIG_SONY_LAPTOP_OLD */
+#endif /* CONFIG_SONYPI_COMPAT */
 
 /*
  * ACPI callbacks
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 1ba6c085419a..c08ad8f823d2 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -105,7 +105,8 @@ static unsigned char tifm_7xx1_toggle_sock_power(char __iomem *sock_addr)
             == TIFM_TYPE_XD)
                 msleep(40);
 
-        writel((s_state & 7) | 0x0c00, sock_addr + SOCK_CONTROL);
+        writel((s_state & TIFM_CTRL_POWER_MASK) | 0x0c00,
+               sock_addr + SOCK_CONTROL);
         /* wait for power to stabilize */
         msleep(20);
         for (cnt = 16; cnt <= 256; cnt <<= 1) {
@@ -122,6 +123,12 @@ static unsigned char tifm_7xx1_toggle_sock_power(char __iomem *sock_addr)
         return (readl(sock_addr + SOCK_PRESENT_STATE) >> 4) & 7;
 }
 
+inline static void tifm_7xx1_sock_power_off(char __iomem *sock_addr)
+{
+        writel((~TIFM_CTRL_POWER_MASK) & readl(sock_addr + SOCK_CONTROL),
+               sock_addr + SOCK_CONTROL);
+}
+
 inline static char __iomem *
 tifm_7xx1_sock_addr(char __iomem *base_addr, unsigned int sock_num)
 {
@@ -133,6 +140,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
         struct tifm_adapter *fm = container_of(work, struct tifm_adapter,
                                                media_switcher);
         struct tifm_dev *sock;
+        char __iomem *sock_addr;
         unsigned long flags;
         unsigned char media_id;
         unsigned int socket_change_set, cnt;
@@ -158,11 +166,12 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
                                "%s : demand removing card from socket %u:%u\n",
                                fm->cdev.class_id, fm->id, cnt);
                         fm->sockets[cnt] = NULL;
+                        sock_addr = sock->addr;
                         spin_unlock_irqrestore(&fm->lock, flags);
                         device_unregister(&sock->dev);
                         spin_lock_irqsave(&fm->lock, flags);
-                        writel(0x0e00, tifm_7xx1_sock_addr(fm->addr, cnt)
-                               + SOCK_CONTROL);
+                        tifm_7xx1_sock_power_off(sock_addr);
+                        writel(0x0e00, sock_addr + SOCK_CONTROL);
                 }
 
                 spin_unlock_irqrestore(&fm->lock, flags);
@@ -205,8 +214,16 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
 
 static int tifm_7xx1_suspend(struct pci_dev *dev, pm_message_t state)
 {
+        struct tifm_adapter *fm = pci_get_drvdata(dev);
+        int cnt;
+
         dev_dbg(&dev->dev, "suspending host\n");
 
+        for (cnt = 0; cnt < fm->num_sockets; cnt++) {
+                if (fm->sockets[cnt])
+                        tifm_7xx1_sock_power_off(fm->sockets[cnt]->addr);
+        }
+
         pci_save_state(dev);
         pci_enable_wake(dev, pci_choose_state(dev, state), 0);
         pci_disable_device(dev);
@@ -357,6 +374,7 @@ err_out:
 static void tifm_7xx1_remove(struct pci_dev *dev)
 {
         struct tifm_adapter *fm = pci_get_drvdata(dev);
+        int cnt;
 
         fm->eject = tifm_7xx1_dummy_eject;
         writel(TIFM_IRQ_SETALL, fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
@@ -365,6 +383,9 @@ static void tifm_7xx1_remove(struct pci_dev *dev)
 
         tifm_remove_adapter(fm);
 
+        for (cnt = 0; cnt < fm->num_sockets; cnt++)
+                tifm_7xx1_sock_power_off(tifm_7xx1_sock_addr(fm->addr, cnt));
+
         pci_set_drvdata(dev, NULL);
 
         iounmap(fm->addr);
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 6c97491543db..c0b41e8bcd9d 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -2,10 +2,9 @@
 # MMC subsystem configuration
 #
 
-menu "MMC/SD Card support"
-
-config MMC
-        tristate "MMC support"
+menuconfig MMC
+        tristate "MMC/SD card support"
+        depends on HAS_IOMEM
         help
           MMC is the "multi-media card" bus protocol.
 
@@ -19,10 +18,12 @@ config MMC_DEBUG
           This is an option for use by developers; most people should
           say N here.  This enables MMC core and driver debugging.
 
+if MMC
+
 source "drivers/mmc/core/Kconfig"
 
 source "drivers/mmc/card/Kconfig"
 
 source "drivers/mmc/host/Kconfig"
 
-endmenu
+endif # MMC
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
index 01a9fd376a1f..9320a8c73239 100644
--- a/drivers/mmc/card/Kconfig
+++ b/drivers/mmc/card/Kconfig
@@ -3,11 +3,10 @@
 #
 
 comment "MMC/SD Card Drivers"
-        depends MMC
 
 config MMC_BLOCK
         tristate "MMC block device driver"
-        depends on MMC && BLOCK
+        depends on BLOCK
         default y
         help
           Say Y here to enable the MMC block device driver support.
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index d24ab234394c..a7562f7fc0b3 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -45,8 +45,6 @@
  */
 #define MMC_SHIFT       3
 
-static int major;
-
 /*
  * There is one mmc_blk_data per slot.
  */
@@ -466,7 +464,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
         md->queue.issue_fn = mmc_blk_issue_rq;
         md->queue.data = md;
 
-        md->disk->major = major;
+        md->disk->major = MMC_BLOCK_MAJOR;
         md->disk->first_minor = devidx << MMC_SHIFT;
         md->disk->fops = &mmc_bdops;
         md->disk->private_data = md;
@@ -634,14 +632,9 @@ static int __init mmc_blk_init(void)
 {
         int res = -ENOMEM;
 
-        res = register_blkdev(major, "mmc");
-        if (res < 0) {
-                printk(KERN_WARNING "Unable to get major %d for MMC media: %d\n",
-                       major, res);
+        res = register_blkdev(MMC_BLOCK_MAJOR, "mmc");
+        if (res)
                 goto out;
-        }
-        if (major == 0)
-                major = res;
 
         return mmc_register_driver(&mmc_driver);
 
@@ -652,7 +645,7 @@ static int __init mmc_blk_init(void)
 static void __exit mmc_blk_exit(void)
 {
         mmc_unregister_driver(&mmc_driver);
-        unregister_blkdev(major, "mmc");
+        unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");
 }
 
 module_init(mmc_blk_init);
@@ -661,5 +654,3 @@ module_exit(mmc_blk_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver");
 
-module_param(major, int, 0444);
-MODULE_PARM_DESC(major, "specify the major device number for MMC block driver");
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
index 94222b9a15ea..ab37a6d9d32a 100644
--- a/drivers/mmc/core/Kconfig
+++ b/drivers/mmc/core/Kconfig
@@ -4,7 +4,6 @@
 
 config MMC_UNSAFE_RESUME
         bool "Allow unsafe resume (DANGEROUS)"
-        depends on MMC != n
         help
           If you say Y here, the MMC layer will assume that all cards
           stayed in their respective slots during the suspend. The
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 72c7cf4a9f9d..7385acfa1dd9 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -500,9 +500,10 @@ void __mmc_release_bus(struct mmc_host *host)
 void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
 #ifdef CONFIG_MMC_DEBUG
-        mmc_claim_host(host);
+        unsigned long flags;
+        spin_lock_irqsave(&host->lock, flags);
         BUG_ON(host->removed);
-        mmc_release_host(host);
+        spin_unlock_irqrestore(&host->lock, flags);
 #endif
 
         mmc_schedule_delayed_work(&host->detect, delay);
@@ -625,9 +626,10 @@ EXPORT_SYMBOL(mmc_add_host);
 void mmc_remove_host(struct mmc_host *host)
 {
 #ifdef CONFIG_MMC_DEBUG
-        mmc_claim_host(host);
+        unsigned long flags;
+        spin_lock_irqsave(&host->lock, flags);
         host->removed = 1;
-        mmc_release_host(host);
+        spin_unlock_irqrestore(&host->lock, flags);
 #endif
 
         mmc_flush_scheduled_work();
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index ed4deab2203d..e23082fe88d0 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -3,11 +3,10 @@
 #
 
 comment "MMC/SD Host Controller Drivers"
-        depends on MMC
 
 config MMC_ARMMMCI
         tristate "ARM AMBA Multimedia Card Interface support"
-        depends on ARM_AMBA && MMC
+        depends on ARM_AMBA
         help
           This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
           Interface (PL180 and PL181) support.  If you have an ARM(R)
@@ -17,7 +16,7 @@ config MMC_ARMMMCI
 
 config MMC_PXA
         tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
-        depends on ARCH_PXA && MMC
+        depends on ARCH_PXA
         help
           This selects the Intel(R) PXA(R) Multimedia card Interface.
           If you have a PXA(R) platform with a Multimedia Card slot,
@@ -27,7 +26,7 @@ config MMC_PXA
 
 config MMC_SDHCI
         tristate "Secure Digital Host Controller Interface support  (EXPERIMENTAL)"
-        depends on PCI && MMC && EXPERIMENTAL
+        depends on PCI && EXPERIMENTAL
         help
           This select the generic Secure Digital Host Controller Interface.
           It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
@@ -38,7 +37,7 @@ config MMC_SDHCI
 
 config MMC_OMAP
         tristate "TI OMAP Multimedia Card Interface support"
-        depends on ARCH_OMAP && MMC
+        depends on ARCH_OMAP
         select TPS65010 if MACH_OMAP_H2
         help
           This selects the TI OMAP Multimedia card Interface.
@@ -49,7 +48,7 @@ config MMC_OMAP
 
 config MMC_WBSD
         tristate "Winbond W83L51xD SD/MMC Card Interface support"
-        depends on MMC && ISA_DMA_API
+        depends on ISA_DMA_API
         help
           This selects the Winbond(R) W83L51xD Secure digital and
           Multimedia card Interface.
@@ -60,7 +59,7 @@ config MMC_WBSD
 
 config MMC_AU1X
         tristate "Alchemy AU1XX0 MMC Card Interface support"
-        depends on MMC && SOC_AU1200
+        depends on SOC_AU1200
         help
           This selects the AMD Alchemy(R) Multimedia card interface.
           If you have a Alchemy platform with a MMC slot, say Y or M here.
@@ -69,7 +68,7 @@ config MMC_AU1X
 
 config MMC_AT91
         tristate "AT91 SD/MMC Card Interface support"
-        depends on ARCH_AT91 && MMC
+        depends on ARCH_AT91
         help
           This selects the AT91 MCI controller.
 
@@ -77,7 +76,7 @@ config MMC_AT91
 
 config MMC_IMX
         tristate "Motorola i.MX Multimedia Card Interface support"
-        depends on ARCH_IMX && MMC
+        depends on ARCH_IMX
         help
           This selects the Motorola i.MX Multimedia card Interface.
           If you have a i.MX platform with a Multimedia Card slot,
@@ -87,7 +86,7 @@ config MMC_IMX
 
 config MMC_TIFM_SD
         tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
-        depends on MMC && EXPERIMENTAL && PCI
+        depends on EXPERIMENTAL && PCI
         select TIFM_CORE
         help
           Say Y here if you want to be able to access MMC/SD cards with
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index b7156a4555b5..f967226d7505 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -187,9 +187,8 @@ static void au1xmmc_tasklet_finish(unsigned long param)
 }
 
 static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
-                                struct mmc_command *cmd)
+                                struct mmc_command *cmd, unsigned int flags)
 {
-
         u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
 
         switch (mmc_resp_type(cmd)) {
@@ -213,24 +212,16 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
                 return MMC_ERR_INVALID;
         }
 
-        switch(cmd->opcode) {
-        case MMC_READ_SINGLE_BLOCK:
-        case SD_APP_SEND_SCR:
-                mmccmd |= SD_CMD_CT_2;
-                break;
-        case MMC_READ_MULTIPLE_BLOCK:
-                mmccmd |= SD_CMD_CT_4;
-                break;
-        case MMC_WRITE_BLOCK:
-                mmccmd |= SD_CMD_CT_1;
-                break;
-
-        case MMC_WRITE_MULTIPLE_BLOCK:
-                mmccmd |= SD_CMD_CT_3;
-                break;
-        case MMC_STOP_TRANSMISSION:
-                mmccmd |= SD_CMD_CT_7;
-                break;
+        if (flags & MMC_DATA_READ) {
+                if (flags & MMC_DATA_MULTI)
+                        mmccmd |= SD_CMD_CT_4;
+                else
+                        mmccmd |= SD_CMD_CT_2;
+        } else if (flags & MMC_DATA_WRITE) {
+                if (flags & MMC_DATA_MULTI)
+                        mmccmd |= SD_CMD_CT_3;
+                else
+                        mmccmd |= SD_CMD_CT_1;
         }
 
         au_writel(cmd->arg, HOST_CMDARG(host));
@@ -665,6 +656,7 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
 {
 
         struct au1xmmc_host *host = mmc_priv(mmc);
+        unsigned int flags = 0;
         int ret = MMC_ERR_NONE;
 
         WARN_ON(irqs_disabled());
@@ -677,11 +669,12 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
 
         if (mrq->data) {
                 FLUSH_FIFO(host);
+                flags = mrq->data->flags;
                 ret = au1xmmc_prepare_data(host, mrq->data);
         }
 
         if (ret == MMC_ERR_NONE)
-                ret = au1xmmc_send_command(host, 0, mrq->cmd);
+                ret = au1xmmc_send_command(host, 0, mrq->cmd, flags);
 
         if (ret != MMC_ERR_NONE) {
                 mrq->cmd->error = ret;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index d97d3864b57f..f8985c508bb9 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -232,20 +232,14 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat)
                 /*
                  * workaround for erratum #42:
                  * Intel PXA27x Family Processor Specification Update Rev 001
+                 * A bogus CRC error can appear if the msb of a 136 bit
+                 * response is a one.
                  */
-                if (cmd->opcode == MMC_ALL_SEND_CID ||
-                    cmd->opcode == MMC_SEND_CSD ||
-                    cmd->opcode == MMC_SEND_CID) {
-                        /* a bogus CRC error can appear if the msb of
-                           the 15 byte response is a one */
-                        if ((cmd->resp[0] & 0x80000000) == 0)
-                                cmd->error = MMC_ERR_BADCRC;
-                } else {
-                        pr_debug("ignoring CRC from command %d - *risky*\n",cmd->opcode);
-                }
-#else
-                cmd->error = MMC_ERR_BADCRC;
+                if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) {
+                        pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode);
+                } else
 #endif
+                cmd->error = MMC_ERR_BADCRC;
         }
 
         pxamci_disable_irq(host, END_CMD_RES);
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ff5bf73cdd25..a359efdd77eb 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -963,6 +963,15 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
                 if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))
                         sdhci_transfer_pio(host);
 
+                /*
+                 * We currently don't do anything fancy with DMA
+                 * boundaries, but as we can't disable the feature
+                 * we need to at least restart the transfer.
+                 */
+                if (intmask & SDHCI_INT_DMA_END)
+                        writel(readl(host->ioaddr + SDHCI_DMA_ADDRESS),
+                                host->ioaddr + SDHCI_DMA_ADDRESS);
+
                 if (intmask & SDHCI_INT_DATA_END)
                         sdhci_finish_data(host);
         }
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index 7511f961c67b..8b736e968447 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -1021,10 +1021,6 @@ static void tifm_sd_remove(struct tifm_dev *sock)
         mmc_remove_host(mmc);
         dev_dbg(&sock->dev, "after remove\n");
 
-        /* The meaning of the bit majority in this constant is unknown. */
-        writel(0xfff8 & readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-
         mmc_free_host(mmc);
 }
 
@@ -1032,14 +1028,7 @@ static void tifm_sd_remove(struct tifm_dev *sock)
 
 static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state)
 {
-        struct mmc_host *mmc = tifm_get_drvdata(sock);
-        int rc;
-
-        rc = mmc_suspend_host(mmc, state);
-        /* The meaning of the bit majority in this constant is unknown. */
-        writel(0xfff8 & readl(sock->addr + SOCK_CONTROL),
-               sock->addr + SOCK_CONTROL);
-        return rc;
+        return mmc_suspend_host(tifm_get_drvdata(sock), state);
 }
 
 static int tifm_sd_resume(struct tifm_dev *sock)
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index c1b47db29bd2..fbec8cd55e38 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -2,6 +2,7 @@
 
 menuconfig MTD
         tristate "Memory Technology Device (MTD) support"
+        depends on HAS_IOMEM
         help
           Memory Technology Devices are flash, RAM and similar chips, often
           used for solid state file systems on embedded devices. This option
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index d28e0fc85e12..479d32b57a1e 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -1,5 +1,4 @@
 # drivers/mtd/chips/Kconfig
-# $Id: Kconfig,v 1.18 2005/11/07 11:14:22 gleixner Exp $
 
 menu "RAM/ROM/Flash chip drivers"
         depends on MTD!=n
@@ -231,45 +230,6 @@ config MTD_ABSENT
           the system regardless of media presence.  Device nodes created
           with this driver will return -ENODEV upon access.
 
-config MTD_OBSOLETE_CHIPS
-        bool "Older (theoretically obsoleted now) drivers for non-CFI chips"
-        help
-          This option does not enable any code directly, but will allow you to
-          select some other chip drivers which are now considered obsolete,
-          because the generic CONFIG_JEDECPROBE code above should now detect
-          the chips which are supported by these drivers, and allow the generic
-          CFI-compatible drivers to drive the chips. Say 'N' here unless you have
-          already tried the CONFIG_JEDECPROBE method and reported its failure
-          to the MTD mailing list at <linux-mtd@lists.infradead.org>
-
-config MTD_AMDSTD
-        tristate "AMD compatible flash chip support (non-CFI)"
-        depends on MTD_OBSOLETE_CHIPS && BROKEN
-        help
-          This option enables support for flash chips using AMD-compatible
-          commands, including some which are not CFI-compatible and hence
-          cannot be used with the CONFIG_MTD_CFI_AMDSTD option.
-
-          It also works on AMD compatible chips that do conform to CFI.
-
-config MTD_SHARP
-        tristate "pre-CFI Sharp chip support"
-        depends on MTD_OBSOLETE_CHIPS
-        help
-          This option enables support for flash chips using Sharp-compatible
-          commands, including some which are not CFI-compatible and hence
-          cannot be used with the CONFIG_MTD_CFI_INTELxxx options.
-
-config MTD_JEDEC
-        tristate "JEDEC device support"
-        depends on MTD_OBSOLETE_CHIPS && BROKEN
-        help
-          Enable older JEDEC flash interface devices for self
-          programming flash.  It is commonly used in older AMD chips.  It is
-          only called JEDEC because the JEDEC association
-          <http://www.jedec.org/> distributes the identification codes for the
-          chips.
-
 config MTD_XIP
         bool "XIP aware MTD support"
         depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP
diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile
index 75bc1c2a0f43..36582412ccda 100644
--- a/drivers/mtd/chips/Makefile
+++ b/drivers/mtd/chips/Makefile
@@ -1,19 +1,15 @@
 #
 # linux/drivers/chips/Makefile
 #
-# $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $
 
 obj-$(CONFIG_MTD)               += chipreg.o
-obj-$(CONFIG_MTD_AMDSTD)        += amd_flash.o
 obj-$(CONFIG_MTD_CFI)           += cfi_probe.o
 obj-$(CONFIG_MTD_CFI_UTIL)      += cfi_util.o
 obj-$(CONFIG_MTD_CFI_STAA)      += cfi_cmdset_0020.o
 obj-$(CONFIG_MTD_CFI_AMDSTD)    += cfi_cmdset_0002.o
 obj-$(CONFIG_MTD_CFI_INTELEXT)  += cfi_cmdset_0001.o
 obj-$(CONFIG_MTD_GEN_PROBE)     += gen_probe.o
-obj-$(CONFIG_MTD_JEDEC)         += jedec.o
 obj-$(CONFIG_MTD_JEDECPROBE)    += jedec_probe.o
 obj-$(CONFIG_MTD_RAM)           += map_ram.o
 obj-$(CONFIG_MTD_ROM)           += map_rom.o
-obj-$(CONFIG_MTD_SHARP)         += sharp.o
 obj-$(CONFIG_MTD_ABSENT)        += map_absent.o
diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
deleted file mode 100644
index e7999f15d85a..000000000000
--- a/drivers/mtd/chips/amd_flash.c
+++ /dev/null
@@ -1,1396 +0,0 @@
-/*
- * MTD map driver for AMD compatible flash chips (non-CFI)
- *
- * Author: Jonas Holmberg <jonas.holmberg@axis.com>
- *
- * $Id: amd_flash.c,v 1.28 2005/11/07 11:14:22 gleixner Exp $
- *
- * Copyright (c) 2001 Axis Communications AB
- *
- * This file is under GPL.
- *
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/flashchip.h>
-
-/* There's no limit. It exists only to avoid realloc. */
-#define MAX_AMD_CHIPS 8
-
-#define DEVICE_TYPE_X8  (8 / 8)
-#define DEVICE_TYPE_X16 (16 / 8)
-#define DEVICE_TYPE_X32 (32 / 8)
-
-/* Addresses */
-#define ADDR_MANUFACTURER               0x0000
-#define ADDR_DEVICE_ID                  0x0001
-#define ADDR_SECTOR_LOCK                0x0002
-#define ADDR_HANDSHAKE                  0x0003
-#define ADDR_UNLOCK_1                   0x0555
-#define ADDR_UNLOCK_2                   0x02AA
-
-/* Commands */
-#define CMD_UNLOCK_DATA_1               0x00AA
-#define CMD_UNLOCK_DATA_2               0x0055
-#define CMD_MANUFACTURER_UNLOCK_DATA    0x0090
-#define CMD_UNLOCK_BYPASS_MODE          0x0020
-#define CMD_PROGRAM_UNLOCK_DATA         0x00A0
-#define CMD_RESET_DATA                  0x00F0
-#define CMD_SECTOR_ERASE_UNLOCK_DATA    0x0080
-#define CMD_SECTOR_ERASE_UNLOCK_DATA_2  0x0030
-
-#define CMD_UNLOCK_SECTOR               0x0060
-
-/* Manufacturers */
-#define MANUFACTURER_AMD        0x0001
-#define MANUFACTURER_ATMEL      0x001F
-#define MANUFACTURER_FUJITSU    0x0004
-#define MANUFACTURER_ST         0x0020
-#define MANUFACTURER_SST        0x00BF
-#define MANUFACTURER_TOSHIBA    0x0098
-
-/* AMD */
-#define AM29F800BB      0x2258
-#define AM29F800BT      0x22D6
-#define AM29LV800BB     0x225B
-#define AM29LV800BT     0x22DA
-#define AM29LV160DT     0x22C4
-#define AM29LV160DB     0x2249
-#define AM29BDS323D     0x22D1
-
-/* Atmel */
-#define AT49xV16x       0x00C0
-#define AT49xV16xT      0x00C2
-
-/* Fujitsu */
-#define MBM29LV160TE    0x22C4
-#define MBM29LV160BE    0x2249
-#define MBM29LV800BB    0x225B
-
-/* ST - www.st.com */
-#define M29W800T        0x00D7
-#define M29W160DT       0x22C4
-#define M29W160DB       0x2249
-
-/* SST */
-#define SST39LF800      0x2781
-#define SST39LF160      0x2782
-
-/* Toshiba */
-#define TC58FVT160      0x00C2
-#define TC58FVB160      0x0043
-
-#define D6_MASK 0x40
-
-struct amd_flash_private {
-        int device_type;
-        int interleave;
-        int numchips;
-        unsigned long chipshift;
-        struct flchip chips[0];
-};
-
-struct amd_flash_info {
-        const __u16 mfr_id;
-        const __u16 dev_id;
-        const char *name;
-        const u_long size;
-        const int numeraseregions;
-        const struct mtd_erase_region_info regions[4];
-};
-
-
-
-static int amd_flash_read(struct mtd_info *, loff_t, size_t, size_t *,
-                          u_char *);
-static int amd_flash_write(struct mtd_info *, loff_t, size_t, size_t *,
-                           const u_char *);
-static int amd_flash_erase(struct mtd_info *, struct erase_info *);
-static void amd_flash_sync(struct mtd_info *);
-static int amd_flash_suspend(struct mtd_info *);
-static void amd_flash_resume(struct mtd_info *);
-static void amd_flash_destroy(struct mtd_info *);
-static struct mtd_info *amd_flash_probe(struct map_info *map);
-
-
-static struct mtd_chip_driver amd_flash_chipdrv = {
-        .probe = amd_flash_probe,
-        .destroy = amd_flash_destroy,
-        .name = "amd_flash",
-        .module = THIS_MODULE
-};
-
-static inline __u32 wide_read(struct map_info *map, __u32 addr)
-{
-        if (map->buswidth == 1) {
-                return map_read8(map, addr);
-        } else if (map->buswidth == 2) {
-                return map_read16(map, addr);
-        } else if (map->buswidth == 4) {
-                return map_read32(map, addr);
-        }
-
-        return 0;
-}
-
-static inline void wide_write(struct map_info *map, __u32 val, __u32 addr)
-{
-        if (map->buswidth == 1) {
-                map_write8(map, val, addr);
-        } else if (map->buswidth == 2) {
-                map_write16(map, val, addr);
-        } else if (map->buswidth == 4) {
-                map_write32(map, val, addr);
-        }
-}
-
-static inline __u32 make_cmd(struct map_info *map, __u32 cmd)
-{
-        const struct amd_flash_private *private = map->fldrv_priv;
-        if ((private->interleave == 2) &&
-            (private->device_type == DEVICE_TYPE_X16)) {
-                cmd |= (cmd << 16);
-        }
-
-        return cmd;
-}
-
-static inline void send_unlock(struct map_info *map, unsigned long base)
-{
-        wide_write(map, (CMD_UNLOCK_DATA_1 << 16) | CMD_UNLOCK_DATA_1,
-                   base + (map->buswidth * ADDR_UNLOCK_1));
-        wide_write(map, (CMD_UNLOCK_DATA_2 << 16) | CMD_UNLOCK_DATA_2,
-                   base + (map->buswidth * ADDR_UNLOCK_2));
-}
-
-static inline void send_cmd(struct map_info *map, unsigned long base, __u32 cmd)
-{
-        send_unlock(map, base);
-        wide_write(map, make_cmd(map, cmd),
-                   base + (map->buswidth * ADDR_UNLOCK_1));
-}
-
-static inline void send_cmd_to_addr(struct map_info *map, unsigned long base,
-                                    __u32 cmd, unsigned long addr)
-{
-        send_unlock(map, base);
-        wide_write(map, make_cmd(map, cmd), addr);
-}
-
-static inline int flash_is_busy(struct map_info *map, unsigned long addr,
-                                int interleave)
-{
-
-        if ((interleave == 2) && (map->buswidth == 4)) {
-                __u32 read1, read2;
-
-                read1 = wide_read(map, addr);
-                read2 = wide_read(map, addr);
-
-                return (((read1 >> 16) & D6_MASK) !=
-                        ((read2 >> 16) & D6_MASK)) ||
-                       (((read1 & 0xffff) & D6_MASK) !=
-                        ((read2 & 0xffff) & D6_MASK));
-        }
-
-        return ((wide_read(map, addr) & D6_MASK) !=
-                (wide_read(map, addr) & D6_MASK));
-}
-
-static inline void unlock_sector(struct map_info *map, unsigned long sect_addr,
-                                 int unlock)
-{
-        /* Sector lock address. A6 = 1 for unlock, A6 = 0 for lock */
-        int SLA = unlock ?
-                (sect_addr |  (0x40 * map->buswidth)) :
-                (sect_addr & ~(0x40 * map->buswidth)) ;
-
-        __u32 cmd = make_cmd(map, CMD_UNLOCK_SECTOR);
-
-        wide_write(map, make_cmd(map, CMD_RESET_DATA), 0);
-        wide_write(map, cmd, SLA); /* 1st cycle: write cmd to any address */
-        wide_write(map, cmd, SLA); /* 2nd cycle: write cmd to any address */
-        wide_write(map, cmd, SLA); /* 3rd cycle: write cmd to SLA */
-}
-
-static inline int is_sector_locked(struct map_info *map,
-                                   unsigned long sect_addr)
-{
-        int status;
-
-        wide_write(map, CMD_RESET_DATA, 0);
-        send_cmd(map, sect_addr, CMD_MANUFACTURER_UNLOCK_DATA);
-
-        /* status is 0x0000 for unlocked and 0x0001 for locked */
-        status = wide_read(map, sect_addr + (map->buswidth * ADDR_SECTOR_LOCK));
-        wide_write(map, CMD_RESET_DATA, 0);
-        return status;
-}
-
-static int amd_flash_do_unlock(struct mtd_info *mtd, loff_t ofs, size_t len,
-                               int is_unlock)
-{
-        struct map_info *map;
-        struct mtd_erase_region_info *merip;
-        int eraseoffset, erasesize, eraseblocks;
-        int i;
-        int retval = 0;
-        int lock_status;
-
-        map = mtd->priv;
-
-        /* Pass the whole chip through sector by sector and check for each
-           sector if the sector and the given interval overlap */
-        for(i = 0; i < mtd->numeraseregions; i++) {
-                merip = &mtd->eraseregions[i];
-
-                eraseoffset = merip->offset;
-                erasesize = merip->erasesize;
-                eraseblocks = merip->numblocks;
-
-                if (ofs > eraseoffset + erasesize)
-                        continue;
-
-                while (eraseblocks > 0) {
-                        if (ofs < eraseoffset + erasesize && ofs + len > eraseoffset) {
-                                unlock_sector(map, eraseoffset, is_unlock);
-
-                                lock_status = is_sector_locked(map, eraseoffset);
-
-                                if (is_unlock && lock_status) {
-                                        printk("Cannot unlock sector at address %x length %xx\n",
-                                               eraseoffset, merip->erasesize);
-                                        retval = -1;
-                                } else if (!is_unlock && !lock_status) {
-                                        printk("Cannot lock sector at address %x length %x\n",
-                                               eraseoffset, merip->erasesize);
-                                        retval = -1;
-                                }
-                        }
-                        eraseoffset += erasesize;
-                        eraseblocks --;
-                }
-        }
-        return retval;
-}
-
-static int amd_flash_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
-{
-        return amd_flash_do_unlock(mtd, ofs, len, 1);
-}
-
-static int amd_flash_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
-{
-        return amd_flash_do_unlock(mtd, ofs, len, 0);
-}
-
-
-/*
- * Reads JEDEC manufacturer ID and device ID and returns the index of the first
- * matching table entry (-1 if not found or alias for already found chip).
- */
-static int probe_new_chip(struct mtd_info *mtd, __u32 base,
-                          struct flchip *chips,
-                          struct amd_flash_private *private,
-                          const struct amd_flash_info *table, int table_size)
-{
-        __u32 mfr_id;
-        __u32 dev_id;
-        struct map_info *map = mtd->priv;
-        struct amd_flash_private temp;
-        int i;
-
-        temp.device_type = DEVICE_TYPE_X16;     // Assume X16 (FIXME)
-        temp.interleave = 2;
-        map->fldrv_priv = &temp;
-
-        /* Enter autoselect mode. */
-        send_cmd(map, base, CMD_RESET_DATA);
-        send_cmd(map, base, CMD_MANUFACTURER_UNLOCK_DATA);
-
-        mfr_id = wide_read(map, base + (map->buswidth * ADDR_MANUFACTURER));
-        dev_id = wide_read(map, base + (map->buswidth * ADDR_DEVICE_ID));
-
-        if ((map->buswidth == 4) && ((mfr_id >> 16) == (mfr_id & 0xffff)) &&
-            ((dev_id >> 16) == (dev_id & 0xffff))) {
-                mfr_id &= 0xffff;
-                dev_id &= 0xffff;
-        } else {
-                temp.interleave = 1;
-        }
-
-        for (i = 0; i < table_size; i++) {
-                if ((mfr_id == table[i].mfr_id) &&
-                    (dev_id == table[i].dev_id)) {
-                        if (chips) {
-                                int j;
-
-                                /* Is this an alias for an already found chip?
-                                 * In that case that chip should be in
-                                 * autoselect mode now.
-                                 */
-                                for (j = 0; j < private->numchips; j++) {
-                                        __u32 mfr_id_other;
-                                        __u32 dev_id_other;
-
-                                        mfr_id_other =
-                                                wide_read(map, chips[j].start +
-                                                               (map->buswidth *
-                                                                ADDR_MANUFACTURER
-                                                               ));
-                                        dev_id_other =
-                                                wide_read(map, chips[j].start +
-                                                               (map->buswidth *
-                                                                ADDR_DEVICE_ID));
-                                        if (temp.interleave == 2) {
-                                                mfr_id_other &= 0xffff;
-                                                dev_id_other &= 0xffff;
-                                        }
-                                        if ((mfr_id_other == mfr_id) &&
-                                            (dev_id_other == dev_id)) {
-
-                                                /* Exit autoselect mode. */
-                                                send_cmd(map, base,
-                                                         CMD_RESET_DATA);
-
-                                                return -1;
-                                        }
-                                }
-
-                                if (private->numchips == MAX_AMD_CHIPS) {
-                                        printk(KERN_WARNING
-                                               "%s: Too many flash chips "
-                                               "detected. Increase "
-                                               "MAX_AMD_CHIPS from %d.\n",
-                                               map->name, MAX_AMD_CHIPS);
-
-                                        return -1;
-                                }
-
-                                chips[private->numchips].start = base;
-                                chips[private->numchips].state = FL_READY;
-                                chips[private->numchips].mutex =
-                                        &chips[private->numchips]._spinlock;
-                                private->numchips++;
-                        }
-
-                        printk("%s: Found %d x %ldMiB %s at 0x%x\n", map->name,
-                               temp.interleave, (table[i].size)/(1024*1024),
-                               table[i].name, base);
-
-                        mtd->size += table[i].size * temp.interleave;
-                        mtd->numeraseregions += table[i].numeraseregions;
-
-                        break;
-                }
-        }
-
-        /* Exit autoselect mode. */
-        send_cmd(map, base, CMD_RESET_DATA);
-
-        if (i == table_size) {
-                printk(KERN_DEBUG "%s: unknown flash device at 0x%x, "
-                       "mfr id 0x%x, dev id 0x%x\n", map->name,
-                       base, mfr_id, dev_id);
-                map->fldrv_priv = NULL;
-
-                return -1;
-        }
-
-        private->device_type = temp.device_type;
-        private->interleave = temp.interleave;
-
-        return i;
-}
-
-
-
-static struct mtd_info *amd_flash_probe(struct map_info *map)
-{
-        static const struct amd_flash_info table[] = {
-        {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29LV160DT,
-                .name = "AMD AM29LV160DT",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
-                        { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29LV160DB,
-                .name = "AMD AM29LV160DB",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_TOSHIBA,
-                .dev_id = TC58FVT160,
-                .name = "Toshiba TC58FVT160",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
-                        { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_FUJITSU,
-                .dev_id = MBM29LV160TE,
-                .name = "Fujitsu MBM29LV160TE",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
-                        { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_TOSHIBA,
-                .dev_id = TC58FVB160,
-                .name = "Toshiba TC58FVB160",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_FUJITSU,
-                .dev_id = MBM29LV160BE,
-                .name = "Fujitsu MBM29LV160BE",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29LV800BB,
-                .name = "AMD AM29LV800BB",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 15 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29F800BB,
-                .name = "AMD AM29F800BB",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 15 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29LV800BT,
-                .name = "AMD AM29LV800BT",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
-                        { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29F800BT,
-                .name = "AMD AM29F800BT",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
-                        { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29LV800BB,
-                .name = "AMD AM29LV800BB",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
-                        { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_FUJITSU,
-                .dev_id = MBM29LV800BB,
-                .name = "Fujitsu MBM29LV800BB",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 15 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_ST,
-                .dev_id = M29W800T,
-                .name = "ST M29W800T",
-                .size = 0x00100000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 15 },
-                        { .offset = 0x0F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_ST,
-                .dev_id = M29W160DT,
-                .name = "ST M29W160DT",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
-                        { .offset = 0x1F0000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x1F8000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x1FC000, .erasesize = 0x04000, .numblocks =  1 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_ST,
-                .dev_id = M29W160DB,
-                .name = "ST M29W160DB",
-                .size = 0x00200000,
-                .numeraseregions = 4,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x04000, .numblocks =  1 },
-                        { .offset = 0x004000, .erasesize = 0x02000, .numblocks =  2 },
-                        { .offset = 0x008000, .erasesize = 0x08000, .numblocks =  1 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_AMD,
-                .dev_id = AM29BDS323D,
-                .name = "AMD AM29BDS323D",
-                .size = 0x00400000,
-                .numeraseregions = 3,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 48 },
-                        { .offset = 0x300000, .erasesize = 0x10000, .numblocks = 15 },
-                        { .offset = 0x3f0000, .erasesize = 0x02000, .numblocks =  8 },
-                }
-        }, {
-                .mfr_id = MANUFACTURER_ATMEL,
-                .dev_id = AT49xV16x,
-                .name = "Atmel AT49xV16x",
-                .size = 0x00200000,
-                .numeraseregions = 2,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x02000, .numblocks =  8 },
-                        { .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
-                }
-        }, {
-                .mfr_id = MANUFACTURER_ATMEL,
-                .dev_id = AT49xV16xT,
-                .name = "Atmel AT49xV16xT",
-                .size = 0x00200000,
-                .numeraseregions = 2,
-                .regions = {
-                        { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
-                        { .offset = 0x1F0000, .erasesize = 0x02000, .numblocks =  8 }
-                }
-        }
-        };
-
-        struct mtd_info *mtd;
-        struct flchip chips[MAX_AMD_CHIPS];
-        int table_pos[MAX_AMD_CHIPS];
-        struct amd_flash_private temp;
-        struct amd_flash_private *private;
-        u_long size;
-        unsigned long base;
-        int i;
-        int reg_idx;
-        int offset;
-
-        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
-        if (!mtd) {
-                printk(KERN_WARNING
-                       "%s: kmalloc failed for info structure\n", map->name);
-                return NULL;
-        }
-        mtd->priv = map;
-
-        memset(&temp, 0, sizeof(temp));
-
-        printk("%s: Probing for AMD compatible flash...\n", map->name);
-
-        if ((table_pos[0] = probe_new_chip(mtd, 0, NULL, &temp, table,
-                                           ARRAY_SIZE(table)))
-            == -1) {
-                printk(KERN_WARNING
-                       "%s: Found no AMD compatible device at location zero\n",
-                       map->name);
-                kfree(mtd);
-
-                return NULL;
-        }
-
-        chips[0].start = 0;
-        chips[0].state = FL_READY;
-        chips[0].mutex = &chips[0]._spinlock;
-        temp.numchips = 1;
-        for (size = mtd->size; size > 1; size >>= 1) {
-                temp.chipshift++;
-        }
-        switch (temp.interleave) {
-                case 2:
-                        temp.chipshift += 1;
-                        break;
-                case 4:
-                        temp.chipshift += 2;
-                        break;
-        }
-
-        /* Find out if there are any more chips in the map. */
-        for (base = (1 << temp.chipshift);
-             base < map->size;
-             base += (1 << temp.chipshift)) {
-                int numchips = temp.numchips;
-                table_pos[numchips] = probe_new_chip(mtd, base, chips,
-                        &temp, table, ARRAY_SIZE(table));
-        }
-
-        mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info) *
-                                    mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) {
-                printk(KERN_WARNING "%s: Failed to allocate "
-                       "memory for MTD erase region info\n", map->name);
-                kfree(mtd);
-                map->fldrv_priv = NULL;
-                return NULL;
-        }
-
-        reg_idx = 0;
-        offset = 0;
-        for (i = 0; i < temp.numchips; i++) {
-                int dev_size;
-                int j;
-
-                dev_size = 0;
-                for (j = 0; j < table[table_pos[i]].numeraseregions; j++) {
-                        mtd->eraseregions[reg_idx].offset = offset +
-                                (table[table_pos[i]].regions[j].offset *
-                                 temp.interleave);
-                        mtd->eraseregions[reg_idx].erasesize =
-                                table[table_pos[i]].regions[j].erasesize *
-                                temp.interleave;
-                        mtd->eraseregions[reg_idx].numblocks =
-                                table[table_pos[i]].regions[j].numblocks;
-                        if (mtd->erasesize <
-                            mtd->eraseregions[reg_idx].erasesize) {
-                                mtd->erasesize =
-                                        mtd->eraseregions[reg_idx].erasesize;
-                        }
-                        dev_size += mtd->eraseregions[reg_idx].erasesize *
-                                    mtd->eraseregions[reg_idx].numblocks;
-                        reg_idx++;
-                }
-                offset += dev_size;
-        }
-        mtd->type = MTD_NORFLASH;
-        mtd->writesize = 1;
-        mtd->flags = MTD_CAP_NORFLASH;
-        mtd->name = map->name;
-        mtd->erase = amd_flash_erase;
-        mtd->read = amd_flash_read;
-        mtd->write = amd_flash_write;
-        mtd->sync = amd_flash_sync;
-        mtd->suspend = amd_flash_suspend;
-        mtd->resume = amd_flash_resume;
-        mtd->lock = amd_flash_lock;
-        mtd->unlock = amd_flash_unlock;
-
-        private = kmalloc(sizeof(*private) + (sizeof(struct flchip) *
-                                              temp.numchips), GFP_KERNEL);
-        if (!private) {
-                printk(KERN_WARNING
-                       "%s: kmalloc failed for private structure\n", map->name);
-                kfree(mtd);
-                map->fldrv_priv = NULL;
-                return NULL;
-        }
-        memcpy(private, &temp, sizeof(temp));
-        memcpy(private->chips, chips,
-               sizeof(struct flchip) * private->numchips);
-        for (i = 0; i < private->numchips; i++) {
-                init_waitqueue_head(&private->chips[i].wq);
-                spin_lock_init(&private->chips[i]._spinlock);
-        }
-
-        map->fldrv_priv = private;
-
-        map->fldrv = &amd_flash_chipdrv;
-
-        __module_get(THIS_MODULE);
-        return mtd;
-}
-
-
-
-static inline int read_one_chip(struct map_info *map, struct flchip *chip,
-                               loff_t adr, size_t len, u_char *buf)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long timeo = jiffies + HZ;
-
-retry:
-        spin_lock_bh(chip->mutex);
-
-        if (chip->state != FL_READY){
-                printk(KERN_INFO "%s: waiting for chip to read, state = %d\n",
-                       map->name, chip->state);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                add_wait_queue(&chip->wq, &wait);
-
-                spin_unlock_bh(chip->mutex);
-
-                schedule();
-                remove_wait_queue(&chip->wq, &wait);
-
-                if(signal_pending(current)) {
-                        return -EINTR;
-                }
-
-                timeo = jiffies + HZ;
-
-                goto retry;
-        }
-
-        adr += chip->start;
-
-        chip->state = FL_READY;
-
-        map_copy_from(map, buf, adr, len);
-
-        wake_up(&chip->wq);
-        spin_unlock_bh(chip->mutex);
-
-        return 0;
-}
-
-
-
-static int amd_flash_read(struct mtd_info *mtd, loff_t from, size_t len,
-                          size_t *retlen, u_char *buf)
-{
-        struct map_info *map = mtd->priv;
-        struct amd_flash_private *private = map->fldrv_priv;
-        unsigned long ofs;
-        int chipnum;
-        int ret = 0;
-
-        if ((from + len) > mtd->size) {
-                printk(KERN_WARNING "%s: read request past end of device "
-                       "(0x%lx)\n", map->name, (unsigned long)from + len);
-
-                return -EINVAL;
-        }
-
-        /* Offset within the first chip that the first read should start. */
-        chipnum = (from >> private->chipshift);
-        ofs = from - (chipnum <<  private->chipshift);
-
-        *retlen = 0;
-
-        while (len) {
-                unsigned long this_len;
-
-                if (chipnum >= private->numchips) {
-                        break;
-                }
-
-                if ((len + ofs - 1) >> private->chipshift) {
-                        this_len = (1 << private->chipshift) - ofs;
-                } else {
-                        this_len = len;
-                }
-
-                ret = read_one_chip(map, &private->chips[chipnum], ofs,
-                                    this_len, buf);
-                if (ret) {
-                        break;
-                }
-
-                *retlen += this_len;
-                len -= this_len;
-                buf += this_len;
-
-                ofs = 0;
-                chipnum++;
-        }
-
-        return ret;
-}
-
-
-
-static int write_one_word(struct map_info *map, struct flchip *chip,
-                          unsigned long adr, __u32 datum)
-{
-        unsigned long timeo = jiffies + HZ;
-        struct amd_flash_private *private = map->fldrv_priv;
-        DECLARE_WAITQUEUE(wait, current);
-        int ret = 0;
-        int times_left;
-
-retry:
-        spin_lock_bh(chip->mutex);
-
-        if (chip->state != FL_READY){
-                printk("%s: waiting for chip to write, state = %d\n",
-                       map->name, chip->state);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                add_wait_queue(&chip->wq, &wait);
-
-                spin_unlock_bh(chip->mutex);
-
-                schedule();
-                remove_wait_queue(&chip->wq, &wait);
-                printk(KERN_INFO "%s: woke up to write\n", map->name);
-                if(signal_pending(current))
-                        return -EINTR;
-
-                timeo = jiffies + HZ;
-
-                goto retry;
-        }
-
-        chip->state = FL_WRITING;
-
-        adr += chip->start;
-        ENABLE_VPP(map);
-        send_cmd(map, chip->start, CMD_PROGRAM_UNLOCK_DATA);
-        wide_write(map, datum, adr);
-
-        times_left = 500000;
-        while (times_left-- && flash_is_busy(map, adr, private->interleave)) {
-                if (need_resched()) {
-                        spin_unlock_bh(chip->mutex);
-                        schedule();
-                        spin_lock_bh(chip->mutex);
-                }
-        }
-
-        if (!times_left) {
-                printk(KERN_WARNING "%s: write to 0x%lx timed out!\n",
-                       map->name, adr);
-                ret = -EIO;
-        } else {
-                __u32 verify;
-                if ((verify = wide_read(map, adr)) != datum) {
-                        printk(KERN_WARNING "%s: write to 0x%lx failed. "
-                               "datum = %x, verify = %x\n",
-                               map->name, adr, datum, verify);
-                        ret = -EIO;
-                }
-        }
-
-        DISABLE_VPP(map);
-        chip->state = FL_READY;
-        wake_up(&chip->wq);
-        spin_unlock_bh(chip->mutex);
-
-        return ret;
-}
-
-
-
-static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len,
-                           size_t *retlen, const u_char *buf)
-{
-        struct map_info *map = mtd->priv;
-        struct amd_flash_private *private = map->fldrv_priv;
-        int ret = 0;
-        int chipnum;
-        unsigned long ofs;
-        unsigned long chipstart;
-
-        *retlen = 0;
-        if (!len) {
-                return 0;
-        }
-
-        chipnum = to >> private->chipshift;
-        ofs = to  - (chipnum << private->chipshift);
-        chipstart = private->chips[chipnum].start;
-
-        /* If it's not bus-aligned, do the first byte write. */
-        if (ofs & (map->buswidth - 1)) {
-                unsigned long bus_ofs = ofs & ~(map->buswidth - 1);
-                int i = ofs - bus_ofs;
-                int n = 0;
-                u_char tmp_buf[4];
-                __u32 datum;
-
-                map_copy_from(map, tmp_buf,
-                               bus_ofs + private->chips[chipnum].start,
-                               map->buswidth);
-                while (len && i < map->buswidth)
-                        tmp_buf[i++] = buf[n++], len--;
-
-                if (map->buswidth == 2) {
-                        datum = *(__u16*)tmp_buf;
-                } else if (map->buswidth == 4) {
-                        datum = *(__u32*)tmp_buf;
-                } else {
-                        return -EINVAL;  /* should never happen, but be safe */
-                }
-
-                ret = write_one_word(map, &private->chips[chipnum], bus_ofs,
-                                     datum);
-                if (ret) {
-                        return ret;
-                }
-
-                ofs += n;
-                buf += n;
-                (*retlen) += n;
-
-                if (ofs >> private->chipshift) {
-                        chipnum++;
-                        ofs = 0;
-                        if (chipnum == private->numchips) {
-                                return 0;
-                        }
-                }
-        }
-
-        /* We are now aligned, write as much as possible. */
-        while(len >= map->buswidth) {
-                __u32 datum;
-
-                if (map->buswidth == 1) {
-                        datum = *(__u8*)buf;
-                } else if (map->buswidth == 2) {
-                        datum = *(__u16*)buf;
-                } else if (map->buswidth == 4) {
-                        datum = *(__u32*)buf;
-                } else {
-                        return -EINVAL;
-                }
-
-                ret = write_one_word(map, &private->chips[chipnum], ofs, datum);
-
-                if (ret) {
-                        return ret;
-                }
-
-                ofs += map->buswidth;
-                buf += map->buswidth;
-                (*retlen) += map->buswidth;
-                len -= map->buswidth;
-
-                if (ofs >> private->chipshift) {
-                        chipnum++;
-                        ofs = 0;
-                        if (chipnum == private->numchips) {
-                                return 0;
-                        }
-                        chipstart = private->chips[chipnum].start;
-                }
-        }
-
-        if (len & (map->buswidth - 1)) {
-                int i = 0, n = 0;
-                u_char tmp_buf[2];
-                __u32 datum;
-
-                map_copy_from(map, tmp_buf,
-                               ofs + private->chips[chipnum].start,
-                               map->buswidth);
-                while (len--) {
-                        tmp_buf[i++] = buf[n++];
-                }
-
-                if (map->buswidth == 2) {
-                        datum = *(__u16*)tmp_buf;
-                } else if (map->buswidth == 4) {
-                        datum = *(__u32*)tmp_buf;
-                } else {
-                        return -EINVAL;  /* should never happen, but be safe */
-                }
-
-                ret = write_one_word(map, &private->chips[chipnum], ofs, datum);
-
-                if (ret) {
-                        return ret;
-                }
-
-                (*retlen) += n;
-        }
-
-        return 0;
-}
-
-
-
-static inline int erase_one_block(struct map_info *map, struct flchip *chip,
-                                  unsigned long adr, u_long size)
-{
-        unsigned long timeo = jiffies + HZ;
-        struct amd_flash_private *private = map->fldrv_priv;
-        DECLARE_WAITQUEUE(wait, current);
-
-retry:
-        spin_lock_bh(chip->mutex);
-
-        if (chip->state != FL_READY){
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                add_wait_queue(&chip->wq, &wait);
-
-                spin_unlock_bh(chip->mutex);
-
-                schedule();
-                remove_wait_queue(&chip->wq, &wait);
-
-                if (signal_pending(current)) {
-                        return -EINTR;
-                }
-
-                timeo = jiffies + HZ;
-
-                goto retry;
-        }
-
-        chip->state = FL_ERASING;
-
-        adr += chip->start;
-        ENABLE_VPP(map);
-        send_cmd(map, chip->start, CMD_SECTOR_ERASE_UNLOCK_DATA);
-        send_cmd_to_addr(map, chip->start, CMD_SECTOR_ERASE_UNLOCK_DATA_2, adr);
-
-        timeo = jiffies + (HZ * 20);
-
-        spin_unlock_bh(chip->mutex);
-        msleep(1000);
-        spin_lock_bh(chip->mutex);
-
-        while (flash_is_busy(map, adr, private->interleave)) {
-
-                if (chip->state != FL_ERASING) {
-                        /* Someone's suspended the erase. Sleep */
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        add_wait_queue(&chip->wq, &wait);
-
-                        spin_unlock_bh(chip->mutex);
-                        printk(KERN_INFO "%s: erase suspended. Sleeping\n",
-                               map->name);
-                        schedule();
-                        remove_wait_queue(&chip->wq, &wait);
-
-                        if (signal_pending(current)) {
-                                return -EINTR;
-                        }
-
-                        timeo = jiffies + (HZ*2); /* FIXME */
-                        spin_lock_bh(chip->mutex);
-                        continue;
-                }
-
-                /* OK Still waiting */
-                if (time_after(jiffies, timeo)) {
-                        chip->state = FL_READY;
-                        spin_unlock_bh(chip->mutex);
-                        printk(KERN_WARNING "%s: waiting for erase to complete "
-                               "timed out.\n", map->name);
-                        DISABLE_VPP(map);
-
-                        return -EIO;
-                }
-
-                /* Latency issues. Drop the lock, wait a while and retry */
-                spin_unlock_bh(chip->mutex);
-
-                if (need_resched())
-                        schedule();
-                else
-                        udelay(1);
-
-                spin_lock_bh(chip->mutex);
-        }
-
-        /* Verify every single word */
-        {
-                int address;
-                int error = 0;
-                __u8 verify;
-
-                for (address = adr; address < (adr + size); address++) {
-                        if ((verify = map_read8(map, address)) != 0xFF) {
-                                error = 1;
-                                break;
-                        }
-                }
-                if (error) {
-                        chip->state = FL_READY;
-                        spin_unlock_bh(chip->mutex);
-                        printk(KERN_WARNING
-                               "%s: verify error at 0x%x, size %ld.\n",
-                               map->name, address, size);
-                        DISABLE_VPP(map);
-
-                        return -EIO;
-                }
-        }
-
-        DISABLE_VPP(map);
-        chip->state = FL_READY;
-        wake_up(&chip->wq);
-        spin_unlock_bh(chip->mutex);
-
-        return 0;
-}
-
-
-
-static int amd_flash_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-        struct map_info *map = mtd->priv;
-        struct amd_flash_private *private = map->fldrv_priv;
-        unsigned long adr, len;
-        int chipnum;
-        int ret = 0;
-        int i;
-        int first;
-        struct mtd_erase_region_info *regions = mtd->eraseregions;
-
-        if (instr->addr > mtd->size) {
-                return -EINVAL;
-        }
-
-        if ((instr->len + instr->addr) > mtd->size) {
-                return -EINVAL;
-        }
-
-        /* Check that both start and end of the requested erase are
-         * aligned with the erasesize at the appropriate addresses.
-         */
-
-        i = 0;
-
-        /* Skip all erase regions which are ended before the start of
-           the requested erase. Actually, to save on the calculations,
-           we skip to the first erase region which starts after the
-           start of the requested erase, and then go back one.
-        */
-
-        while ((i < mtd->numeraseregions) &&
-               (instr->addr >= regions[i].offset)) {
-               i++;
-        }
-        i--;
-
-        /* OK, now i is pointing at the erase region in which this
-         * erase request starts. Check the start of the requested
-         * erase range is aligned with the erase size which is in
-         * effect here.
-         */
-
-        if (instr->addr & (regions[i].erasesize-1)) {
-                return -EINVAL;
-        }
-
-        /* Remember the erase region we start on. */
-
-        first = i;
-
-        /* Next, check that the end of the requested erase is aligned
-         * with the erase region at that address.
-         */
-
-        while ((i < mtd->numeraseregions) &&
-               ((instr->addr + instr->len) >= regions[i].offset)) {
-                i++;
-        }
-
-        /* As before, drop back one to point at the region in which
-         * the address actually falls.
-         */
-
-        i--;
-
-        if ((instr->addr + instr->len) & (regions[i].erasesize-1)) {
-                return -EINVAL;
-        }
-
-        chipnum = instr->addr >> private->chipshift;
-        adr = instr->addr - (chipnum << private->chipshift);
-        len = instr->len;
-
-        i = first;
-
-        while (len) {
-                ret = erase_one_block(map, &private->chips[chipnum], adr,
-                                      regions[i].erasesize);
-
-                if (ret) {
-                        return ret;
-                }
-
-                adr += regions[i].erasesize;
-                len -= regions[i].erasesize;
-
-                if ((adr % (1 << private->chipshift)) ==
-                    ((regions[i].offset + (regions[i].erasesize *
-                                           regions[i].numblocks))
-                     % (1 << private->chipshift))) {
-                        i++;
-                }
-
-                if (adr >> private->chipshift) {
-                        adr = 0;
-                        chipnum++;
-                        if (chipnum >= private->numchips) {
-                                break;
-                        }
-                }
-        }
-
-        instr->state = MTD_ERASE_DONE;
-        mtd_erase_callback(instr);
-
-        return 0;
-}
-
-
-
-static void amd_flash_sync(struct mtd_info *mtd)
-{
-        struct map_info *map = mtd->priv;
-        struct amd_flash_private *private = map->fldrv_priv;
-        int i;
-        struct flchip *chip;
-        int ret = 0;
-        DECLARE_WAITQUEUE(wait, current);
-
-        for (i = 0; !ret && (i < private->numchips); i++) {
-                chip = &private->chips[i];
-
-        retry:
-                spin_lock_bh(chip->mutex);
-
-                switch(chip->state) {
-                case FL_READY:
-                case FL_STATUS:
-                case FL_CFI_QUERY:
-                case FL_JEDEC_QUERY:
-                        chip->oldstate = chip->state;
-                        chip->state = FL_SYNCING;
-                        /* No need to wake_up() on this state change -
-                         * as the whole point is that nobody can do anything
-                         * with the chip now anyway.
-                         */
-                case FL_SYNCING:
-                        spin_unlock_bh(chip->mutex);
-                        break;
-
-                default:
-                        /* Not an idle state */
-                        add_wait_queue(&chip->wq, &wait);
-
-                        spin_unlock_bh(chip->mutex);
-
-                        schedule();
-
-                        remove_wait_queue(&chip->wq, &wait);
-
-                        goto retry;
-                }
-        }
-
-        /* Unlock the chips again */
-        for (i--; i >= 0; i--) {
-                chip = &private->chips[i];
-
-                spin_lock_bh(chip->mutex);
-
-                if (chip->state == FL_SYNCING) {
-                        chip->state = chip->oldstate;
-                        wake_up(&chip->wq);
-                }
-                spin_unlock_bh(chip->mutex);
-        }
-}
-
-
-
-static int amd_flash_suspend(struct mtd_info *mtd)
-{
-printk("amd_flash_suspend(): not implemented!\n");
-        return -EINVAL;
-}
-
-
-
-static void amd_flash_resume(struct mtd_info *mtd)
-{
-printk("amd_flash_resume(): not implemented!\n");
-}
-
-
-
-static void amd_flash_destroy(struct mtd_info *mtd)
-{
-        struct map_info *map = mtd->priv;
-        struct amd_flash_private *private = map->fldrv_priv;
-        kfree(private);
-}
-
-int __init amd_flash_init(void)
-{
-        register_mtd_chip_driver(&amd_flash_chipdrv);
-        return 0;
-}
-
-void __exit amd_flash_exit(void)
-{
-        unregister_mtd_chip_driver(&amd_flash_chipdrv);
-}
-
-module_init(amd_flash_init);
-module_exit(amd_flash_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jonas Holmberg <jonas.holmberg@axis.com>");
-MODULE_DESCRIPTION("Old MTD chip driver for AMD flash chips");
diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
deleted file mode 100644
index 14e57b2bf842..000000000000
--- a/drivers/mtd/chips/jedec.c
+++ /dev/null
@@ -1,935 +0,0 @@
-
-/* JEDEC Flash Interface.
- * This is an older type of interface for self programming flash. It is
- * commonly use in older AMD chips and is obsolete compared with CFI.
- * It is called JEDEC because the JEDEC association distributes the ID codes
- * for the chips.
- *
- * See the AMD flash databook for information on how to operate the interface.
- *
- * This code does not support anything wider than 8 bit flash chips, I am
- * not going to guess how to send commands to them, plus I expect they will
- * all speak CFI..
- *
- * $Id: jedec.c,v 1.22 2005/01/05 18:05:11 dwmw2 Exp $
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/mtd/jedec.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/compatmac.h>
-
-static struct mtd_info *jedec_probe(struct map_info *);
-static int jedec_probe8(struct map_info *map,unsigned long base,
-                  struct jedec_private *priv);
-static int jedec_probe16(struct map_info *map,unsigned long base,
-                  struct jedec_private *priv);
-static int jedec_probe32(struct map_info *map,unsigned long base,
-                  struct jedec_private *priv);
-static void jedec_flash_chip_scan(struct jedec_private *priv,unsigned long start,
-                            unsigned long len);
-static int flash_erase(struct mtd_info *mtd, struct erase_info *instr);
-static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
-                       size_t *retlen, const u_char *buf);
-
-static unsigned long my_bank_size;
-
-/* Listing of parts and sizes. We need this table to learn the sector
-   size of the chip and the total length */
-static const struct JEDECTable JEDEC_table[] = {
-        {
-                .jedec          = 0x013D,
-                .name           = "AMD Am29F017D",
-                .size           = 2*1024*1024,
-                .sectorsize     = 64*1024,
-                .capabilities   = MTD_CAP_NORFLASH
-        },
-        {
-                .jedec          = 0x01AD,
-                .name           = "AMD Am29F016",
-                .size           = 2*1024*1024,
-                .sectorsize     = 64*1024,
-                .capabilities   = MTD_CAP_NORFLASH
-        },
-        {
-                .jedec          = 0x01D5,
-                .name           = "AMD Am29F080",
-                .size           = 1*1024*1024,
-                .sectorsize     = 64*1024,
-                .capabilities   = MTD_CAP_NORFLASH
-        },
-        {
-                .jedec          = 0x01A4,
-                .name           = "AMD Am29F040",
-                .size           = 512*1024,
-                .sectorsize     = 64*1024,
-                .capabilities   = MTD_CAP_NORFLASH
-        },
-        {
-                .jedec          = 0x20E3,
-                .name           = "AMD Am29W040B",
-                .size           = 512*1024,
-                .sectorsize     = 64*1024,
-                .capabilities   = MTD_CAP_NORFLASH
-        },
-        {
-                .jedec          = 0xC2AD,
-                .name           = "Macronix MX29F016",
-                .size           = 2*1024*1024,
-                .sectorsize     = 64*1024,
-                .capabilities   = MTD_CAP_NORFLASH
-        },
-        { .jedec = 0x0 }
-};
-
-static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id);
-static void jedec_sync(struct mtd_info *mtd) {};
-static int jedec_read(struct mtd_info *mtd, loff_t from, size_t len,
-                      size_t *retlen, u_char *buf);
-static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len,
-                             size_t *retlen, u_char *buf);
-
-static struct mtd_info *jedec_probe(struct map_info *map);
-
-
-
-static struct mtd_chip_driver jedec_chipdrv = {
-        .probe  = jedec_probe,
-        .name   = "jedec",
-        .module = THIS_MODULE
-};
-
-/* Probe entry point */
-
-static struct mtd_info *jedec_probe(struct map_info *map)
-{
-   struct mtd_info *MTD;
-   struct jedec_private *priv;
-   unsigned long Base;
-   unsigned long SectorSize;
-   unsigned count;
-   unsigned I,Uniq;
-   char Part[200];
-   memset(&priv,0,sizeof(priv));
-
-   MTD = kzalloc(sizeof(struct mtd_info) + sizeof(struct jedec_private), GFP_KERNEL);
-   if (!MTD)
-           return NULL;
-
-   priv = (struct jedec_private *)&MTD[1];
-
-   my_bank_size = map->size;
-
-   if (map->size/my_bank_size > MAX_JEDEC_CHIPS)
-   {
-      printk("mtd: Increase MAX_JEDEC_CHIPS, too many banks.\n");
-      kfree(MTD);
-      return NULL;
-   }
-
-   for (Base = 0; Base < map->size; Base += my_bank_size)
-   {
-      // Perhaps zero could designate all tests?
-      if (map->buswidth == 0)
-         map->buswidth = 1;
-
-      if (map->buswidth == 1){
-         if (jedec_probe8(map,Base,priv) == 0) {
-                 printk("did recognize jedec chip\n");
-                 kfree(MTD);
-                 return NULL;
-         }
-      }
-      if (map->buswidth == 2)
-         jedec_probe16(map,Base,priv);
-      if (map->buswidth == 4)
-         jedec_probe32(map,Base,priv);
-   }
-
-   // Get the biggest sector size
-   SectorSize = 0;
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-   {
-           //      printk("priv->chips[%d].jedec is %x\n",I,priv->chips[I].jedec);
-           //      printk("priv->chips[%d].sectorsize is %lx\n",I,priv->chips[I].sectorsize);
-      if (priv->chips[I].sectorsize > SectorSize)
-         SectorSize = priv->chips[I].sectorsize;
-   }
-
-   // Quickly ensure that the other sector sizes are factors of the largest
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-   {
-      if ((SectorSize/priv->chips[I].sectorsize)*priv->chips[I].sectorsize != SectorSize)
-      {
-         printk("mtd: Failed. Device has incompatible mixed sector sizes\n");
-         kfree(MTD);
-         return NULL;
-      }
-   }
-
-   /* Generate a part name that includes the number of different chips and
-      other configuration information */
-   count = 1;
-   strlcpy(Part,map->name,sizeof(Part)-10);
-   strcat(Part," ");
-   Uniq = 0;
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-   {
-      const struct JEDECTable *JEDEC;
-
-      if (priv->chips[I+1].jedec == priv->chips[I].jedec)
-      {
-         count++;
-         continue;
-      }
-
-      // Locate the chip in the jedec table
-      JEDEC = jedec_idtoinf(priv->chips[I].jedec >> 8,priv->chips[I].jedec);
-      if (JEDEC == 0)
-      {
-         printk("mtd: Internal Error, JEDEC not set\n");
-         kfree(MTD);
-         return NULL;
-      }
-
-      if (Uniq != 0)
-         strcat(Part,",");
-      Uniq++;
-
-      if (count != 1)
-         sprintf(Part+strlen(Part),"%x*[%s]",count,JEDEC->name);
-      else
-         sprintf(Part+strlen(Part),"%s",JEDEC->name);
-      if (strlen(Part) > sizeof(Part)*2/3)
-         break;
-      count = 1;
-   }
-
-   /* Determine if the chips are organized in a linear fashion, or if there
-      are empty banks. Note, the last bank does not count here, only the
-      first banks are important. Holes on non-bank boundaries can not exist
-      due to the way the detection algorithm works. */
-   if (priv->size < my_bank_size)
-      my_bank_size = priv->size;
-   priv->is_banked = 0;
-   //printk("priv->size is %x, my_bank_size is %x\n",priv->size,my_bank_size);
-   //printk("priv->bank_fill[0] is %x\n",priv->bank_fill[0]);
-   if (!priv->size) {
-           printk("priv->size is zero\n");
-           kfree(MTD);
-           return NULL;
-   }
-   if (priv->size/my_bank_size) {
-           if (priv->size/my_bank_size == 1) {
-                   priv->size = my_bank_size;
-           }
-           else {
-                   for (I = 0; I != priv->size/my_bank_size - 1; I++)
-                   {
-                      if (priv->bank_fill[I] != my_bank_size)
-                         priv->is_banked = 1;
-
-                      /* This even could be eliminated, but new de-optimized read/write
-                         functions have to be written */
-                      printk("priv->bank_fill[%d] is %lx, priv->bank_fill[0] is %lx\n",I,priv->bank_fill[I],priv->bank_fill[0]);
-                      if (priv->bank_fill[I] != priv->bank_fill[0])
-                      {
-                         printk("mtd: Failed. Cannot handle unsymmetric banking\n");
-                         kfree(MTD);
-                         return NULL;
-                      }
-                   }
-           }
-   }
-   if (priv->is_banked == 1)
-      strcat(Part,", banked");
-
-   //   printk("Part: '%s'\n",Part);
-
-   memset(MTD,0,sizeof(*MTD));
-  // strlcpy(MTD->name,Part,sizeof(MTD->name));
-   MTD->name = map->name;
-   MTD->type = MTD_NORFLASH;
-   MTD->flags = MTD_CAP_NORFLASH;
-   MTD->writesize = 1;
-   MTD->erasesize = SectorSize*(map->buswidth);
-   //   printk("MTD->erasesize is %x\n",(unsigned int)MTD->erasesize);
-   MTD->size = priv->size;
-   //   printk("MTD->size is %x\n",(unsigned int)MTD->size);
-   //MTD->module = THIS_MODULE; // ? Maybe this should be the low level module?
-   MTD->erase = flash_erase;
-   if (priv->is_banked == 1)
-      MTD->read = jedec_read_banked;
-   else
-      MTD->read = jedec_read;
-   MTD->write = flash_write;
-   MTD->sync = jedec_sync;
-   MTD->priv = map;
-   map->fldrv_priv = priv;
-   map->fldrv = &jedec_chipdrv;
-   __module_get(THIS_MODULE);
-   return MTD;
-}
-
-/* Helper for the JEDEC function, JEDEC numbers all have odd parity */
-static int checkparity(u_char C)
-{
-   u_char parity = 0;
-   while (C != 0)
-   {
-      parity ^= C & 1;
-      C >>= 1;
-   }
-
-   return parity == 1;
-}
-
-
-/* Take an array of JEDEC numbers that represent interleved flash chips
-   and process them. Check to make sure they are good JEDEC numbers, look
-   them up and then add them to the chip list */
-static int handle_jedecs(struct map_info *map,__u8 *Mfg,__u8 *Id,unsigned Count,
-                  unsigned long base,struct jedec_private *priv)
-{
-   unsigned I,J;
-   unsigned long Size;
-   unsigned long SectorSize;
-   const struct JEDECTable *JEDEC;
-
-   // Test #2 JEDEC numbers exhibit odd parity
-   for (I = 0; I != Count; I++)
-   {
-      if (checkparity(Mfg[I]) == 0 || checkparity(Id[I]) == 0)
-         return 0;
-   }
-
-   // Finally, just make sure all the chip sizes are the same
-   JEDEC = jedec_idtoinf(Mfg[0],Id[0]);
-
-   if (JEDEC == 0)
-   {
-      printk("mtd: Found JEDEC flash chip, but do not have a table entry for %x:%x\n",Mfg[0],Mfg[1]);
-      return 0;
-   }
-
-   Size = JEDEC->size;
-   SectorSize = JEDEC->sectorsize;
-   for (I = 0; I != Count; I++)
-   {
-      JEDEC = jedec_idtoinf(Mfg[0],Id[0]);
-      if (JEDEC == 0)
-      {
-         printk("mtd: Found JEDEC flash chip, but do not have a table entry for %x:%x\n",Mfg[0],Mfg[1]);
-         return 0;
-      }
-
-      if (Size != JEDEC->size || SectorSize != JEDEC->sectorsize)
-      {
-         printk("mtd: Failed. Interleved flash does not have matching characteristics\n");
-         return 0;
-      }
-   }
-
-   // Load the Chips
-   for (I = 0; I != MAX_JEDEC_CHIPS; I++)
-   {
-      if (priv->chips[I].jedec == 0)
-         break;
-   }
-
-   if (I + Count > MAX_JEDEC_CHIPS)
-   {
-      printk("mtd: Device has too many chips. Increase MAX_JEDEC_CHIPS\n");
-      return 0;
-   }
-
-   // Add them to the table
-   for (J = 0; J != Count; J++)
-   {
-      unsigned long Bank;
-
-      JEDEC = jedec_idtoinf(Mfg[J],Id[J]);
-      priv->chips[I].jedec = (Mfg[J] << 8) | Id[J];
-      priv->chips[I].size = JEDEC->size;
-      priv->chips[I].sectorsize = JEDEC->sectorsize;
-      priv->chips[I].base = base + J;
-      priv->chips[I].datashift = J*8;
-      priv->chips[I].capabilities = JEDEC->capabilities;
-      priv->chips[I].offset = priv->size + J;
-
-      // log2 n :|
-      priv->chips[I].addrshift = 0;
-      for (Bank = Count; Bank != 1; Bank >>= 1, priv->chips[I].addrshift++);
-
-      // Determine how filled this bank is.
-      Bank = base & (~(my_bank_size-1));
-      if (priv->bank_fill[Bank/my_bank_size] < base +
-          (JEDEC->size << priv->chips[I].addrshift) - Bank)
-         priv->bank_fill[Bank/my_bank_size] =  base + (JEDEC->size << priv->chips[I].addrshift) - Bank;
-      I++;
-   }
-
-   priv->size += priv->chips[I-1].size*Count;
-
-   return priv->chips[I-1].size;
-}
-
-/* Lookup the chip information from the JEDEC ID table. */
-static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id)
-{
-   __u16 Id = (mfr << 8) | id;
-   unsigned long I = 0;
-   for (I = 0; JEDEC_table[I].jedec != 0; I++)
-      if (JEDEC_table[I].jedec == Id)
-         return JEDEC_table + I;
-   return NULL;
-}
-
-// Look for flash using an 8 bit bus interface
-static int jedec_probe8(struct map_info *map,unsigned long base,
-                  struct jedec_private *priv)
-{
-   #define flread(x) map_read8(map,base+x)
-   #define flwrite(v,x) map_write8(map,v,base+x)
-
-   const unsigned long AutoSel1 = 0xAA;
-   const unsigned long AutoSel2 = 0x55;
-   const unsigned long AutoSel3 = 0x90;
-   const unsigned long Reset = 0xF0;
-   __u32 OldVal;
-   __u8 Mfg[1];
-   __u8 Id[1];
-   unsigned I;
-   unsigned long Size;
-
-   // Wait for any write/erase operation to settle
-   OldVal = flread(base);
-   for (I = 0; OldVal != flread(base) && I < 10000; I++)
-      OldVal = flread(base);
-
-   // Reset the chip
-   flwrite(Reset,0x555);
-
-   // Send the sequence
-   flwrite(AutoSel1,0x555);
-   flwrite(AutoSel2,0x2AA);
-   flwrite(AutoSel3,0x555);
-
-   //  Get the JEDEC numbers
-   Mfg[0] = flread(0);
-   Id[0] = flread(1);
-   //   printk("Mfg is %x, Id is %x\n",Mfg[0],Id[0]);
-
-   Size = handle_jedecs(map,Mfg,Id,1,base,priv);
-   //   printk("handle_jedecs Size is %x\n",(unsigned int)Size);
-   if (Size == 0)
-   {
-      flwrite(Reset,0x555);
-      return 0;
-   }
-
-
-   // Reset.
-   flwrite(Reset,0x555);
-
-   return 1;
-
-   #undef flread
-   #undef flwrite
-}
-
-// Look for flash using a 16 bit bus interface (ie 2 8-bit chips)
-static int jedec_probe16(struct map_info *map,unsigned long base,
-                  struct jedec_private *priv)
-{
-   return 0;
-}
-
-// Look for flash using a 32 bit bus interface (ie 4 8-bit chips)
-static int jedec_probe32(struct map_info *map,unsigned long base,
-                  struct jedec_private *priv)
-{
-   #define flread(x) map_read32(map,base+((x)<<2))
-   #define flwrite(v,x) map_write32(map,v,base+((x)<<2))
-
-   const unsigned long AutoSel1 = 0xAAAAAAAA;
-   const unsigned long AutoSel2 = 0x55555555;
-   const unsigned long AutoSel3 = 0x90909090;
-   const unsigned long Reset = 0xF0F0F0F0;
-   __u32 OldVal;
-   __u8 Mfg[4];
-   __u8 Id[4];
-   unsigned I;
-   unsigned long Size;
-
-   // Wait for any write/erase operation to settle
-   OldVal = flread(base);
-   for (I = 0; OldVal != flread(base) && I < 10000; I++)
-      OldVal = flread(base);
-
-   // Reset the chip
-   flwrite(Reset,0x555);
-
-   // Send the sequence
-   flwrite(AutoSel1,0x555);
-   flwrite(AutoSel2,0x2AA);
-   flwrite(AutoSel3,0x555);
-
-   // Test #1, JEDEC numbers are readable from 0x??00/0x??01
-   if (flread(0) != flread(0x100) ||
-       flread(1) != flread(0x101))
-   {
-      flwrite(Reset,0x555);
-      return 0;
-   }
-
-   // Split up the JEDEC numbers
-   OldVal = flread(0);
-   for (I = 0; I != 4; I++)
-      Mfg[I] = (OldVal >> (I*8));
-   OldVal = flread(1);
-   for (I = 0; I != 4; I++)
-      Id[I] = (OldVal >> (I*8));
-
-   Size = handle_jedecs(map,Mfg,Id,4,base,priv);
-   if (Size == 0)
-   {
-      flwrite(Reset,0x555);
-      return 0;
-   }
-
-   /* Check if there is address wrap around within a single bank, if this
-      returns JEDEC numbers then we assume that it is wrap around. Notice
-      we call this routine with the JEDEC return still enabled, if two or
-      more flashes have a truncated address space the probe test will still
-      work */
-   if (base + (Size<<2)+0x555 < map->size &&
-       base + (Size<<2)+0x555 < (base & (~(my_bank_size-1))) + my_bank_size)
-   {
-      if (flread(base+Size) != flread(base+Size + 0x100) ||
-          flread(base+Size + 1) != flread(base+Size + 0x101))
-      {
-         jedec_probe32(map,base+Size,priv);
-      }
-   }
-
-   // Reset.
-   flwrite(0xF0F0F0F0,0x555);
-
-   return 1;
-
-   #undef flread
-   #undef flwrite
-}
-
-/* Linear read. */
-static int jedec_read(struct mtd_info *mtd, loff_t from, size_t len,
-                      size_t *retlen, u_char *buf)
-{
-   struct map_info *map = mtd->priv;
-
-   map_copy_from(map, buf, from, len);
-   *retlen = len;
-   return 0;
-}
-
-/* Banked read. Take special care to jump past the holes in the bank
-   mapping. This version assumes symetry in the holes.. */
-static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len,
-                             size_t *retlen, u_char *buf)
-{
-   struct map_info *map = mtd->priv;
-   struct jedec_private *priv = map->fldrv_priv;
-
-   *retlen = 0;
-   while (len > 0)
-   {
-      // Determine what bank and offset into that bank the first byte is
-      unsigned long bank = from & (~(priv->bank_fill[0]-1));
-      unsigned long offset = from & (priv->bank_fill[0]-1);
-      unsigned long get = len;
-      if (priv->bank_fill[0] - offset < len)
-         get = priv->bank_fill[0] - offset;
-
-      bank /= priv->bank_fill[0];
-      map_copy_from(map,buf + *retlen,bank*my_bank_size + offset,get);
-
-      len -= get;
-      *retlen += get;
-      from += get;
-   }
-   return 0;
-}
-
-/* Pass the flags value that the flash return before it re-entered read
-   mode. */
-static void jedec_flash_failed(unsigned char code)
-{
-   /* Bit 5 being high indicates that there was an internal device
-      failure, erasure time limits exceeded or something */
-   if ((code & (1 << 5)) != 0)
-   {
-      printk("mtd: Internal Flash failure\n");
-      return;
-   }
-   printk("mtd: Programming didn't take\n");
-}
-
-/* This uses the erasure function described in the AMD Flash Handbook,
-   it will work for flashes with a fixed sector size only. Flashes with
-   a selection of sector sizes (ie the AMD Am29F800B) will need a different
-   routine. This routine tries to parallize erasing multiple chips/sectors
-   where possible */
-static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-   // Does IO to the currently selected chip
-   #define flread(x) map_read8(map,chip->base+((x)<<chip->addrshift))
-   #define flwrite(v,x) map_write8(map,v,chip->base+((x)<<chip->addrshift))
-
-   unsigned long Time = 0;
-   unsigned long NoTime = 0;
-   unsigned long start = instr->addr, len = instr->len;
-   unsigned int I;
-   struct map_info *map = mtd->priv;
-   struct jedec_private *priv = map->fldrv_priv;
-
-   // Verify the arguments..
-   if (start + len > mtd->size ||
-       (start % mtd->erasesize) != 0 ||
-       (len % mtd->erasesize) != 0 ||
-       (len/mtd->erasesize) == 0)
-      return -EINVAL;
-
-   jedec_flash_chip_scan(priv,start,len);
-
-   // Start the erase sequence on each chip
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-   {
-      unsigned long off;
-      struct jedec_flash_chip *chip = priv->chips + I;
-
-      if (chip->length == 0)
-         continue;
-
-      if (chip->start + chip->length > chip->size)
-      {
-         printk("DIE\n");
-         return -EIO;
-      }
-
-      flwrite(0xF0,chip->start + 0x555);
-      flwrite(0xAA,chip->start + 0x555);
-      flwrite(0x55,chip->start + 0x2AA);
-      flwrite(0x80,chip->start + 0x555);
-      flwrite(0xAA,chip->start + 0x555);
-      flwrite(0x55,chip->start + 0x2AA);
-
-      /* Once we start selecting the erase sectors the delay between each
-         command must not exceed 50us or it will immediately start erasing
-         and ignore the other sectors */
-      for (off = 0; off < len; off += chip->sectorsize)
-      {
-         // Check to make sure we didn't timeout
-         flwrite(0x30,chip->start + off);
-         if (off == 0)
-            continue;
-         if ((flread(chip->start + off) & (1 << 3)) != 0)
-         {
-            printk("mtd: Ack! We timed out the erase timer!\n");
-            return -EIO;
-         }
-      }
-   }
-
-   /* We could split this into a timer routine and return early, performing
-      background erasure.. Maybe later if the need warrents */
-
-   /* Poll the flash for erasure completion, specs say this can take as long
-      as 480 seconds to do all the sectors (for a 2 meg flash).
-      Erasure time is dependent on chip age, temp and wear.. */
-
-   /* This being a generic routine assumes a 32 bit bus. It does read32s
-      and bundles interleved chips into the same grouping. This will work
-      for all bus widths */
-   Time = 0;
-   NoTime = 0;
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-   {
-      struct jedec_flash_chip *chip = priv->chips + I;
-      unsigned long off = 0;
-      unsigned todo[4] = {0,0,0,0};
-      unsigned todo_left = 0;
-      unsigned J;
-
-      if (chip->length == 0)
-         continue;
-
-      /* Find all chips in this data line, realistically this is all
-         or nothing up to the interleve count */
-      for (J = 0; priv->chips[J].jedec != 0 && J < MAX_JEDEC_CHIPS; J++)
-      {
-         if ((priv->chips[J].base & (~((1<<chip->addrshift)-1))) ==
-             (chip->base & (~((1<<chip->addrshift)-1))))
-         {
-            todo_left++;
-            todo[priv->chips[J].base & ((1<<chip->addrshift)-1)] = 1;
-         }
-      }
-
-      /*      printk("todo: %x %x %x %x\n",(short)todo[0],(short)todo[1],
-              (short)todo[2],(short)todo[3]);
-      */
-      while (1)
-      {
-         __u32 Last[4];
-         unsigned long Count = 0;
-
-         /* During erase bit 7 is held low and bit 6 toggles, we watch this,
-            should it stop toggling or go high then the erase is completed,
-            or this is not really flash ;> */
-         switch (map->buswidth) {
-         case 1:
-            Last[0] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
-            Last[1] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
-            Last[2] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
-            break;
-         case 2:
-            Last[0] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
-            Last[1] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
-            Last[2] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
-            break;
-         case 3:
-            Last[0] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
-            Last[1] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
-            Last[2] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
-            break;
-         }
-         Count = 3;
-         while (todo_left != 0)
-         {
-            for (J = 0; J != 4; J++)
-            {
-               __u8 Byte1 = (Last[(Count-1)%4] >> (J*8)) & 0xFF;
-               __u8 Byte2 = (Last[(Count-2)%4] >> (J*8)) & 0xFF;
-               __u8 Byte3 = (Last[(Count-3)%4] >> (J*8)) & 0xFF;
-               if (todo[J] == 0)
-                  continue;
-
-               if ((Byte1 & (1 << 7)) == 0 && Byte1 != Byte2)
-               {
-//                printk("Check %x %x %x\n",(short)J,(short)Byte1,(short)Byte2);
-                  continue;
-               }
-
-               if (Byte1 == Byte2)
-               {
-                  jedec_flash_failed(Byte3);
-                  return -EIO;
-               }
-
-               todo[J] = 0;
-               todo_left--;
-            }
-
-/*          if (NoTime == 0)
-               Time += HZ/10 - schedule_timeout(HZ/10);*/
-            NoTime = 0;
-
-            switch (map->buswidth) {
-            case 1:
-               Last[Count % 4] = map_read8(map,(chip->base >> chip->addrshift) + chip->start + off);
-              break;
-            case 2:
-               Last[Count % 4] = map_read16(map,(chip->base >> chip->addrshift) + chip->start + off);
-              break;
-            case 4:
-               Last[Count % 4] = map_read32(map,(chip->base >> chip->addrshift) + chip->start + off);
-              break;
-            }
-            Count++;
-
-/*          // Count time, max of 15s per sector (according to AMD)
-            if (Time > 15*len/mtd->erasesize*HZ)
-            {
-               printk("mtd: Flash Erase Timed out\n");
-               return -EIO;
-            }       */
-         }
-
-         // Skip to the next chip if we used chip erase
-         if (chip->length == chip->size)
-            off = chip->size;
-         else
-            off += chip->sectorsize;
-
-         if (off >= chip->length)
-            break;
-         NoTime = 1;
-      }
-
-      for (J = 0; priv->chips[J].jedec != 0 && J < MAX_JEDEC_CHIPS; J++)
-      {
-         if ((priv->chips[J].base & (~((1<<chip->addrshift)-1))) ==
-             (chip->base & (~((1<<chip->addrshift)-1))))
-            priv->chips[J].length = 0;
-      }
-   }
-
-   //printk("done\n");
-   instr->state = MTD_ERASE_DONE;
-   mtd_erase_callback(instr);
-   return 0;
-
-   #undef flread
-   #undef flwrite
-}
-
-/* This is the simple flash writing function. It writes to every byte, in
-   sequence. It takes care of how to properly address the flash if
-   the flash is interleved. It can only be used if all the chips in the
-   array are identical!*/
-static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
-                       size_t *retlen, const u_char *buf)
-{
-   /* Does IO to the currently selected chip. It takes the bank addressing
-      base (which is divisible by the chip size) adds the necessary lower bits
-      of addrshift (interleave index) and then adds the control register index. */
-   #define flread(x) map_read8(map,base+(off&((1<<chip->addrshift)-1))+((x)<<chip->addrshift))
-   #define flwrite(v,x) map_write8(map,v,base+(off&((1<<chip->addrshift)-1))+((x)<<chip->addrshift))
-
-   struct map_info *map = mtd->priv;
-   struct jedec_private *priv = map->fldrv_priv;
-   unsigned long base;
-   unsigned long off;
-   size_t save_len = len;
-
-   if (start + len > mtd->size)
-      return -EIO;
-
-   //printk("Here");
-
-   //printk("flash_write: start is %x, len is %x\n",start,(unsigned long)len);
-   while (len != 0)
-   {
-      struct jedec_flash_chip *chip = priv->chips;
-      unsigned long bank;
-      unsigned long boffset;
-
-      // Compute the base of the flash.
-      off = ((unsigned long)start) % (chip->size << chip->addrshift);
-      base = start - off;
-
-      // Perform banked addressing translation.
-      bank = base & (~(priv->bank_fill[0]-1));
-      boffset = base & (priv->bank_fill[0]-1);
-      bank = (bank/priv->bank_fill[0])*my_bank_size;
-      base = bank + boffset;
-
-    //  printk("Flasing %X %X %X\n",base,chip->size,len);
-     // printk("off is %x, compare with %x\n",off,chip->size << chip->addrshift);
-
-      // Loop over this page
-      for (; off != (chip->size << chip->addrshift) && len != 0; start++, len--, off++,buf++)
-      {
-         unsigned char oldbyte = map_read8(map,base+off);
-         unsigned char Last[4];
-         unsigned long Count = 0;
-
-         if (oldbyte == *buf) {
-        //       printk("oldbyte and *buf is %x,len is %x\n",oldbyte,len);
-            continue;
-         }
-         if (((~oldbyte) & *buf) != 0)
-            printk("mtd: warn: Trying to set a 0 to a 1\n");
-
-         // Write
-         flwrite(0xAA,0x555);
-         flwrite(0x55,0x2AA);
-         flwrite(0xA0,0x555);
-         map_write8(map,*buf,base + off);
-         Last[0] = map_read8(map,base + off);
-         Last[1] = map_read8(map,base + off);
-         Last[2] = map_read8(map,base + off);
-
-         /* Wait for the flash to finish the operation. We store the last 4
-            status bytes that have been retrieved so we can determine why
-            it failed. The toggle bits keep toggling when there is a
-            failure */
-         for (Count = 3; Last[(Count - 1) % 4] != Last[(Count - 2) % 4] &&
-              Count < 10000; Count++)
-            Last[Count % 4] = map_read8(map,base + off);
-         if (Last[(Count - 1) % 4] != *buf)
-         {
-            jedec_flash_failed(Last[(Count - 3) % 4]);
-            return -EIO;
-         }
-      }
-   }
-   *retlen = save_len;
-   return 0;
-}
-
-/* This is used to enhance the speed of the erase routine,
-   when things are being done to multiple chips it is possible to
-   parallize the operations, particularly full memory erases of multi
-   chip memories benifit */
-static void jedec_flash_chip_scan(struct jedec_private *priv,unsigned long start,
-                     unsigned long len)
-{
-   unsigned int I;
-
-   // Zero the records
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-      priv->chips[I].start = priv->chips[I].length = 0;
-
-   // Intersect the region with each chip
-   for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
-   {
-      struct jedec_flash_chip *chip = priv->chips + I;
-      unsigned long ByteStart;
-      unsigned long ChipEndByte = chip->offset + (chip->size << chip->addrshift);
-
-      // End is before this chip or the start is after it
-      if (start+len < chip->offset ||
-          ChipEndByte - (1 << chip->addrshift) < start)
-         continue;
-
-      if (start < chip->offset)
-      {
-         ByteStart = chip->offset;
-         chip->start = 0;
-      }
-      else
-      {
-         chip->start = (start - chip->offset + (1 << chip->addrshift)-1) >> chip->addrshift;
-         ByteStart = start;
-      }
-
-      if (start + len >= ChipEndByte)
-         chip->length = (ChipEndByte - ByteStart) >> chip->addrshift;
-      else
-         chip->length = (start + len - ByteStart + (1 << chip->addrshift)-1) >> chip->addrshift;
-   }
-}
-
-int __init jedec_init(void)
-{
-        register_mtd_chip_driver(&jedec_chipdrv);
-        return 0;
-}
-
-static void __exit jedec_exit(void)
-{
-        unregister_mtd_chip_driver(&jedec_chipdrv);
-}
-
-module_init(jedec_init);
-module_exit(jedec_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jason Gunthorpe <jgg@deltatee.com> et al.");
-MODULE_DESCRIPTION("Old MTD chip driver for JEDEC-compliant flash chips");
diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c
deleted file mode 100644
index c9cd3d21ccfa..000000000000
--- a/drivers/mtd/chips/sharp.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * MTD chip driver for pre-CFI Sharp flash chips
- *
- * Copyright 2000,2001 David A. Schleef <ds@schleef.org>
- *           2000,2001 Lineo, Inc.
- *
- * $Id: sharp.c,v 1.17 2005/11/29 14:28:28 gleixner Exp $
- *
- * Devices supported:
- *   LH28F016SCT Symmetrical block flash memory, 2Mx8
- *   LH28F008SCT Symmetrical block flash memory, 1Mx8
- *
- * Documentation:
- *   http://www.sharpmeg.com/datasheets/memic/flashcmp/
- *   http://www.sharpmeg.com/datasheets/memic/flashcmp/01symf/16m/016sctl9.pdf
- *   016sctl9.pdf
- *
- * Limitations:
- *   This driver only supports 4x1 arrangement of chips.
- *   Not tested on anything but PowerPC.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/cfi.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-
-#define CMD_RESET               0xffffffff
-#define CMD_READ_ID             0x90909090
-#define CMD_READ_STATUS         0x70707070
-#define CMD_CLEAR_STATUS        0x50505050
-#define CMD_BLOCK_ERASE_1       0x20202020
-#define CMD_BLOCK_ERASE_2       0xd0d0d0d0
-#define CMD_BYTE_WRITE          0x40404040
-#define CMD_SUSPEND             0xb0b0b0b0
-#define CMD_RESUME              0xd0d0d0d0
-#define CMD_SET_BLOCK_LOCK_1    0x60606060
-#define CMD_SET_BLOCK_LOCK_2    0x01010101
-#define CMD_SET_MASTER_LOCK_1   0x60606060
-#define CMD_SET_MASTER_LOCK_2   0xf1f1f1f1
-#define CMD_CLEAR_BLOCK_LOCKS_1 0x60606060
-#define CMD_CLEAR_BLOCK_LOCKS_2 0xd0d0d0d0
-
-#define SR_READY                0x80808080 // 1 = ready
-#define SR_ERASE_SUSPEND        0x40404040 // 1 = block erase suspended
-#define SR_ERROR_ERASE          0x20202020 // 1 = error in block erase or clear lock bits
-#define SR_ERROR_WRITE          0x10101010 // 1 = error in byte write or set lock bit
-#define SR_VPP                  0x08080808 // 1 = Vpp is low
-#define SR_WRITE_SUSPEND        0x04040404 // 1 = byte write suspended
-#define SR_PROTECT              0x02020202 // 1 = lock bit set
-#define SR_RESERVED             0x01010101
-
-#define SR_ERRORS (SR_ERROR_ERASE|SR_ERROR_WRITE|SR_VPP|SR_PROTECT)
-
-/* Configuration options */
-
-#undef AUTOUNLOCK  /* automatically unlocks blocks before erasing */
-
-static struct mtd_info *sharp_probe(struct map_info *);
-
-static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd);
-
-static int sharp_read(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf);
-static int sharp_write(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, const u_char *buf);
-static int sharp_erase(struct mtd_info *mtd, struct erase_info *instr);
-static void sharp_sync(struct mtd_info *mtd);
-static int sharp_suspend(struct mtd_info *mtd);
-static void sharp_resume(struct mtd_info *mtd);
-static void sharp_destroy(struct mtd_info *mtd);
-
-static int sharp_write_oneword(struct map_info *map, struct flchip *chip,
-        unsigned long adr, __u32 datum);
-static int sharp_erase_oneblock(struct map_info *map, struct flchip *chip,
-        unsigned long adr);
-#ifdef AUTOUNLOCK
-static void sharp_unlock_oneblock(struct map_info *map, struct flchip *chip,
-        unsigned long adr);
-#endif
-
-
-struct sharp_info{
-        struct flchip *chip;
-        int bogus;
-        int chipshift;
-        int numchips;
-        struct flchip chips[1];
-};
-
-static void sharp_destroy(struct mtd_info *mtd);
-
-static struct mtd_chip_driver sharp_chipdrv = {
-        .probe          = sharp_probe,
-        .destroy        = sharp_destroy,
-        .name           = "sharp",
-        .module         = THIS_MODULE
-};
-
-
-static struct mtd_info *sharp_probe(struct map_info *map)
-{
-        struct mtd_info *mtd = NULL;
-        struct sharp_info *sharp = NULL;
-        int width;
-
-        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
-        if(!mtd)
-                return NULL;
-
-        sharp = kzalloc(sizeof(*sharp), GFP_KERNEL);
-        if(!sharp) {
-                kfree(mtd);
-                return NULL;
-        }
-
-        width = sharp_probe_map(map,mtd);
-        if(!width){
-                kfree(mtd);
-                kfree(sharp);
-                return NULL;
-        }
-
-        mtd->priv = map;
-        mtd->type = MTD_NORFLASH;
-        mtd->erase = sharp_erase;
-        mtd->read = sharp_read;
-        mtd->write = sharp_write;
-        mtd->sync = sharp_sync;
-        mtd->suspend = sharp_suspend;
-        mtd->resume = sharp_resume;
-        mtd->flags = MTD_CAP_NORFLASH;
-        mtd->writesize = 1;
-        mtd->name = map->name;
-
-        sharp->chipshift = 23;
-        sharp->numchips = 1;
-        sharp->chips[0].start = 0;
-        sharp->chips[0].state = FL_READY;
-        sharp->chips[0].mutex = &sharp->chips[0]._spinlock;
-        sharp->chips[0].word_write_time = 0;
-        init_waitqueue_head(&sharp->chips[0].wq);
-        spin_lock_init(&sharp->chips[0]._spinlock);
-
-        map->fldrv = &sharp_chipdrv;
-        map->fldrv_priv = sharp;
-
-        __module_get(THIS_MODULE);
-        return mtd;
-}
-
-static inline void sharp_send_cmd(struct map_info *map, unsigned long cmd, unsigned long adr)
-{
-        map_word map_cmd;
-        map_cmd.x[0] = cmd;
-        map_write(map, map_cmd, adr);
-}
-
-static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd)
-{
-        map_word tmp, read0, read4;
-        unsigned long base = 0;
-        int width = 4;
-
-        tmp = map_read(map, base+0);
-
-        sharp_send_cmd(map, CMD_READ_ID, base+0);
-
-        read0 = map_read(map, base+0);
-        read4 = map_read(map, base+4);
-        if(read0.x[0] == 0x89898989){
-                printk("Looks like sharp flash\n");
-                switch(read4.x[0]){
-                case 0xaaaaaaaa:
-                case 0xa0a0a0a0:
-                        /* aa - LH28F016SCT-L95 2Mx8, 32 64k blocks*/
-                        /* a0 - LH28F016SCT-Z4  2Mx8, 32 64k blocks*/
-                        mtd->erasesize = 0x10000 * width;
-                        mtd->size = 0x200000 * width;
-                        return width;
-                case 0xa6a6a6a6:
-                        /* a6 - LH28F008SCT-L12 1Mx8, 16 64k blocks*/
-                        /* a6 - LH28F008SCR-L85 1Mx8, 16 64k blocks*/
-                        mtd->erasesize = 0x10000 * width;
-                        mtd->size = 0x100000 * width;
-                        return width;
-#if 0
-                case 0x00000000: /* unknown */
-                        /* XX - LH28F004SCT 512kx8, 8 64k blocks*/
-                        mtd->erasesize = 0x10000 * width;
-                        mtd->size = 0x80000 * width;
-                        return width;
-#endif
-                default:
-                        printk("Sort-of looks like sharp flash, 0x%08lx 0x%08lx\n",
-                                read0.x[0], read4.x[0]);
-                }
-        }else if((map_read(map, base+0).x[0] == CMD_READ_ID)){
-                /* RAM, probably */
-                printk("Looks like RAM\n");
-                map_write(map, tmp, base+0);
-        }else{
-                printk("Doesn't look like sharp flash, 0x%08lx 0x%08lx\n",
-                        read0.x[0], read4.x[0]);
-        }
-
-        return 0;
-}
-
-/* This function returns with the chip->mutex lock held. */
-static int sharp_wait(struct map_info *map, struct flchip *chip)
-{
-        int i;
-        map_word status;
-        unsigned long timeo = jiffies + HZ;
-        DECLARE_WAITQUEUE(wait, current);
-        int adr = 0;
-
-retry:
-        spin_lock_bh(chip->mutex);
-
-        switch(chip->state){
-        case FL_READY:
-                sharp_send_cmd(map, CMD_READ_STATUS, adr);
-                chip->state = FL_STATUS;
-        case FL_STATUS:
-                for(i=0;i<100;i++){
-                        status = map_read(map, adr);
-                        if((status.x[0] & SR_READY)==SR_READY)
-                                break;
-                        udelay(1);
-                }
-                break;
-        default:
-                printk("Waiting for chip\n");
-
-                set_current_state(TASK_INTERRUPTIBLE);
-                add_wait_queue(&chip->wq, &wait);
-
-                spin_unlock_bh(chip->mutex);
-
-                schedule();
-                remove_wait_queue(&chip->wq, &wait);
-
-                if(signal_pending(current))
-                        return -EINTR;
-
-                timeo = jiffies + HZ;
-
-                goto retry;
-        }
-
-        sharp_send_cmd(map, CMD_RESET, adr);
-
-        chip->state = FL_READY;
-
-        return 0;
-}
-
-static void sharp_release(struct flchip *chip)
-{
-        wake_up(&chip->wq);
-        spin_unlock_bh(chip->mutex);
-}
-
-static int sharp_read(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf)
-{
-        struct map_info *map = mtd->priv;
-        struct sharp_info *sharp = map->fldrv_priv;
-        int chipnum;
-        int ret = 0;
-        int ofs = 0;
-
-        chipnum = (from >> sharp->chipshift);
-        ofs = from & ((1 << sharp->chipshift)-1);
-
-        *retlen = 0;
-
-        while(len){
-                unsigned long thislen;
-
-                if(chipnum>=sharp->numchips)
-                        break;
-
-                thislen = len;
-                if(ofs+thislen >= (1<<sharp->chipshift))
-                        thislen = (1<<sharp->chipshift) - ofs;
-
-                ret = sharp_wait(map,&sharp->chips[chipnum]);
-                if(ret<0)
-                        break;
-
-                map_copy_from(map,buf,ofs,thislen);
-
-                sharp_release(&sharp->chips[chipnum]);
-
-                *retlen += thislen;
-                len -= thislen;
-                buf += thislen;
-
-                ofs = 0;
-                chipnum++;
-        }
-        return ret;
-}
-
-static int sharp_write(struct mtd_info *mtd, loff_t to, size_t len,
-        size_t *retlen, const u_char *buf)
-{
-        struct map_info *map = mtd->priv;
-        struct sharp_info *sharp = map->fldrv_priv;
-        int ret = 0;
-        int i,j;
-        int chipnum;
-        unsigned long ofs;
-        union { u32 l; unsigned char uc[4]; } tbuf;
-
-        *retlen = 0;
-
-        while(len){
-                tbuf.l = 0xffffffff;
-                chipnum = to >> sharp->chipshift;
-                ofs = to & ((1<<sharp->chipshift)-1);
-
-                j=0;
-                for(i=ofs&3;i<4 && len;i++){
-                        tbuf.uc[i] = *buf;
-                        buf++;
-                        to++;
-                        len--;
-                        j++;
-                }
-                sharp_write_oneword(map, &sharp->chips[chipnum], ofs&~3, tbuf.l);
-                if(ret<0)
-                        return ret;
-                (*retlen)+=j;
-        }
-
-        return 0;
-}
-
-static int sharp_write_oneword(struct map_info *map, struct flchip *chip,
-        unsigned long adr, __u32 datum)
-{
-        int ret;
-        int timeo;
-        int try;
-        int i;
-        map_word data, status;
-
-        status.x[0] = 0;
-        ret = sharp_wait(map,chip);
-
-        for(try=0;try<10;try++){
-                sharp_send_cmd(map, CMD_BYTE_WRITE, adr);
-                /* cpu_to_le32 -> hack to fix the writel be->le conversion */
-                data.x[0] = cpu_to_le32(datum);
-                map_write(map, data, adr);
-
-                chip->state = FL_WRITING;
-
-                timeo = jiffies + (HZ/2);
-
-                sharp_send_cmd(map, CMD_READ_STATUS, adr);
-                for(i=0;i<100;i++){
-                        status = map_read(map, adr);
-                        if((status.x[0] & SR_READY) == SR_READY)
-                                break;
-                }
-                if(i==100){
-                        printk("sharp: timed out writing\n");
-                }
-
-                if(!(status.x[0] & SR_ERRORS))
-                        break;
-
-                printk("sharp: error writing byte at addr=%08lx status=%08lx\n", adr, status.x[0]);
-
-                sharp_send_cmd(map, CMD_CLEAR_STATUS, adr);
-        }
-        sharp_send_cmd(map, CMD_RESET, adr);
-        chip->state = FL_READY;
-
-        wake_up(&chip->wq);
-        spin_unlock_bh(chip->mutex);
-
-        return 0;
-}
-
-static int sharp_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-        struct map_info *map = mtd->priv;
-        struct sharp_info *sharp = map->fldrv_priv;
-        unsigned long adr,len;
-        int chipnum, ret=0;
-
-//printk("sharp_erase()\n");
-        if(instr->addr & (mtd->erasesize - 1))
-                return -EINVAL;
-        if(instr->len & (mtd->erasesize - 1))
-                return -EINVAL;
-        if(instr->len + instr->addr > mtd->size)
-                return -EINVAL;
-
-        chipnum = instr->addr >> sharp->chipshift;
-        adr = instr->addr & ((1<<sharp->chipshift)-1);
-        len = instr->len;
-
-        while(len){
-                ret = sharp_erase_oneblock(map, &sharp->chips[chipnum], adr);
-                if(ret)return ret;
-
-                adr += mtd->erasesize;
-                len -= mtd->erasesize;
-                if(adr >> sharp->chipshift){
-                        adr = 0;
-                        chipnum++;
-                        if(chipnum>=sharp->numchips)
-                                break;
-                }
-        }
-
-        instr->state = MTD_ERASE_DONE;
-        mtd_erase_callback(instr);
-
-        return 0;
-}
-
-static int sharp_do_wait_for_ready(struct map_info *map, struct flchip *chip,
-        unsigned long adr)
-{
-        int ret;
-        unsigned long timeo;
-        map_word status;
-        DECLARE_WAITQUEUE(wait, current);
-
-        sharp_send_cmd(map, CMD_READ_STATUS, adr);
-        status = map_read(map, adr);
-
-        timeo = jiffies + HZ;
-
-        while(time_before(jiffies, timeo)){
-                sharp_send_cmd(map, CMD_READ_STATUS, adr);
-                status = map_read(map, adr);
-                if((status.x[0] & SR_READY)==SR_READY){
-                        ret = 0;
-                        goto out;
-                }
-                set_current_state(TASK_INTERRUPTIBLE);
-                add_wait_queue(&chip->wq, &wait);
-
-                //spin_unlock_bh(chip->mutex);
-
-                schedule_timeout(1);
-                schedule();
-                remove_wait_queue(&chip->wq, &wait);
-
-                //spin_lock_bh(chip->mutex);
-
-                if (signal_pending(current)){
-                        ret = -EINTR;
-                        goto out;
-                }
-
-        }
-        ret = -ETIME;
-out:
-        return ret;
-}
-
-static int sharp_erase_oneblock(struct map_info *map, struct flchip *chip,
-        unsigned long adr)
-{
-        int ret;
-        //int timeo;
-        map_word status;
-        //int i;
-
-//printk("sharp_erase_oneblock()\n");
-
-#ifdef AUTOUNLOCK
-        /* This seems like a good place to do an unlock */
-        sharp_unlock_oneblock(map,chip,adr);
-#endif
-
-        sharp_send_cmd(map, CMD_BLOCK_ERASE_1, adr);
-        sharp_send_cmd(map, CMD_BLOCK_ERASE_2, adr);
-
-        chip->state = FL_ERASING;
-
-        ret = sharp_do_wait_for_ready(map,chip,adr);
-        if(ret<0)return ret;
-
-        sharp_send_cmd(map, CMD_READ_STATUS, adr);
-        status = map_read(map, adr);
-
-        if(!(status.x[0] & SR_ERRORS)){
-                sharp_send_cmd(map, CMD_RESET, adr);
-                chip->state = FL_READY;
-                //spin_unlock_bh(chip->mutex);
-                return 0;
-        }
-
-        printk("sharp: error erasing block at addr=%08lx status=%08lx\n", adr, status.x[0]);
-        sharp_send_cmd(map, CMD_CLEAR_STATUS, adr);
-
-        //spin_unlock_bh(chip->mutex);
-
-        return -EIO;
-}
-
-#ifdef AUTOUNLOCK
-static void sharp_unlock_oneblock(struct map_info *map, struct flchip *chip,
-        unsigned long adr)
-{
-        int i;
-        map_word status;
-
-        sharp_send_cmd(map, CMD_CLEAR_BLOCK_LOCKS_1, adr);
-        sharp_send_cmd(map, CMD_CLEAR_BLOCK_LOCKS_2, adr);
-
-        udelay(100);
-
-        status = map_read(map, adr);
-        printk("status=%08lx\n", status.x[0]);
-
-        for(i=0;i<1000;i++){
-                //sharp_send_cmd(map, CMD_READ_STATUS, adr);
-                status = map_read(map, adr);
-                if((status.x[0] & SR_READY) == SR_READY)
-                        break;
-                udelay(100);
-        }
-        if(i==1000){
-                printk("sharp: timed out unlocking block\n");
-        }
-
-        if(!(status.x[0] & SR_ERRORS)){
-                sharp_send_cmd(map, CMD_RESET, adr);
-                chip->state = FL_READY;
-                return;
-        }
-
-        printk("sharp: error unlocking block at addr=%08lx status=%08lx\n", adr, status.x[0]);
-        sharp_send_cmd(map, CMD_CLEAR_STATUS, adr);
-}
-#endif
-
-static void sharp_sync(struct mtd_info *mtd)
-{
-        //printk("sharp_sync()\n");
-}
-
-static int sharp_suspend(struct mtd_info *mtd)
-{
-        printk("sharp_suspend()\n");
-        return -EINVAL;
-}
-
-static void sharp_resume(struct mtd_info *mtd)
-{
-        printk("sharp_resume()\n");
-
-}
-
-static void sharp_destroy(struct mtd_info *mtd)
-{
-        printk("sharp_destroy()\n");
-
-}
-
-static int __init sharp_probe_init(void)
-{
-        printk("MTD Sharp chip driver <ds@lineo.com>\n");
-
-        register_mtd_chip_driver(&sharp_chipdrv);
-
-        return 0;
-}
-
-static void __exit sharp_probe_exit(void)
-{
-        unregister_mtd_chip_driver(&sharp_chipdrv);
-}
-
-module_init(sharp_probe_init);
-module_exit(sharp_probe_exit);
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Schleef <ds@schleef.org>");
-MODULE_DESCRIPTION("Old MTD chip driver for pre-CFI Sharp flash chips");
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index fc4cc8ba9e29..be4b9948c762 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -373,7 +373,7 @@ static inline void kill_final_newline(char *str)
 
 #ifndef MODULE
 static int block2mtd_init_called = 0;
-static __initdata char block2mtd_paramline[80 + 12]; /* 80 for device, 12 for erase size */
+static char block2mtd_paramline[80 + 12]; /* 80 for device, 12 for erase size */
 #endif
 
 
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index d990d8141ef5..b665e4ac2208 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -60,7 +60,7 @@ config MTD_PHYSMAP_BANKWIDTH
           (i.e., run-time calling physmap_configure()).
 
 config MTD_PHYSMAP_OF
-        tristate "Flash device in physical memory map based on OF descirption"
+        tristate "Flash device in physical memory map based on OF description"
         depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
         help
           This provides a 'mapping' driver which allows the NOR Flash and
@@ -358,22 +358,6 @@ config MTD_CFI_FLAGADM
           Mapping for the Flaga digital module. If you don't have one, ignore
           this setting.
 
-config MTD_BEECH
-        tristate "CFI Flash device mapped on IBM 405LP Beech"
-        depends on MTD_CFI && BEECH
-        help
-          This enables access routines for the flash chips on the IBM
-          405LP Beech board. If you have one of these boards and would like
-          to use the flash chips on it, say 'Y'.
-
-config MTD_ARCTIC
-        tristate "CFI Flash device mapped on IBM 405LP Arctic"
-        depends on MTD_CFI && ARCTIC2
-        help
-          This enables access routines for the flash chips on the IBM 405LP
-          Arctic board. If you have one of these boards and would like to
-          use the flash chips on it, say 'Y'.
-
 config MTD_WALNUT
         tristate "Flash device mapped on IBM 405GP Walnut"
         depends on MTD_JEDECPROBE && WALNUT
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index de036c5e6139..3acbb5d01ca4 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -58,8 +58,6 @@ obj-$(CONFIG_MTD_NETtel)	+= nettel.o
 obj-$(CONFIG_MTD_SCB2_FLASH)    += scb2_flash.o
 obj-$(CONFIG_MTD_EBONY)         += ebony.o
 obj-$(CONFIG_MTD_OCOTEA)        += ocotea.o
-obj-$(CONFIG_MTD_BEECH)         += beech-mtd.o
-obj-$(CONFIG_MTD_ARCTIC)        += arctic-mtd.o
 obj-$(CONFIG_MTD_WALNUT)        += walnut.o
 obj-$(CONFIG_MTD_H720X)         += h720x-flash.o
 obj-$(CONFIG_MTD_SBC8240)       += sbc8240.o
diff --git a/drivers/mtd/maps/arctic-mtd.c b/drivers/mtd/maps/arctic-mtd.c
deleted file mode 100644
index 2cc902436275..000000000000
--- a/drivers/mtd/maps/arctic-mtd.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * $Id: arctic-mtd.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $
- *
- * drivers/mtd/maps/arctic-mtd.c MTD mappings and partition tables for
- *                              IBM 405LP Arctic boards.
- *
- * 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
- *
- * Copyright (C) 2002, International Business Machines Corporation
- * All Rights Reserved.
- *
- * Bishop Brock
- * IBM Research, Austin Center for Low-Power Computing
- * bcbrock@us.ibm.com
- * March 2002
- *
- * modified for Arctic by,
- * David Gibson
- * IBM OzLabs, Canberra, Australia
- * <arctic@gibson.dropbear.id.au>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-#include <asm/ibm4xx.h>
-
-/*
- * 0 : 0xFE00 0000 - 0xFEFF FFFF : Filesystem 1 (16MiB)
- * 1 : 0xFF00 0000 - 0xFF4F FFFF : kernel (5.12MiB)
- * 2 : 0xFF50 0000 - 0xFFF5 FFFF : Filesystem 2 (10.624MiB) (if non-XIP)
- * 3 : 0xFFF6 0000 - 0xFFFF FFFF : PIBS Firmware (640KiB)
- */
-
-#define FFS1_SIZE       0x01000000 /* 16MiB */
-#define KERNEL_SIZE     0x00500000 /* 5.12MiB */
-#define FFS2_SIZE       0x00a60000 /* 10.624MiB */
-#define FIRMWARE_SIZE   0x000a0000 /* 640KiB */
-
-
-#define NAME            "Arctic Linux Flash"
-#define PADDR           SUBZERO_BOOTFLASH_PADDR
-#define BUSWIDTH        2
-#define SIZE            SUBZERO_BOOTFLASH_SIZE
-#define PARTITIONS      4
-
-/* Flash memories on these boards are memory resources, accessed big-endian. */
-
-{
-  /* do nothing for now */
-}
-
-static struct map_info arctic_mtd_map = {
-        .name           = NAME,
-        .size           = SIZE,
-        .bankwidth      = BUSWIDTH,
-        .phys           = PADDR,
-};
-
-static struct mtd_info *arctic_mtd;
-
-static struct mtd_partition arctic_partitions[PARTITIONS] = {
-        { .name         = "Filesystem",
-          .size         = FFS1_SIZE,
-          .offset       = 0,},
-        { .name         = "Kernel",
-          .size         = KERNEL_SIZE,
-          .offset       = FFS1_SIZE,},
-        { .name         = "Filesystem",
-          .size         = FFS2_SIZE,
-          .offset       = FFS1_SIZE + KERNEL_SIZE,},
-        { .name         = "Firmware",
-          .size         = FIRMWARE_SIZE,
-          .offset       = SUBZERO_BOOTFLASH_SIZE - FIRMWARE_SIZE,},
-};
-
-static int __init
-init_arctic_mtd(void)
-{
-        int err;
-
-        printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
-
-        arctic_mtd_map.virt = ioremap(PADDR, SIZE);
-
-        if (!arctic_mtd_map.virt) {
-                printk("%s: failed to ioremap 0x%x\n", NAME, PADDR);
-                return -EIO;
-        }
-        simple_map_init(&arctic_mtd_map);
-
-        printk("%s: probing %d-bit flash bus\n", NAME, BUSWIDTH * 8);
-        arctic_mtd = do_map_probe("cfi_probe", &arctic_mtd_map);
-
-        if (!arctic_mtd) {
-                iounmap(arctic_mtd_map.virt);
-                return -ENXIO;
-        }
-
-        arctic_mtd->owner = THIS_MODULE;
-
-        err = add_mtd_partitions(arctic_mtd, arctic_partitions, PARTITIONS);
-        if (err) {
-                printk("%s: add_mtd_partitions failed\n", NAME);
-                iounmap(arctic_mtd_map.virt);
-        }
-
-        return err;
-}
-
-static void __exit
-cleanup_arctic_mtd(void)
-{
-        if (arctic_mtd) {
-                del_mtd_partitions(arctic_mtd);
-                map_destroy(arctic_mtd);
-                iounmap((void *) arctic_mtd_map.virt);
-        }
-}
-
-module_init(init_arctic_mtd);
-module_exit(cleanup_arctic_mtd);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Gibson <arctic@gibson.dropbear.id.au>");
-MODULE_DESCRIPTION("MTD map and partitions for IBM 405LP Arctic boards");
diff --git a/drivers/mtd/maps/beech-mtd.c b/drivers/mtd/maps/beech-mtd.c
deleted file mode 100644
index d76d5981b863..000000000000
--- a/drivers/mtd/maps/beech-mtd.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * $Id: beech-mtd.c,v 1.11 2005/11/07 11:14:26 gleixner Exp $
- *
- * drivers/mtd/maps/beech-mtd.c MTD mappings and partition tables for
- *                              IBM 405LP Beech boards.
- *
- * 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
- *
- * Copyright (C) 2002, International Business Machines Corporation
- * All Rights Reserved.
- *
- * Bishop Brock
- * IBM Research, Austin Center for Low-Power Computing
- * bcbrock@us.ibm.com
- * March 2002
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-#include <asm/ibm4xx.h>
-
-#define NAME     "Beech Linux Flash"
-#define PADDR    BEECH_BIGFLASH_PADDR
-#define SIZE     BEECH_BIGFLASH_SIZE
-#define BUSWIDTH 1
-
-/* Flash memories on these boards are memory resources, accessed big-endian. */
-
-
-static struct map_info beech_mtd_map = {
-        .name =         NAME,
-        .size =         SIZE,
-        .bankwidth =    BUSWIDTH,
-        .phys =         PADDR
-};
-
-static struct mtd_info *beech_mtd;
-
-static struct mtd_partition beech_partitions[2] = {
-        {
-              .name = "Linux Kernel",
-              .size = BEECH_KERNEL_SIZE,
-              .offset = BEECH_KERNEL_OFFSET
-        }, {
-              .name = "Free Area",
-              .size = BEECH_FREE_AREA_SIZE,
-              .offset = BEECH_FREE_AREA_OFFSET
-        }
-};
-
-static int __init
-init_beech_mtd(void)
-{
-        int err;
-
-        printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
-
-        beech_mtd_map.virt = ioremap(PADDR, SIZE);
-
-        if (!beech_mtd_map.virt) {
-                printk("%s: failed to ioremap 0x%x\n", NAME, PADDR);
-                return -EIO;
-        }
-
-        simple_map_init(&beech_mtd_map);
-
-        printk("%s: probing %d-bit flash bus\n", NAME, BUSWIDTH * 8);
-        beech_mtd = do_map_probe("cfi_probe", &beech_mtd_map);
-
-        if (!beech_mtd) {
-                iounmap(beech_mtd_map.virt);
-                return -ENXIO;
-        }
-
-        beech_mtd->owner = THIS_MODULE;
-
-        err = add_mtd_partitions(beech_mtd, beech_partitions, 2);
-        if (err) {
-                printk("%s: add_mtd_partitions failed\n", NAME);
-                iounmap(beech_mtd_map.virt);
-        }
-
-        return err;
-}
-
-static void __exit
-cleanup_beech_mtd(void)
-{
-        if (beech_mtd) {
-                del_mtd_partitions(beech_mtd);
-                map_destroy(beech_mtd);
-                iounmap((void *) beech_mtd_map.virt);
-        }
-}
-
-module_init(init_beech_mtd);
-module_exit(cleanup_beech_mtd);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Bishop Brock <bcbrock@us.ibm.com>");
-MODULE_DESCRIPTION("MTD map and partitions for IBM 405LP Beech boards");
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index 9f53c655af3a..7b96cd02f82b 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -358,7 +358,7 @@ int __init nettel_init(void)
         /* Turn other PAR off so the first probe doesn't find it */
         *intel1par = 0;
 
-        /* Probe for the the size of the first Intel flash */
+        /* Probe for the size of the first Intel flash */
         nettel_intel_map.size = maxsize;
         nettel_intel_map.phys = intel0addr;
         nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize);
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 7efe744ad31e..bbb42c35b69b 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -48,7 +48,7 @@ static int parse_flash_partitions(struct device_node *node,
         const  u32  *part;
         const  char *name;
 
-        part = get_property(node, "partitions", &plen);
+        part = of_get_property(node, "partitions", &plen);
         if (part == NULL)
                 goto err;
 
@@ -59,7 +59,7 @@ static int parse_flash_partitions(struct device_node *node,
                 goto err;
         }
 
-        name = get_property(node, "partition-names", &plen);
+        name = of_get_property(node, "partition-names", &plen);
 
         for (i = 0; i < retval; i++) {
                 (*parts)[i].offset = *part++;
@@ -153,7 +153,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
                 goto err_out;
         }
 
-        width = get_property(dp, "bank-width", NULL);
+        width = of_get_property(dp, "bank-width", NULL);
         if (width == NULL) {
                 dev_err(&dev->dev, "Can't get the flash bank width!\n");
                 err = -EINVAL;
@@ -174,7 +174,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
 
         simple_map_init(&info->map);
 
-        of_probe = get_property(dp, "probe-type", NULL);
+        of_probe = of_get_property(dp, "probe-type", NULL);
         if (of_probe == NULL) {
                 probe_type = rom_probe_types;
                 for (; info->mtd == NULL && *probe_type != NULL; probe_type++)
@@ -186,7 +186,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
         else {
                 if (strcmp(of_probe, "ROM"))
                         dev_dbg(&dev->dev, "map_probe: don't know probe type "
-                        "'%s', mapping as rom\n");
+                        "'%s', mapping as rom\n", of_probe);
                 info->mtd = do_map_probe("mtd_rom", &info->map);
         }
         if (info->mtd == NULL) {
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 524b83b5ebf5..51bc7e2f1f22 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -216,7 +216,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
         int last_devnum = -1;
         struct gendisk *gd;
 
-        if (!!mutex_trylock(&mtd_table_mutex)) {
+        if (mutex_trylock(&mtd_table_mutex)) {
                 mutex_unlock(&mtd_table_mutex);
                 BUG();
         }
@@ -294,7 +294,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
 
 int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
 {
-        if (!!mutex_trylock(&mtd_table_mutex)) {
+        if (mutex_trylock(&mtd_table_mutex)) {
                 mutex_unlock(&mtd_table_mutex);
                 BUG();
         }
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 1af989023c66..9c6236852942 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -347,7 +347,6 @@ int add_mtd_partitions(struct mtd_info *master,
                 slave->mtd.subpage_sft = master->subpage_sft;
 
                 slave->mtd.name = parts[i].name;
-                slave->mtd.bank_size = master->bank_size;
                 slave->mtd.owner = master->owner;
 
                 slave->mtd.read = part_read;
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index d05873b8c155..f1d60b6f048e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -232,11 +232,13 @@ config MTD_NAND_BASLER_EXCITE
           will be named "excite_nandflash.ko".
 
 config MTD_NAND_CAFE
-       tristate "NAND support for OLPC CAFÉ chip"
-       depends on PCI
-       help
-         Use NAND flash attached to the CAFÉ chip designed for the $100
-         laptop.
+        tristate "NAND support for OLPC CAFÉ chip"
+        depends on PCI
+        select REED_SOLOMON
+        select REED_SOLOMON_DEC16
+        help
+          Use NAND flash attached to the CAFÉ chip designed for the $100
+          laptop.
 
 config MTD_NAND_CS553X
         tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
@@ -270,4 +272,13 @@ config MTD_NAND_NANDSIM
           The simulator may simulate various NAND flash chips for the
           MTD nand layer.
 
+config MTD_NAND_PLATFORM
+        tristate "Support for generic platform NAND driver"
+        depends on MTD_NAND
+        help
+          This implements a generic NAND driver for on-SOC platform
+          devices. You will need to provide platform-specific functions
+          via platform_data.
+
+
 endif # MTD_NAND
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 6872031a3fb2..edba1db14bfa 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -26,6 +26,6 @@ obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o
 obj-$(CONFIG_MTD_NAND_AT91)             += at91_nand.o
 obj-$(CONFIG_MTD_NAND_CM_X270)          += cmx270_nand.o
 obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)    += excite_nandflash.o
+obj-$(CONFIG_MTD_NAND_PLATFORM)         += plat_nand.o
 
 nand-objs := nand_base.o nand_bbt.o
-cafe_nand-objs := cafe.o cafe_ecc.o
diff --git a/drivers/mtd/nand/at91_nand.c b/drivers/mtd/nand/at91_nand.c
index 14b80cc90a7b..512e999177f7 100644
--- a/drivers/mtd/nand/at91_nand.c
+++ b/drivers/mtd/nand/at91_nand.c
@@ -82,6 +82,10 @@ static void at91_nand_disable(struct at91_nand_host *host)
                 at91_set_gpio_value(host->board->enable_pin, 1);
 }
 
+#ifdef CONFIG_MTD_PARTITIONS
+const char *part_probes[] = { "cmdlinepart", NULL };
+#endif
+
 /*
  * Probe for the NAND device.
  */
@@ -151,6 +155,12 @@ static int __init at91_nand_probe(struct platform_device *pdev)
 #ifdef CONFIG_MTD_PARTITIONS
         if (host->board->partition_info)
                 partitions = host->board->partition_info(mtd->size, &num_partitions);
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+        else {
+                mtd->name = "at91_nand";
+                num_partitions = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
+        }
+#endif
 
         if ((!partitions) || (num_partitions == 0)) {
                 printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
diff --git a/drivers/mtd/nand/cafe_ecc.c b/drivers/mtd/nand/cafe_ecc.c
deleted file mode 100644
index ea5c8491d2c5..000000000000
--- a/drivers/mtd/nand/cafe_ecc.c
+++ /dev/null
@@ -1,1381 +0,0 @@
-/* Error correction for CAFÉ NAND controller
- *
- * © 2006 Marvell, Inc.
- * Author: Tom Chiou
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-
-static unsigned short gf4096_mul(unsigned short, unsigned short);
-static unsigned short gf64_mul(unsigned short, unsigned short);
-static unsigned short gf4096_inv(unsigned short);
-static unsigned short err_pos(unsigned short);
-static void find_4bit_err_coefs(unsigned short, unsigned short, unsigned short,
-                                unsigned short, unsigned short, unsigned short,
-                                unsigned short, unsigned short, unsigned short *);
-static void zero_4x5_col3(unsigned short[4][5]);
-static void zero_4x5_col2(unsigned short[4][5]);
-static void zero_4x5_col1(unsigned short[4][5]);
-static void swap_4x5_rows(unsigned short[4][5], int, int, int);
-static void swap_2x3_rows(unsigned short m[2][3]);
-static void solve_4x5(unsigned short m[4][5], unsigned short *, int *);
-static void sort_coefs(int *, unsigned short *, int);
-static void find_4bit_err_pats(unsigned short, unsigned short, unsigned short,
-                               unsigned short, unsigned short, unsigned short,
-                               unsigned short, unsigned short, unsigned short *);
-static void find_3bit_err_coefs(unsigned short, unsigned short, unsigned short,
-                                unsigned short, unsigned short, unsigned short,
-                                unsigned short *);
-static void zero_3x4_col2(unsigned short[3][4]);
-static void zero_3x4_col1(unsigned short[3][4]);
-static void swap_3x4_rows(unsigned short[3][4], int, int, int);
-static void solve_3x4(unsigned short[3][4], unsigned short *, int *);
-static void find_3bit_err_pats(unsigned short, unsigned short, unsigned short,
-                               unsigned short, unsigned short, unsigned short,
-                               unsigned short *);
-
-static void find_2bit_err_pats(unsigned short, unsigned short, unsigned short,
-                               unsigned short, unsigned short *);
-static void find_2x2_soln(unsigned short, unsigned short, unsigned short,
-                          unsigned short, unsigned short, unsigned short,
-                          unsigned short *);
-static void solve_2x3(unsigned short[2][3], unsigned short *);
-static int chk_no_err_only(unsigned short *, unsigned short *);
-static int chk_1_err_only(unsigned short *, unsigned short *);
-static int chk_2_err_only(unsigned short *, unsigned short *);
-static int chk_3_err_only(unsigned short *, unsigned short *);
-static int chk_4_err_only(unsigned short *, unsigned short *);
-
-static unsigned short gf64_mul(unsigned short a, unsigned short b)
-{
-        unsigned short tmp1, tmp2, tmp3, tmp4, tmp5;
-        unsigned short c_bit0, c_bit1, c_bit2, c_bit3, c_bit4, c_bit5, c;
-
-        tmp1 = ((a) ^ (a >> 5));
-        tmp2 = ((a >> 4) ^ (a >> 5));
-        tmp3 = ((a >> 3) ^ (a >> 4));
-        tmp4 = ((a >> 2) ^ (a >> 3));
-        tmp5 = ((a >> 1) ^ (a >> 2));
-
-        c_bit0 = ((a & b) ^ ((a >> 5) & (b >> 1)) ^ ((a >> 4) & (b >> 2)) ^
-                  ((a >> 3) & (b >> 3)) ^ ((a >> 2) & (b >> 4)) ^ ((a >> 1) & (b >> 5))) & 0x1;
-
-        c_bit1 = (((a >> 1) & b) ^ (tmp1 & (b >> 1)) ^ (tmp2 & (b >> 2)) ^
-                  (tmp3 & (b >> 3)) ^ (tmp4 & (b >> 4)) ^ (tmp5 & (b >> 5))) & 0x1;
-
-        c_bit2 = (((a >> 2) & b) ^ ((a >> 1) & (b >> 1)) ^ (tmp1 & (b >> 2)) ^
-                  (tmp2 & (b >> 3)) ^ (tmp3 & (b >> 4)) ^ (tmp4 & (b >> 5))) & 0x1;
-
-        c_bit3 = (((a >> 3) & b) ^ ((a >> 2) & (b >> 1)) ^ ((a >> 1) & (b >> 2)) ^
-                  (tmp1 & (b >> 3)) ^ (tmp2 & (b >> 4)) ^ (tmp3 & (b >> 5))) & 0x1;
-
-        c_bit4 = (((a >> 4) & b) ^ ((a >> 3) & (b >> 1)) ^ ((a >> 2) & (b >> 2)) ^
-                  ((a >> 1) & (b >> 3)) ^ (tmp1 & (b >> 4)) ^ (tmp2 & (b >> 5))) & 0x1;
-
-        c_bit5 = (((a >> 5) & b) ^ ((a >> 4) & (b >> 1)) ^ ((a >> 3) & (b >> 2)) ^
-                  ((a >> 2) & (b >> 3)) ^ ((a >> 1) & (b >> 4)) ^ (tmp1 & (b >> 5))) & 0x1;
-
-        c = c_bit0 | (c_bit1 << 1) | (c_bit2 << 2) | (c_bit3 << 3) | (c_bit4 << 4) | (c_bit5 << 5);
-
-        return c;
-}
-
-static unsigned short gf4096_mul(unsigned short a, unsigned short b)
-{
-        unsigned short ah, al, bh, bl, alxah, blxbh, ablh, albl, ahbh, ahbhB, c;
-
-        ah = (a >> 6) & 0x3f;
-        al = a & 0x3f;
-        bh = (b >> 6) & 0x3f;
-        bl = b & 0x3f;
-        alxah = al ^ ah;
-        blxbh = bl ^ bh;
-
-        ablh = gf64_mul(alxah, blxbh);
-        albl = gf64_mul(al, bl);
-        ahbh = gf64_mul(ah, bh);
-
-        ahbhB = ((ahbh & 0x1) << 5) |
-            ((ahbh & 0x20) >> 1) |
-            ((ahbh & 0x10) >> 1) | ((ahbh & 0x8) >> 1) | ((ahbh & 0x4) >> 1) | (((ahbh >> 1) ^ ahbh) & 0x1);
-
-        c = ((ablh ^ albl) << 6) | (ahbhB ^ albl);
-        return c;
-}
-
-static void find_2bit_err_pats(unsigned short s0, unsigned short s1, unsigned short r0, unsigned short r1, unsigned short *pats)
-{
-        find_2x2_soln(0x1, 0x1, r0, r1, s0, s1, pats);
-}
-
-static void find_3bit_err_coefs(unsigned short s0, unsigned short s1,
-                                unsigned short s2, unsigned short s3, unsigned short s4, unsigned short s5, unsigned short *coefs)
-{
-        unsigned short m[3][4];
-        int row_order[3];
-
-        row_order[0] = 0;
-        row_order[1] = 1;
-        row_order[2] = 2;
-        m[0][0] = s2;
-        m[0][1] = s1;
-        m[0][2] = s0;
-        m[0][3] = s3;
-        m[1][0] = s3;
-        m[1][1] = s2;
-        m[1][2] = s1;
-        m[1][3] = s4;
-        m[2][0] = s4;
-        m[2][1] = s3;
-        m[2][2] = s2;
-        m[2][3] = s5;
-
-        if (m[0][2] != 0x0) {
-                zero_3x4_col2(m);
-        } else if (m[1][2] != 0x0) {
-                swap_3x4_rows(m, 0, 1, 4);
-                zero_3x4_col2(m);
-        } else if (m[2][2] != 0x0) {
-                swap_3x4_rows(m, 0, 2, 4);
-                zero_3x4_col2(m);
-        } else {
-                printk(KERN_ERR "Error: find_3bit_err_coefs, s0,s1,s2 all zeros!\n");
-        }
-
-        if (m[1][1] != 0x0) {
-                zero_3x4_col1(m);
-        } else if (m[2][1] != 0x0) {
-                swap_3x4_rows(m, 1, 2, 4);
-                zero_3x4_col1(m);
-        } else {
-                printk(KERN_ERR "Error: find_3bit_err_coefs, cannot resolve col 1!\n");
-        }
-
-        /* solve coefs */
-        solve_3x4(m, coefs, row_order);
-}
-
-static void zero_3x4_col2(unsigned short m[3][4])
-{
-        unsigned short minv1, minv2;
-
-        minv1 = gf4096_mul(m[1][2], gf4096_inv(m[0][2]));
-        minv2 = gf4096_mul(m[2][2], gf4096_inv(m[0][2]));
-        m[1][0] = m[1][0] ^ gf4096_mul(m[0][0], minv1);
-        m[1][1] = m[1][1] ^ gf4096_mul(m[0][1], minv1);
-        m[1][3] = m[1][3] ^ gf4096_mul(m[0][3], minv1);
-        m[2][0] = m[2][0] ^ gf4096_mul(m[0][0], minv2);
-        m[2][1] = m[2][1] ^ gf4096_mul(m[0][1], minv2);
-        m[2][3] = m[2][3] ^ gf4096_mul(m[0][3], minv2);
-}
-
-static void zero_3x4_col1(unsigned short m[3][4])
-{
-        unsigned short minv;
-        minv = gf4096_mul(m[2][1], gf4096_inv(m[1][1]));
-        m[2][0] = m[2][0] ^ gf4096_mul(m[1][0], minv);
-        m[2][3] = m[2][3] ^ gf4096_mul(m[1][3], minv);
-}
-
-static void swap_3x4_rows(unsigned short m[3][4], int i, int j, int col_width)
-{
-        unsigned short tmp0;
-        int cnt;
-        for (cnt = 0; cnt < col_width; cnt++) {
-                tmp0 = m[i][cnt];
-                m[i][cnt] = m[j][cnt];
-                m[j][cnt] = tmp0;
-        }
-}
-
-static void solve_3x4(unsigned short m[3][4], unsigned short *coefs, int *row_order)
-{
-        unsigned short tmp[3];
-        tmp[0] = gf4096_mul(m[2][3], gf4096_inv(m[2][0]));
-        tmp[1] = gf4096_mul((gf4096_mul(tmp[0], m[1][0]) ^ m[1][3]), gf4096_inv(m[1][1]));
-        tmp[2] = gf4096_mul((gf4096_mul(tmp[0], m[0][0]) ^ gf4096_mul(tmp[1], m[0][1]) ^ m[0][3]), gf4096_inv(m[0][2]));
-        sort_coefs(row_order, tmp, 3);
-        coefs[0] = tmp[0];
-        coefs[1] = tmp[1];
-        coefs[2] = tmp[2];
-}
-
-static void find_3bit_err_pats(unsigned short s0, unsigned short s1,
-                               unsigned short s2, unsigned short r0,
-                               unsigned short r1, unsigned short r2,
-                               unsigned short *pats)
-{
-        find_2x2_soln(r0 ^ r2, r1 ^ r2,
-                      gf4096_mul(r0, r0 ^ r2), gf4096_mul(r1, r1 ^ r2),
-                      gf4096_mul(s0, r2) ^ s1, gf4096_mul(s1, r2) ^ s2, pats);
-        pats[2] = s0 ^ pats[0] ^ pats[1];
-}
-
-static void find_4bit_err_coefs(unsigned short s0, unsigned short s1,
-                                unsigned short s2, unsigned short s3,
-                                unsigned short s4, unsigned short s5,
-                                unsigned short s6, unsigned short s7,
-                                unsigned short *coefs)
-{
-        unsigned short m[4][5];
-        int row_order[4];
-
-        row_order[0] = 0;
-        row_order[1] = 1;
-        row_order[2] = 2;
-        row_order[3] = 3;
-
-        m[0][0] = s3;
-        m[0][1] = s2;
-        m[0][2] = s1;
-        m[0][3] = s0;
-        m[0][4] = s4;
-        m[1][0] = s4;
-        m[1][1] = s3;
-        m[1][2] = s2;
-        m[1][3] = s1;
-        m[1][4] = s5;
-        m[2][0] = s5;
-        m[2][1] = s4;
-        m[2][2] = s3;
-        m[2][3] = s2;
-        m[2][4] = s6;
-        m[3][0] = s6;
-        m[3][1] = s5;
-        m[3][2] = s4;
-        m[3][3] = s3;
-        m[3][4] = s7;
-
-        if (m[0][3] != 0x0) {
-                zero_4x5_col3(m);
-        } else if (m[1][3] != 0x0) {
-                swap_4x5_rows(m, 0, 1, 5);
-                zero_4x5_col3(m);
-        } else if (m[2][3] != 0x0) {
-                swap_4x5_rows(m, 0, 2, 5);
-                zero_4x5_col3(m);
-        } else if (m[3][3] != 0x0) {
-                swap_4x5_rows(m, 0, 3, 5);
-                zero_4x5_col3(m);
-        } else {
-                printk(KERN_ERR "Error: find_4bit_err_coefs, s0,s1,s2,s3 all zeros!\n");
-        }
-
-        if (m[1][2] != 0x0) {
-                zero_4x5_col2(m);
-        } else if (m[2][2] != 0x0) {
-                swap_4x5_rows(m, 1, 2, 5);
-                zero_4x5_col2(m);
-        } else if (m[3][2] != 0x0) {
-                swap_4x5_rows(m, 1, 3, 5);
-                zero_4x5_col2(m);
-        } else {
-                printk(KERN_ERR "Error: find_4bit_err_coefs, cannot resolve col 2!\n");
-        }
-
-        if (m[2][1] != 0x0) {
-                zero_4x5_col1(m);
-        } else if (m[3][1] != 0x0) {
-                swap_4x5_rows(m, 2, 3, 5);
-                zero_4x5_col1(m);
-        } else {
-                printk(KERN_ERR "Error: find_4bit_err_coefs, cannot resolve col 1!\n");
-        }
-
-        solve_4x5(m, coefs, row_order);
-}
-
-static void zero_4x5_col3(unsigned short m[4][5])
-{
-        unsigned short minv1, minv2, minv3;
-
-        minv1 = gf4096_mul(m[1][3], gf4096_inv(m[0][3]));
-        minv2 = gf4096_mul(m[2][3], gf4096_inv(m[0][3]));
-        minv3 = gf4096_mul(m[3][3], gf4096_inv(m[0][3]));
-
-        m[1][0] = m[1][0] ^ gf4096_mul(m[0][0], minv1);
-        m[1][1] = m[1][1] ^ gf4096_mul(m[0][1], minv1);
-        m[1][2] = m[1][2] ^ gf4096_mul(m[0][2], minv1);
-        m[1][4] = m[1][4] ^ gf4096_mul(m[0][4], minv1);
-        m[2][0] = m[2][0] ^ gf4096_mul(m[0][0], minv2);
-        m[2][1] = m[2][1] ^ gf4096_mul(m[0][1], minv2);
-        m[2][2] = m[2][2] ^ gf4096_mul(m[0][2], minv2);
-        m[2][4] = m[2][4] ^ gf4096_mul(m[0][4], minv2);
-        m[3][0] = m[3][0] ^ gf4096_mul(m[0][0], minv3);
-        m[3][1] = m[3][1] ^ gf4096_mul(m[0][1], minv3);
-        m[3][2] = m[3][2] ^ gf4096_mul(m[0][2], minv3);
-        m[3][4] = m[3][4] ^ gf4096_mul(m[0][4], minv3);
-}
-
-static void zero_4x5_col2(unsigned short m[4][5])
-{
-        unsigned short minv2, minv3;
-
-        minv2 = gf4096_mul(m[2][2], gf4096_inv(m[1][2]));
-        minv3 = gf4096_mul(m[3][2], gf4096_inv(m[1][2]));
-
-        m[2][0] = m[2][0] ^ gf4096_mul(m[1][0], minv2);
-        m[2][1] = m[2][1] ^ gf4096_mul(m[1][1], minv2);
-        m[2][4] = m[2][4] ^ gf4096_mul(m[1][4], minv2);
-        m[3][0] = m[3][0] ^ gf4096_mul(m[1][0], minv3);
-        m[3][1] = m[3][1] ^ gf4096_mul(m[1][1], minv3);
-        m[3][4] = m[3][4] ^ gf4096_mul(m[1][4], minv3);
-}
-
-static void zero_4x5_col1(unsigned short m[4][5])
-{
-        unsigned short minv;
-
-        minv = gf4096_mul(m[3][1], gf4096_inv(m[2][1]));
-
-        m[3][0] = m[3][0] ^ gf4096_mul(m[2][0], minv);
-        m[3][4] = m[3][4] ^ gf4096_mul(m[2][4], minv);
-}
-
-static void swap_4x5_rows(unsigned short m[4][5], int i, int j, int col_width)
-{
-        unsigned short tmp0;
-        int cnt;
-
-        for (cnt = 0; cnt < col_width; cnt++) {
-                tmp0 = m[i][cnt];
-                m[i][cnt] = m[j][cnt];
-                m[j][cnt] = tmp0;
-        }
-}
-
-static void solve_4x5(unsigned short m[4][5], unsigned short *coefs, int *row_order)
-{
-        unsigned short tmp[4];
-
-        tmp[0] = gf4096_mul(m[3][4], gf4096_inv(m[3][0]));
-        tmp[1] = gf4096_mul((gf4096_mul(tmp[0], m[2][0]) ^ m[2][4]), gf4096_inv(m[2][1]));
-        tmp[2] = gf4096_mul((gf4096_mul(tmp[0], m[1][0]) ^ gf4096_mul(tmp[1], m[1][1]) ^ m[1][4]), gf4096_inv(m[1][2]));
-        tmp[3] = gf4096_mul((gf4096_mul(tmp[0], m[0][0]) ^
-                        gf4096_mul(tmp[1], m[0][1]) ^ gf4096_mul(tmp[2], m[0][2]) ^ m[0][4]), gf4096_inv(m[0][3]));
-        sort_coefs(row_order, tmp, 4);
-        coefs[0] = tmp[0];
-        coefs[1] = tmp[1];
-        coefs[2] = tmp[2];
-        coefs[3] = tmp[3];
-}
-
-static void sort_coefs(int *order, unsigned short *soln, int len)
-{
-        int cnt, start_cnt, least_ord, least_cnt;
-        unsigned short tmp0;
-        for (start_cnt = 0; start_cnt < len; start_cnt++) {
-                for (cnt = start_cnt; cnt < len; cnt++) {
-                        if (cnt == start_cnt) {
-                                least_ord = order[cnt];
-                                least_cnt = start_cnt;
-                        } else {
-                                if (least_ord > order[cnt]) {
-                                        least_ord = order[cnt];
-                                        least_cnt = cnt;
-                                }
-                        }
-                }
-                if (least_cnt != start_cnt) {
-                        tmp0 = order[least_cnt];
-                        order[least_cnt] = order[start_cnt];
-                        order[start_cnt] = tmp0;
-                        tmp0 = soln[least_cnt];
-                        soln[least_cnt] = soln[start_cnt];
-                        soln[start_cnt] = tmp0;
-                }
-        }
-}
-
-static void find_4bit_err_pats(unsigned short s0, unsigned short s1,
-                               unsigned short s2, unsigned short s3,
-                               unsigned short z1, unsigned short z2,
-                               unsigned short z3, unsigned short z4,
-                               unsigned short *pats)
-{
-        unsigned short z4_z1, z3z4_z3z3, z4_z2, s0z4_s1, z1z4_z1z1,
-                z4_z3, z2z4_z2z2, s1z4_s2, z3z3z4_z3z3z3, z1z1z4_z1z1z1, z2z2z4_z2z2z2, s2z4_s3;
-        unsigned short tmp0, tmp1, tmp2, tmp3;
-
-        z4_z1 = z4 ^ z1;
-        z3z4_z3z3 = gf4096_mul(z3, z4) ^ gf4096_mul(z3, z3);
-        z4_z2 = z4 ^ z2;
-        s0z4_s1 = gf4096_mul(s0, z4) ^ s1;
-        z1z4_z1z1 = gf4096_mul(z1, z4) ^ gf4096_mul(z1, z1);
-        z4_z3 = z4 ^ z3;
-        z2z4_z2z2 = gf4096_mul(z2, z4) ^ gf4096_mul(z2, z2);
-        s1z4_s2 = gf4096_mul(s1, z4) ^ s2;
-        z3z3z4_z3z3z3 = gf4096_mul(gf4096_mul(z3, z3), z4) ^ gf4096_mul(gf4096_mul(z3, z3), z3);
-        z1z1z4_z1z1z1 = gf4096_mul(gf4096_mul(z1, z1), z4) ^ gf4096_mul(gf4096_mul(z1, z1), z1);
-        z2z2z4_z2z2z2 = gf4096_mul(gf4096_mul(z2, z2), z4) ^ gf4096_mul(gf4096_mul(z2, z2), z2);
-        s2z4_s3 = gf4096_mul(s2, z4) ^ s3;
-
-        //find err pat 0,1
-        find_2x2_soln(gf4096_mul(z4_z1, z3z4_z3z3) ^
-                      gf4096_mul(z1z4_z1z1, z4_z3), gf4096_mul(z4_z2,
-                                                               z3z4_z3z3) ^
-                      gf4096_mul(z2z4_z2z2, z4_z3), gf4096_mul(z1z4_z1z1,
-                                                               z3z3z4_z3z3z3) ^
-                      gf4096_mul(z1z1z4_z1z1z1, z3z4_z3z3),
-                      gf4096_mul(z2z4_z2z2,
-                                 z3z3z4_z3z3z3) ^ gf4096_mul(z2z2z4_z2z2z2,
-                                                             z3z4_z3z3),
-                      gf4096_mul(s0z4_s1, z3z4_z3z3) ^ gf4096_mul(s1z4_s2,
-                                                                  z4_z3),
-                      gf4096_mul(s1z4_s2, z3z3z4_z3z3z3) ^ gf4096_mul(s2z4_s3, z3z4_z3z3), pats);
-        tmp0 = pats[0];
-        tmp1 = pats[1];
-        tmp2 = pats[0] ^ pats[1] ^ s0;
-        tmp3 = gf4096_mul(pats[0], z1) ^ gf4096_mul(pats[1], z2) ^ s1;
-
-        //find err pat 2,3
-        find_2x2_soln(0x1, 0x1, z3, z4, tmp2, tmp3, pats);
-        pats[2] = pats[0];
-        pats[3] = pats[1];
-        pats[0] = tmp0;
-        pats[1] = tmp1;
-}
-
-static void find_2x2_soln(unsigned short c00, unsigned short c01,
-                          unsigned short c10, unsigned short c11,
-                          unsigned short lval0, unsigned short lval1,
-                          unsigned short *soln)
-{
-        unsigned short m[2][3];
-        m[0][0] = c00;
-        m[0][1] = c01;
-        m[0][2] = lval0;
-        m[1][0] = c10;
-        m[1][1] = c11;
-        m[1][2] = lval1;
-
-        if (m[0][1] != 0x0) {
-                /* */
-        } else if (m[1][1] != 0x0) {
-                swap_2x3_rows(m);
-        } else {
-                printk(KERN_ERR "Warning: find_2bit_err_coefs, s0,s1 all zeros!\n");
-        }
-
-        solve_2x3(m, soln);
-}
-
-static void swap_2x3_rows(unsigned short m[2][3])
-{
-        unsigned short tmp0;
-        int cnt;
-
-        for (cnt = 0; cnt < 3; cnt++) {
-                tmp0 = m[0][cnt];
-                m[0][cnt] = m[1][cnt];
-                m[1][cnt] = tmp0;
-        }
-}
-
-static void solve_2x3(unsigned short m[2][3], unsigned short *coefs)
-{
-        unsigned short minv;
-
-        minv = gf4096_mul(m[1][1], gf4096_inv(m[0][1]));
-        m[1][0] = m[1][0] ^ gf4096_mul(m[0][0], minv);
-        m[1][2] = m[1][2] ^ gf4096_mul(m[0][2], minv);
-        coefs[0] = gf4096_mul(m[1][2], gf4096_inv(m[1][0]));
-        coefs[1] = gf4096_mul((gf4096_mul(coefs[0], m[0][0]) ^ m[0][2]), gf4096_inv(m[0][1]));
-}
-
-static unsigned char gf64_inv[64] = {
-         0,  1, 33, 62, 49, 43, 31, 44, 57, 37, 52, 28, 46, 40, 22, 25,
-        61, 54, 51, 39, 26, 35, 14, 24, 23, 15, 20, 34, 11, 53, 45,  6,
-        63,  2, 27, 21, 56,  9, 50, 19, 13, 47, 48,  5,  7, 30, 12, 41,
-        42,  4, 38, 18, 10, 29, 17, 60, 36,  8, 59, 58, 55, 16,  3, 32
-};
-
-static unsigned short gf4096_inv(unsigned short din)
-{
-        unsigned short alahxal, ah2B, deno, inv, bl, bh;
-        unsigned short ah, al, ahxal;
-        unsigned short dout;
-
-        ah = (din >> 6) & 0x3f;
-        al = din & 0x3f;
-        ahxal = ah ^ al;
-        ah2B = (((ah ^ (ah >> 3)) & 0x1) << 5) |
-                ((ah >> 1) & 0x10) |
-                ((((ah >> 5) ^ (ah >> 2)) & 0x1) << 3) |
-                ((ah >> 2) & 0x4) | ((((ah >> 4) ^ (ah >> 1)) & 0x1) << 1) | (ah & 0x1);
-        alahxal = gf64_mul(ahxal, al);
-        deno = alahxal ^ ah2B;
-        inv = gf64_inv[deno];
-        bl = gf64_mul(inv, ahxal);
-        bh = gf64_mul(inv, ah);
-        dout = ((bh & 0x3f) << 6) | (bl & 0x3f);
-        return (((bh & 0x3f) << 6) | (bl & 0x3f));
-}
-
-static unsigned short err_pos_lut[4096] = {
-        0xfff, 0x000, 0x451, 0xfff, 0xfff, 0x3cf, 0xfff, 0x041,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x28a, 0xfff, 0x492, 0xfff,
-        0x145, 0xfff, 0xfff, 0x514, 0xfff, 0x082, 0xfff, 0xfff,
-        0xfff, 0x249, 0x38e, 0x410, 0xfff, 0x104, 0x208, 0x1c7,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x2cb, 0xfff, 0xfff, 0xfff,
-        0x0c3, 0x34d, 0x4d3, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x186, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x30c, 0x555, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x166, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x385, 0x14e, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4e1,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x538, 0xfff, 0x16d, 0xfff,
-        0xfff, 0xfff, 0x45b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x29c, 0x2cc, 0x30b, 0x2b3, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0b3, 0xfff, 0x2f7,
-        0xfff, 0x32b, 0xfff, 0xfff, 0xfff, 0xfff, 0x0a7, 0xfff,
-        0xfff, 0x2da, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x07e, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x11c, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x22f, 0xfff, 0x1f4, 0xfff, 0xfff,
-        0x2b0, 0x504, 0xfff, 0x114, 0xfff, 0xfff, 0xfff, 0x21d,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x00d, 0x3c4, 0x340, 0x10f,
-        0xfff, 0xfff, 0x266, 0x02e, 0xfff, 0xfff, 0xfff, 0x4f8,
-        0x337, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x07b, 0x168, 0xfff, 0xfff, 0x0fe,
-        0xfff, 0xfff, 0x51a, 0xfff, 0x458, 0xfff, 0x36d, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x073, 0x37d, 0x415, 0x550, 0xfff,
-        0xfff, 0xfff, 0x23b, 0x4b4, 0xfff, 0xfff, 0xfff, 0x1a1,
-        0xfff, 0xfff, 0x3aa, 0xfff, 0x117, 0x04d, 0x341, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x518, 0x03e, 0x0f2, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x363, 0xfff, 0x0b9, 0xfff, 0xfff,
-        0x241, 0xfff, 0xfff, 0x049, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x15f, 0x52d, 0xfff, 0xfff, 0xfff, 0x29e, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x4cf, 0x0fc, 0xfff, 0x36f, 0x3d3, 0xfff,
-        0x228, 0xfff, 0xfff, 0x45e, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x238, 0xfff, 0xfff, 0xfff, 0xfff, 0x47f, 0xfff, 0xfff,
-        0x43a, 0x265, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x3e8,
-        0xfff, 0xfff, 0x01a, 0xfff, 0xfff, 0xfff, 0xfff, 0x21e,
-        0x1fc, 0x40b, 0xfff, 0xfff, 0xfff, 0x2d0, 0x159, 0xfff,
-        0xfff, 0x313, 0xfff, 0xfff, 0x05c, 0x4cc, 0xfff, 0xfff,
-        0x0f6, 0x3d5, 0xfff, 0xfff, 0xfff, 0x54f, 0xfff, 0xfff,
-        0xfff, 0x172, 0x1e4, 0x07c, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x53c, 0x1ad, 0x535,
-        0x19b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x092, 0xfff, 0x2be, 0xfff, 0xfff, 0x482,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0e6, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x476, 0xfff, 0x51d, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x342, 0x2b5, 0x22e, 0x09a, 0xfff, 0x08d,
-        0x44f, 0x3ed, 0xfff, 0xfff, 0xfff, 0xfff, 0x3d1, 0xfff,
-        0xfff, 0x543, 0xfff, 0x48f, 0xfff, 0x3d2, 0xfff, 0x0d5,
-        0x113, 0x0ec, 0x427, 0xfff, 0xfff, 0xfff, 0x4c4, 0xfff,
-        0xfff, 0x50a, 0xfff, 0x144, 0xfff, 0x105, 0x39f, 0x294,
-        0x164, 0xfff, 0x31a, 0xfff, 0xfff, 0x49a, 0xfff, 0x130,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x1be, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x49e, 0x371, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x0e8, 0x49c, 0x0f4, 0xfff,
-        0x338, 0x1a7, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x36c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x1ae, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x31b, 0xfff, 0xfff, 0x2dd, 0x522, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2f4,
-        0x3c6, 0x30d, 0xfff, 0xfff, 0xfff, 0xfff, 0x34c, 0x18f,
-        0x30a, 0xfff, 0x01f, 0x079, 0xfff, 0xfff, 0x54d, 0x46b,
-        0x28c, 0x37f, 0xfff, 0xfff, 0xfff, 0xfff, 0x355, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x14f, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x359, 0x3fe, 0x3c5, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x423, 0xfff, 0xfff, 0x34a, 0x22c, 0xfff,
-        0x25a, 0xfff, 0xfff, 0x4ad, 0xfff, 0x28d, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x547, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x2e2, 0xfff, 0xfff, 0x1d5, 0xfff, 0x2a8, 0xfff, 0xfff,
-        0x03f, 0xfff, 0xfff, 0xfff, 0xfff, 0x3eb, 0x0fa, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x55b, 0xfff,
-        0x08e, 0xfff, 0x3ae, 0xfff, 0x3a4, 0xfff, 0x282, 0x158,
-        0xfff, 0x382, 0xfff, 0xfff, 0x499, 0xfff, 0xfff, 0x08a,
-        0xfff, 0xfff, 0xfff, 0x456, 0x3be, 0xfff, 0x1e2, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x559, 0xfff, 0x1a0, 0xfff,
-        0xfff, 0x0b4, 0xfff, 0xfff, 0xfff, 0x2df, 0xfff, 0xfff,
-        0xfff, 0x07f, 0x4f5, 0xfff, 0xfff, 0x27c, 0x133, 0x017,
-        0xfff, 0x3fd, 0xfff, 0xfff, 0xfff, 0x44d, 0x4cd, 0x17a,
-        0x0d7, 0x537, 0xfff, 0xfff, 0x353, 0xfff, 0xfff, 0x351,
-        0x366, 0xfff, 0x44a, 0xfff, 0x1a6, 0xfff, 0xfff, 0xfff,
-        0x291, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1e3,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x389, 0xfff, 0x07a, 0xfff,
-        0x1b6, 0x2ed, 0xfff, 0xfff, 0xfff, 0xfff, 0x24e, 0x074,
-        0xfff, 0xfff, 0x3dc, 0xfff, 0x4e3, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x4eb, 0xfff, 0xfff, 0x3b8, 0x4de, 0xfff, 0x19c,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x262,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x076, 0x4e8, 0x3da,
-        0xfff, 0x531, 0xfff, 0xfff, 0x14a, 0xfff, 0x0a2, 0x433,
-        0x3df, 0x1e9, 0xfff, 0xfff, 0xfff, 0xfff, 0x3e7, 0x285,
-        0x2d8, 0xfff, 0xfff, 0xfff, 0x349, 0x18d, 0x098, 0xfff,
-        0x0df, 0x4bf, 0xfff, 0xfff, 0x0b2, 0xfff, 0x346, 0x24d,
-        0xfff, 0xfff, 0xfff, 0x24f, 0x4fa, 0x2f9, 0xfff, 0xfff,
-        0x3c9, 0xfff, 0x2b4, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x056, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x179, 0xfff, 0x0e9, 0x3f0, 0x33d, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x1fd, 0xfff, 0xfff, 0x526, 0xfff,
-        0xfff, 0xfff, 0x53d, 0xfff, 0xfff, 0xfff, 0x170, 0x331,
-        0xfff, 0x068, 0xfff, 0xfff, 0xfff, 0x3f7, 0xfff, 0x3d8,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x09f, 0x556, 0xfff, 0xfff, 0x02d, 0xfff, 0xfff,
-        0x553, 0xfff, 0xfff, 0xfff, 0x1f0, 0xfff, 0xfff, 0x4d6,
-        0x41e, 0xfff, 0xfff, 0xfff, 0xfff, 0x4d5, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x248, 0xfff, 0xfff, 0xfff, 0x0a3,
-        0xfff, 0x217, 0xfff, 0xfff, 0xfff, 0x4f1, 0x209, 0xfff,
-        0xfff, 0x475, 0x234, 0x52b, 0x398, 0xfff, 0x08b, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x2c2, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x268, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x4a3, 0xfff, 0x0aa, 0xfff, 0x1d9, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x155, 0xfff, 0xfff, 0xfff, 0xfff, 0x0bf,
-        0x539, 0xfff, 0xfff, 0x2f1, 0x545, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x2a7, 0x06f, 0xfff, 0x378, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x25e, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x15d, 0x02a, 0xfff, 0xfff, 0x0bc,
-        0x235, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x150, 0xfff, 0x1a9, 0xfff, 0xfff, 0xfff, 0xfff, 0x381,
-        0xfff, 0x04e, 0x270, 0x13f, 0xfff, 0xfff, 0x405, 0xfff,
-        0x3cd, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x2ef, 0xfff, 0x06a, 0xfff, 0xfff, 0xfff, 0x34f,
-        0x212, 0xfff, 0xfff, 0x0e2, 0xfff, 0x083, 0x298, 0xfff,
-        0xfff, 0xfff, 0x0c2, 0xfff, 0xfff, 0x52e, 0xfff, 0x488,
-        0xfff, 0xfff, 0xfff, 0x36b, 0xfff, 0xfff, 0xfff, 0x442,
-        0x091, 0xfff, 0x41c, 0xfff, 0xfff, 0x3a5, 0xfff, 0x4e6,
-        0xfff, 0xfff, 0x40d, 0x31d, 0xfff, 0xfff, 0xfff, 0x4c1,
-        0x053, 0xfff, 0x418, 0x13c, 0xfff, 0x350, 0xfff, 0x0ae,
-        0xfff, 0xfff, 0x41f, 0xfff, 0x470, 0xfff, 0x4ca, 0xfff,
-        0xfff, 0xfff, 0x02b, 0x450, 0xfff, 0x1f8, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x293, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x411, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x0b8, 0xfff, 0xfff, 0xfff,
-        0x3e1, 0xfff, 0xfff, 0xfff, 0xfff, 0x43c, 0xfff, 0x2b2,
-        0x2ab, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ec,
-        0xfff, 0xfff, 0xfff, 0x3f8, 0x034, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x11a, 0xfff, 0x541, 0x45c, 0x134,
-        0x1cc, 0xfff, 0xfff, 0xfff, 0x469, 0xfff, 0xfff, 0x44b,
-        0x161, 0xfff, 0xfff, 0xfff, 0x055, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x307, 0xfff, 0xfff, 0xfff, 0xfff, 0x2d1, 0xfff,
-        0xfff, 0xfff, 0x124, 0x37b, 0x26b, 0x336, 0xfff, 0xfff,
-        0x2e4, 0x3cb, 0xfff, 0xfff, 0x0f8, 0x3c8, 0xfff, 0xfff,
-        0xfff, 0x461, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4b5,
-        0x2cf, 0xfff, 0xfff, 0xfff, 0x20f, 0xfff, 0x35a, 0xfff,
-        0x490, 0xfff, 0x185, 0xfff, 0xfff, 0xfff, 0xfff, 0x42e,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x54b, 0xfff, 0xfff, 0xfff,
-        0x146, 0xfff, 0x412, 0xfff, 0xfff, 0xfff, 0x1ff, 0xfff,
-        0xfff, 0x3e0, 0xfff, 0xfff, 0xfff, 0xfff, 0x2d5, 0xfff,
-        0x4df, 0x505, 0xfff, 0x413, 0xfff, 0x1a5, 0xfff, 0x3b2,
-        0xfff, 0xfff, 0xfff, 0x35b, 0xfff, 0x116, 0xfff, 0xfff,
-        0x171, 0x4d0, 0xfff, 0x154, 0x12d, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x468, 0x4db, 0xfff,
-        0xfff, 0x1df, 0xfff, 0xfff, 0xfff, 0xfff, 0x05a, 0xfff,
-        0x0f1, 0x403, 0xfff, 0x22b, 0x2e0, 0xfff, 0xfff, 0xfff,
-        0x2b7, 0x373, 0xfff, 0xfff, 0xfff, 0xfff, 0x13e, 0xfff,
-        0xfff, 0xfff, 0x0d0, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x329, 0x1d2, 0x3fa, 0x047, 0xfff, 0x2f2, 0xfff, 0xfff,
-        0x141, 0x0ac, 0x1d7, 0xfff, 0x07d, 0xfff, 0xfff, 0xfff,
-        0x1c1, 0xfff, 0x487, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x045, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x288, 0x0cd, 0xfff, 0xfff, 0xfff, 0xfff, 0x226, 0x1d8,
-        0xfff, 0x153, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4cb,
-        0x528, 0xfff, 0xfff, 0xfff, 0x20a, 0x343, 0x3a1, 0xfff,
-        0xfff, 0xfff, 0x2d7, 0x2d3, 0x1aa, 0x4c5, 0xfff, 0xfff,
-        0xfff, 0x42b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x3e9, 0xfff, 0x20b, 0x260,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x37c, 0x2fd,
-        0xfff, 0xfff, 0x2c8, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x31e, 0xfff, 0x335, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x135, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x35c, 0x4dd, 0x129, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x1ef, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x34e, 0xfff, 0xfff, 0xfff, 0xfff, 0x407, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x3ad, 0xfff, 0xfff, 0xfff,
-        0x379, 0xfff, 0xfff, 0x1d0, 0x38d, 0xfff, 0xfff, 0x1e8,
-        0x184, 0x3c1, 0x1c4, 0xfff, 0x1f9, 0xfff, 0xfff, 0x424,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x1d3, 0x0d4, 0xfff, 0x4e9,
-        0xfff, 0xfff, 0xfff, 0x530, 0x107, 0xfff, 0x106, 0x04f,
-        0xfff, 0xfff, 0x4c7, 0x503, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x15c, 0xfff, 0x23f, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x4f3, 0xfff, 0xfff, 0x3c7,
-        0xfff, 0x278, 0xfff, 0xfff, 0x0a6, 0xfff, 0xfff, 0xfff,
-        0x122, 0x1cf, 0xfff, 0x327, 0xfff, 0x2e5, 0xfff, 0x29d,
-        0xfff, 0xfff, 0x3f1, 0xfff, 0xfff, 0x48d, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x054, 0xfff, 0xfff, 0xfff, 0xfff, 0x178,
-        0x27e, 0x4e0, 0x352, 0x02f, 0x09c, 0xfff, 0x2a0, 0xfff,
-        0xfff, 0x46a, 0x457, 0xfff, 0xfff, 0x501, 0xfff, 0x2ba,
-        0xfff, 0xfff, 0xfff, 0x54e, 0x2e7, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x551, 0xfff, 0xfff, 0x1db, 0x2aa, 0xfff,
-        0xfff, 0x4bc, 0xfff, 0xfff, 0x395, 0xfff, 0x0de, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x455, 0xfff, 0x17e,
-        0xfff, 0x221, 0x4a7, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x388, 0xfff, 0xfff, 0xfff, 0x308, 0xfff, 0xfff, 0xfff,
-        0x20e, 0x4b9, 0xfff, 0x273, 0x20c, 0x09e, 0xfff, 0x057,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x3f2, 0xfff, 0x1a8, 0x3a6,
-        0x14c, 0xfff, 0xfff, 0x071, 0xfff, 0xfff, 0x53a, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x109, 0xfff, 0xfff, 0x399, 0xfff,
-        0x061, 0x4f0, 0x39e, 0x244, 0xfff, 0x035, 0xfff, 0xfff,
-        0x305, 0x47e, 0x297, 0xfff, 0xfff, 0x2b8, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1bc, 0xfff, 0x2fc,
-        0xfff, 0xfff, 0x554, 0xfff, 0xfff, 0xfff, 0xfff, 0x3b6,
-        0xfff, 0xfff, 0xfff, 0x515, 0x397, 0xfff, 0xfff, 0x12f,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4e5,
-        0xfff, 0x4fc, 0xfff, 0xfff, 0x05e, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x0a8, 0x3af, 0x015, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x138, 0xfff, 0xfff, 0xfff, 0x540, 0xfff, 0xfff,
-        0xfff, 0x027, 0x523, 0x2f0, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x16c, 0xfff, 0x27d, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x04c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4dc,
-        0xfff, 0xfff, 0x059, 0x301, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x1a3, 0xfff, 0x15a, 0xfff, 0xfff,
-        0x0a5, 0xfff, 0x435, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x051, 0xfff, 0xfff, 0x131, 0xfff, 0x4f4, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x441, 0xfff, 0x4fb, 0xfff, 0x03b,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ed, 0x274,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0d3, 0x55e, 0x1b3,
-        0xfff, 0x0bd, 0xfff, 0xfff, 0xfff, 0xfff, 0x225, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x4b7, 0xfff, 0xfff, 0x2ff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4c3, 0xfff,
-        0x383, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2f6,
-        0xfff, 0xfff, 0x1ee, 0xfff, 0x03d, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x26f, 0x1dc, 0xfff, 0x0db, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x0ce, 0xfff, 0xfff, 0x127, 0x03a,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x311, 0xfff,
-        0xfff, 0x13d, 0x09d, 0x47b, 0x2a6, 0x50d, 0x510, 0x19a,
-        0xfff, 0x354, 0x414, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x44c, 0x3b0, 0xfff, 0x23d, 0x429, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x4c0, 0x416, 0xfff, 0x05b, 0xfff, 0xfff, 0x137, 0xfff,
-        0x25f, 0x49f, 0xfff, 0x279, 0x013, 0xfff, 0xfff, 0xfff,
-        0x269, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x3d0, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x077, 0xfff, 0xfff, 0x3fb,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x271, 0x3a0, 0xfff, 0xfff,
-        0x40f, 0xfff, 0xfff, 0x3de, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ab, 0x26a,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x489, 0xfff, 0xfff,
-        0x252, 0xfff, 0xfff, 0xfff, 0xfff, 0x1b7, 0x42f, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x3b7,
-        0xfff, 0x2bb, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x0f7, 0x01d, 0xfff, 0x067, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x4e2, 0xfff, 0xfff, 0x4bb, 0xfff,
-        0xfff, 0xfff, 0x17b, 0xfff, 0x0ee, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x36e, 0xfff, 0xfff, 0xfff, 0x533, 0xfff,
-        0xfff, 0xfff, 0x4d4, 0x356, 0xfff, 0xfff, 0x375, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x4a4, 0x513, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4ff, 0xfff, 0x2af,
-        0xfff, 0xfff, 0x026, 0xfff, 0x0ad, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x26e, 0xfff, 0xfff, 0xfff, 0xfff, 0x493, 0xfff,
-        0x463, 0x4d2, 0x4be, 0xfff, 0xfff, 0xfff, 0xfff, 0x4f2,
-        0x0b6, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x32d, 0x315, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x13a, 0x4a1, 0xfff, 0x27a, 0xfff, 0xfff, 0xfff,
-        0x47a, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x334, 0xfff, 0xfff, 0xfff, 0xfff, 0x54c, 0xfff, 0xfff,
-        0xfff, 0x0c9, 0x007, 0xfff, 0xfff, 0x12e, 0xfff, 0x0ff,
-        0xfff, 0xfff, 0x3f5, 0x509, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x1c3, 0x2ad, 0xfff, 0xfff, 0x47c, 0x261, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x152, 0xfff, 0xfff, 0xfff, 0x339,
-        0xfff, 0x243, 0x1c0, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x063, 0xfff, 0xfff, 0x254, 0xfff, 0xfff, 0x173, 0xfff,
-        0x0c7, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x362, 0x259, 0x485, 0x374, 0x0dc, 0x3ab, 0xfff,
-        0x1c5, 0x534, 0x544, 0xfff, 0xfff, 0x508, 0xfff, 0x402,
-        0x408, 0xfff, 0x0e7, 0xfff, 0xfff, 0x00a, 0x205, 0xfff,
-        0xfff, 0x2b9, 0xfff, 0xfff, 0xfff, 0x465, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x23a, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x147, 0x19d, 0x115, 0x214, 0xfff, 0x090, 0x368,
-        0xfff, 0x210, 0xfff, 0xfff, 0x280, 0x52a, 0x163, 0x148,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x326, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x2de, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x206, 0x2c1, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x189, 0xfff, 0xfff, 0xfff, 0xfff, 0x367, 0xfff, 0x1a4,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x443, 0xfff, 0x27b,
-        0xfff, 0xfff, 0x251, 0x549, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x188, 0x04b, 0xfff, 0xfff, 0xfff, 0x31f,
-        0x4a6, 0xfff, 0x246, 0x1de, 0x156, 0xfff, 0xfff, 0xfff,
-        0x3a9, 0xfff, 0xfff, 0xfff, 0x2fa, 0xfff, 0x128, 0x0d1,
-        0x449, 0x255, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x258, 0xfff, 0xfff, 0xfff,
-        0x532, 0xfff, 0xfff, 0xfff, 0x303, 0x517, 0xfff, 0xfff,
-        0x2a9, 0x24a, 0xfff, 0xfff, 0x231, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x4b6, 0x516, 0xfff, 0xfff, 0x0e4, 0x0eb,
-        0xfff, 0x4e4, 0xfff, 0x275, 0xfff, 0xfff, 0x031, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x025, 0x21a, 0xfff, 0x0cc,
-        0x45f, 0x3d9, 0x289, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x23e, 0xfff, 0xfff, 0xfff, 0x438, 0x097,
-        0x419, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x0a9, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x37e, 0x0e0, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x431,
-        0x372, 0xfff, 0xfff, 0xfff, 0x1ba, 0x06e, 0xfff, 0x1b1,
-        0xfff, 0xfff, 0x12a, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x193, 0xfff, 0xfff, 0xfff, 0xfff, 0x10a,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x048, 0x1b4,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x295, 0x140, 0x108, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x16f, 0xfff, 0x0a4, 0x37a, 0xfff,
-        0x29a, 0xfff, 0x284, 0xfff, 0xfff, 0xfff, 0xfff, 0x4c6,
-        0x2a2, 0x3a3, 0xfff, 0x201, 0xfff, 0xfff, 0xfff, 0x4bd,
-        0x005, 0x54a, 0x3b5, 0x204, 0x2ee, 0x11d, 0x436, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x3ec, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x11f, 0x498, 0x21c, 0xfff,
-        0xfff, 0xfff, 0x3d6, 0xfff, 0x4ab, 0xfff, 0x432, 0x2eb,
-        0x542, 0x4fd, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x4ce, 0xfff, 0xfff, 0x2fb, 0xfff,
-        0xfff, 0x2e1, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1b9, 0x037, 0x0dd,
-        0xfff, 0xfff, 0xfff, 0x2bf, 0x521, 0x496, 0x095, 0xfff,
-        0xfff, 0x328, 0x070, 0x1bf, 0xfff, 0x393, 0xfff, 0xfff,
-        0x102, 0xfff, 0xfff, 0x21b, 0xfff, 0x142, 0x263, 0x519,
-        0xfff, 0x2a5, 0x177, 0xfff, 0x14d, 0x471, 0x4ae, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x1f6, 0xfff, 0x481, 0xfff, 0xfff, 0xfff, 0x151, 0xfff,
-        0xfff, 0xfff, 0x085, 0x33f, 0xfff, 0xfff, 0xfff, 0x084,
-        0xfff, 0xfff, 0xfff, 0x345, 0x3a2, 0xfff, 0xfff, 0x0a0,
-        0x0da, 0x024, 0xfff, 0xfff, 0xfff, 0x1bd, 0xfff, 0x55c,
-        0x467, 0x445, 0xfff, 0xfff, 0xfff, 0x052, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x51e, 0xfff, 0xfff, 0x39d, 0xfff, 0x35f,
-        0xfff, 0x376, 0x3ee, 0xfff, 0xfff, 0xfff, 0xfff, 0x448,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x16a,
-        0xfff, 0x036, 0x38f, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x211,
-        0xfff, 0xfff, 0xfff, 0x230, 0xfff, 0xfff, 0x3ba, 0xfff,
-        0xfff, 0xfff, 0x3ce, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x229, 0xfff, 0x176, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x00b, 0xfff, 0x162, 0x018, 0xfff,
-        0xfff, 0x233, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x400, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x12b, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x3f4, 0xfff, 0x0f0, 0xfff, 0x1ac, 0xfff, 0xfff,
-        0x119, 0xfff, 0x2c0, 0xfff, 0xfff, 0xfff, 0x49b, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x23c, 0xfff,
-        0x4b3, 0x010, 0x064, 0xfff, 0xfff, 0x4ba, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x3c2, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x006, 0x196, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x100, 0x191, 0xfff,
-        0x1ea, 0x29f, 0xfff, 0xfff, 0xfff, 0x276, 0xfff, 0xfff,
-        0x2b1, 0x3b9, 0xfff, 0x03c, 0xfff, 0xfff, 0xfff, 0x180,
-        0xfff, 0x08f, 0xfff, 0xfff, 0x19e, 0x019, 0xfff, 0x0b0,
-        0x0fd, 0x332, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x06b, 0x2e8, 0xfff, 0x446, 0xfff, 0xfff, 0x004,
-        0x247, 0x197, 0xfff, 0x112, 0x169, 0x292, 0xfff, 0x302,
-        0xfff, 0xfff, 0x33b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x287, 0x21f, 0xfff, 0x3ea, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4e7, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x3a8, 0xfff, 0xfff, 0x2bc, 0xfff,
-        0x484, 0x296, 0xfff, 0x1c9, 0x08c, 0x1e5, 0x48a, 0xfff,
-        0x360, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x1ca, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x10d, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x066, 0x2ea, 0x28b, 0x25b, 0xfff, 0x072,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x2b6, 0xfff, 0xfff, 0x272,
-        0xfff, 0xfff, 0x525, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x2ca, 0xfff, 0xfff, 0xfff, 0x299, 0xfff, 0xfff, 0xfff,
-        0x558, 0x41a, 0xfff, 0x4f7, 0x557, 0xfff, 0x4a0, 0x344,
-        0x12c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x125,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x40e, 0xfff, 0xfff, 0x502, 0xfff, 0x103, 0x3e6, 0xfff,
-        0x527, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x45d, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x44e, 0xfff, 0xfff, 0xfff, 0xfff, 0x0d2, 0x4c9, 0x35e,
-        0x459, 0x2d9, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x17d,
-        0x0c4, 0xfff, 0xfff, 0xfff, 0x3ac, 0x390, 0x094, 0xfff,
-        0x483, 0x0ab, 0xfff, 0x253, 0xfff, 0x391, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x123, 0x0ef, 0xfff, 0xfff, 0xfff, 0x330,
-        0x38c, 0xfff, 0xfff, 0x2ae, 0xfff, 0xfff, 0xfff, 0x042,
-        0x012, 0x06d, 0xfff, 0xfff, 0xfff, 0x32a, 0x3db, 0x364,
-        0x2dc, 0xfff, 0x30f, 0x3d7, 0x4a5, 0x050, 0xfff, 0xfff,
-        0x029, 0xfff, 0xfff, 0xfff, 0xfff, 0x1d1, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x480, 0xfff,
-        0x4ed, 0x081, 0x0a1, 0xfff, 0xfff, 0xfff, 0x30e, 0x52f,
-        0x257, 0xfff, 0xfff, 0x447, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x401, 0x3cc, 0xfff, 0xfff, 0x0fb,
-        0x2c9, 0x42a, 0x314, 0x33e, 0x3bd, 0x318, 0xfff, 0x10e,
-        0x2a1, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x24c,
-        0x506, 0xfff, 0x267, 0xfff, 0xfff, 0x219, 0xfff, 0x1eb,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x309, 0x3e2, 0x46c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x384, 0xfff, 0xfff, 0xfff, 0xfff, 0x50c, 0xfff, 0x24b,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x038,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x194,
-        0x143, 0x3e3, 0xfff, 0xfff, 0xfff, 0x4c2, 0xfff, 0xfff,
-        0x0e1, 0x25c, 0xfff, 0x237, 0xfff, 0x1fe, 0xfff, 0xfff,
-        0xfff, 0x065, 0x2a4, 0xfff, 0x386, 0x55a, 0x11b, 0xfff,
-        0xfff, 0x192, 0xfff, 0x183, 0x00e, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x4b2, 0x18e, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x486, 0x4ef, 0x0c6, 0x380, 0xfff, 0x4a8, 0xfff,
-        0x0c5, 0xfff, 0xfff, 0xfff, 0xfff, 0x093, 0x1b8, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2e6,
-        0xfff, 0x0f3, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x28e, 0xfff, 0x53b, 0x420, 0x22a, 0x33a, 0xfff, 0x387,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2a3, 0xfff, 0xfff,
-        0xfff, 0x428, 0x500, 0xfff, 0xfff, 0x120, 0x2c6, 0x290,
-        0x2f5, 0x0e3, 0xfff, 0x0b7, 0xfff, 0x319, 0x474, 0xfff,
-        0xfff, 0xfff, 0x529, 0x014, 0xfff, 0x41b, 0x40a, 0x18b,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0d9,
-        0xfff, 0x38a, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ce, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x3b1, 0xfff, 0xfff, 0x05d,
-        0x2c4, 0xfff, 0xfff, 0x4af, 0xfff, 0x030, 0xfff, 0xfff,
-        0x203, 0xfff, 0x277, 0x256, 0xfff, 0xfff, 0xfff, 0x4f9,
-        0xfff, 0x2c7, 0xfff, 0x466, 0x016, 0x1cd, 0xfff, 0x167,
-        0xfff, 0xfff, 0x0c8, 0xfff, 0x43d, 0xfff, 0xfff, 0x020,
-        0xfff, 0xfff, 0x232, 0x1cb, 0x1e0, 0xfff, 0xfff, 0x347,
-        0xfff, 0x478, 0xfff, 0x365, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x358, 0xfff, 0x10b, 0xfff, 0x35d, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x452, 0x22d, 0xfff, 0xfff, 0x47d, 0xfff,
-        0x2f3, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x460, 0xfff,
-        0xfff, 0xfff, 0x50b, 0xfff, 0xfff, 0xfff, 0x2ec, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x4b1, 0x422, 0xfff, 0xfff,
-        0xfff, 0x2d4, 0xfff, 0x239, 0xfff, 0xfff, 0xfff, 0x439,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x491, 0x075, 0xfff, 0xfff, 0xfff, 0x06c, 0xfff,
-        0xfff, 0x0f9, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x139, 0xfff, 0x4f6, 0xfff, 0xfff, 0x409, 0xfff,
-        0xfff, 0x15b, 0xfff, 0xfff, 0x348, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x4a2, 0x49d, 0xfff, 0x033, 0x175, 0xfff, 0x039,
-        0xfff, 0x312, 0x40c, 0xfff, 0xfff, 0x325, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x4aa, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0x165, 0x3bc, 0x48c, 0x310, 0x096,
-        0xfff, 0xfff, 0x250, 0x1a2, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x20d, 0x2ac, 0xfff, 0xfff, 0x39b, 0xfff, 0x377, 0xfff,
-        0x512, 0x495, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x357, 0x4ea, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x198, 0xfff, 0xfff, 0xfff, 0x434, 0x04a,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x062, 0xfff, 0x1d6, 0x1c8,
-        0xfff, 0x1f3, 0x281, 0xfff, 0x462, 0xfff, 0xfff, 0xfff,
-        0x4b0, 0xfff, 0x207, 0xfff, 0xfff, 0xfff, 0xfff, 0x3dd,
-        0xfff, 0xfff, 0x55d, 0xfff, 0x552, 0x494, 0x1af, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x227, 0xfff, 0xfff, 0x069,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x43e,
-        0x0b5, 0xfff, 0x524, 0x2d2, 0xfff, 0xfff, 0xfff, 0x28f,
-        0xfff, 0x01b, 0x50e, 0xfff, 0xfff, 0x1bb, 0xfff, 0xfff,
-        0x41d, 0xfff, 0x32e, 0x48e, 0xfff, 0x1f7, 0x224, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x394, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x52c, 0xfff, 0xfff, 0xfff, 0x392, 0xfff, 0x1e7,
-        0xfff, 0xfff, 0x3f9, 0x3a7, 0xfff, 0x51f, 0xfff, 0x0bb,
-        0x118, 0x3ca, 0xfff, 0x1dd, 0xfff, 0x48b, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x50f, 0xfff, 0x0d6, 0xfff, 0x1fa, 0xfff,
-        0x11e, 0xfff, 0xfff, 0xfff, 0xfff, 0x4d7, 0xfff, 0x078,
-        0x008, 0xfff, 0x25d, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x032, 0x33c, 0xfff, 0x4d9, 0x160, 0xfff, 0xfff, 0x300,
-        0x0b1, 0xfff, 0x322, 0xfff, 0x4ec, 0xfff, 0xfff, 0x200,
-        0x00c, 0x369, 0x473, 0xfff, 0xfff, 0x32c, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x53e, 0x3d4, 0x417, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x34b, 0x001, 0x39a, 0x02c, 0xfff, 0xfff, 0x2ce, 0x00f,
-        0xfff, 0x0ba, 0xfff, 0xfff, 0xfff, 0xfff, 0x060, 0xfff,
-        0x406, 0xfff, 0xfff, 0xfff, 0x4ee, 0x4ac, 0xfff, 0x43f,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x29b, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x216,
-        0x190, 0xfff, 0x396, 0x464, 0xfff, 0xfff, 0x323, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2e9, 0xfff, 0x26d,
-        0x2cd, 0x040, 0xfff, 0xfff, 0xfff, 0xfff, 0x38b, 0x3c0,
-        0xfff, 0xfff, 0xfff, 0x1f2, 0xfff, 0x0ea, 0xfff, 0xfff,
-        0x472, 0xfff, 0x1fb, 0xfff, 0xfff, 0x0af, 0x27f, 0xfff,
-        0xfff, 0xfff, 0x479, 0x023, 0xfff, 0x0d8, 0x3b3, 0xfff,
-        0xfff, 0xfff, 0x121, 0xfff, 0xfff, 0x3bf, 0xfff, 0xfff,
-        0x16b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x45a, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x0be, 0xfff, 0xfff, 0xfff, 0x111, 0xfff, 0x220,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x09b, 0x218, 0xfff, 0x022, 0x202, 0xfff,
-        0x4c8, 0xfff, 0x0ed, 0xfff, 0xfff, 0x182, 0xfff, 0xfff,
-        0xfff, 0x17f, 0x213, 0xfff, 0x321, 0x36a, 0xfff, 0x086,
-        0xfff, 0xfff, 0xfff, 0x43b, 0x088, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x26c, 0xfff, 0x2f8, 0x3b4, 0xfff, 0xfff, 0xfff,
-        0x132, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x333, 0x444,
-        0x0c1, 0x4d8, 0x46d, 0x264, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x426, 0xfff, 0xfff, 0xfff, 0xfff, 0x2fe, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x011, 0xfff, 0x05f, 0xfff, 0xfff, 0xfff,
-        0xfff, 0x10c, 0x101, 0xfff, 0xfff, 0xfff, 0xfff, 0x110,
-        0xfff, 0x044, 0x304, 0x361, 0x404, 0xfff, 0x51b, 0x099,
-        0xfff, 0x440, 0xfff, 0xfff, 0xfff, 0x222, 0xfff, 0xfff,
-        0xfff, 0xfff, 0x1b5, 0xfff, 0x136, 0x430, 0xfff, 0x1da,
-        0xfff, 0xfff, 0xfff, 0x043, 0xfff, 0x17c, 0xfff, 0xfff,
-        0xfff, 0x01c, 0xfff, 0xfff, 0xfff, 0x425, 0x236, 0xfff,
-        0x317, 0xfff, 0xfff, 0x437, 0x3fc, 0xfff, 0x1f1, 0xfff,
-        0x324, 0xfff, 0xfff, 0x0ca, 0x306, 0xfff, 0x548, 0xfff,
-        0x46e, 0xfff, 0xfff, 0xfff, 0x4b8, 0x1c2, 0x286, 0xfff,
-        0xfff, 0x087, 0x18a, 0x19f, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x18c, 0xfff, 0x215, 0xfff, 0xfff, 0xfff, 0xfff, 0x283,
-        0xfff, 0xfff, 0xfff, 0x126, 0xfff, 0xfff, 0x370, 0xfff,
-        0x53f, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x31c, 0xfff,
-        0x4d1, 0xfff, 0xfff, 0xfff, 0x021, 0xfff, 0x157, 0xfff,
-        0xfff, 0x028, 0x16e, 0xfff, 0x421, 0xfff, 0x1c6, 0xfff,
-        0xfff, 0x511, 0xfff, 0xfff, 0x39c, 0x46f, 0x1b2, 0xfff,
-        0xfff, 0x316, 0xfff, 0xfff, 0x009, 0xfff, 0xfff, 0x195,
-        0xfff, 0x240, 0x546, 0xfff, 0xfff, 0x520, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x454, 0xfff, 0xfff, 0xfff,
-        0x3f3, 0xfff, 0xfff, 0x187, 0xfff, 0x4a9, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x51c, 0x453, 0x1e6, 0xfff,
-        0xfff, 0xfff, 0x1b0, 0xfff, 0x477, 0xfff, 0xfff, 0xfff,
-        0x4fe, 0xfff, 0x32f, 0xfff, 0xfff, 0x15e, 0x1d4, 0xfff,
-        0x0e5, 0xfff, 0xfff, 0xfff, 0x242, 0x14b, 0x046, 0xfff,
-        0x3f6, 0x3bb, 0x3e4, 0xfff, 0xfff, 0x2e3, 0xfff, 0x245,
-        0xfff, 0x149, 0xfff, 0xfff, 0xfff, 0x2db, 0xfff, 0xfff,
-        0x181, 0xfff, 0x089, 0x2c5, 0xfff, 0x1f5, 0xfff, 0x2d6,
-        0x507, 0xfff, 0x42d, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0x080, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
-        0xfff, 0xfff, 0xfff, 0xfff, 0x3c3, 0x320, 0xfff, 0x1e1,
-        0xfff, 0x0f5, 0x13b, 0xfff, 0xfff, 0xfff, 0x003, 0x4da,
-        0xfff, 0xfff, 0xfff, 0x42c, 0xfff, 0xfff, 0x0cb, 0xfff,
-        0x536, 0x2c3, 0xfff, 0xfff, 0xfff, 0xfff, 0x199, 0xfff,
-        0xfff, 0x0c0, 0xfff, 0x01e, 0x497, 0xfff, 0xfff, 0x3e5,
-        0xfff, 0xfff, 0xfff, 0x0cf, 0xfff, 0x2bd, 0xfff, 0x223,
-        0xfff, 0x3ff, 0xfff, 0x058, 0x174, 0x3ef, 0xfff, 0x002
-};
-
-static unsigned short err_pos(unsigned short din)
-{
-        BUG_ON(din >= ARRAY_SIZE(err_pos_lut));
-        return err_pos_lut[din];
-}
-static int chk_no_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
-{
-        if ((chk_syndrome_list[0] | chk_syndrome_list[1] |
-             chk_syndrome_list[2] | chk_syndrome_list[3] |
-             chk_syndrome_list[4] | chk_syndrome_list[5] |
-             chk_syndrome_list[6] | chk_syndrome_list[7]) != 0x0) {
-                return -EINVAL;
-        } else {
-                err_info[0] = 0x0;
-                return 0;
-        }
-}
-static int chk_1_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
-{
-        unsigned short tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;
-        tmp0 = gf4096_mul(chk_syndrome_list[1], gf4096_inv(chk_syndrome_list[0]));
-        tmp1 = gf4096_mul(chk_syndrome_list[2], gf4096_inv(chk_syndrome_list[1]));
-        tmp2 = gf4096_mul(chk_syndrome_list[3], gf4096_inv(chk_syndrome_list[2]));
-        tmp3 = gf4096_mul(chk_syndrome_list[4], gf4096_inv(chk_syndrome_list[3]));
-        tmp4 = gf4096_mul(chk_syndrome_list[5], gf4096_inv(chk_syndrome_list[4]));
-        tmp5 = gf4096_mul(chk_syndrome_list[6], gf4096_inv(chk_syndrome_list[5]));
-        tmp6 = gf4096_mul(chk_syndrome_list[7], gf4096_inv(chk_syndrome_list[6]));
-        if ((tmp0 == tmp1) & (tmp1 == tmp2) & (tmp2 == tmp3) & (tmp3 == tmp4) & (tmp4 == tmp5) & (tmp5 == tmp6)) {
-                err_info[0] = 0x1;      // encode 1-symbol error as 0x1
-                err_info[1] = err_pos(tmp0);
-                err_info[1] = (unsigned short)(0x55e - err_info[1]);
-                err_info[5] = chk_syndrome_list[0];
-                return 0;
-        } else
-                return -EINVAL;
-}
-static int chk_2_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
-{
-        unsigned short tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-        unsigned short coefs[4];
-        unsigned short err_pats[4];
-        int found_num_root = 0;
-        unsigned short bit2_root0, bit2_root1;
-        unsigned short bit2_root0_inv, bit2_root1_inv;
-        unsigned short err_loc_eqn, test_root;
-        unsigned short bit2_loc0, bit2_loc1;
-        unsigned short bit2_pat0, bit2_pat1;
-
-        find_2x2_soln(chk_syndrome_list[1],
-                      chk_syndrome_list[0],
-                      chk_syndrome_list[2], chk_syndrome_list[1], chk_syndrome_list[2], chk_syndrome_list[3], coefs);
-        for (test_root = 0x1; test_root < 0xfff; test_root++) {
-                err_loc_eqn =
-                    gf4096_mul(coefs[1], gf4096_mul(test_root, test_root)) ^ gf4096_mul(coefs[0], test_root) ^ 0x1;
-                if (err_loc_eqn == 0x0) {
-                        if (found_num_root == 0) {
-                                bit2_root0 = test_root;
-                                found_num_root = 1;
-                        } else if (found_num_root == 1) {
-                                bit2_root1 = test_root;
-                                found_num_root = 2;
-                                break;
-                        }
-                }
-        }
-        if (found_num_root != 2)
-                return -EINVAL;
-        else {
-                bit2_root0_inv = gf4096_inv(bit2_root0);
-                bit2_root1_inv = gf4096_inv(bit2_root1);
-                find_2bit_err_pats(chk_syndrome_list[0],
-                                   chk_syndrome_list[1], bit2_root0_inv, bit2_root1_inv, err_pats);
-                bit2_pat0 = err_pats[0];
-                bit2_pat1 = err_pats[1];
-                //for(x+1)
-                tmp0 = gf4096_mul(gf4096_mul(bit2_root0_inv, bit2_root0_inv), gf4096_mul(bit2_root0_inv, bit2_root0_inv));      //rinv0^4
-                tmp1 = gf4096_mul(bit2_root0_inv, tmp0);        //rinv0^5
-                tmp2 = gf4096_mul(bit2_root0_inv, tmp1);        //rinv0^6
-                tmp3 = gf4096_mul(bit2_root0_inv, tmp2);        //rinv0^7
-                tmp4 = gf4096_mul(gf4096_mul(bit2_root1_inv, bit2_root1_inv), gf4096_mul(bit2_root1_inv, bit2_root1_inv));      //rinv1^4
-                tmp5 = gf4096_mul(bit2_root1_inv, tmp4);        //rinv1^5
-                tmp6 = gf4096_mul(bit2_root1_inv, tmp5);        //rinv1^6
-                tmp7 = gf4096_mul(bit2_root1_inv, tmp6);        //rinv1^7
-                //check if only 2-bit error
-                if ((chk_syndrome_list[4] ==
-                     (gf4096_mul(bit2_pat0, tmp0) ^
-                      gf4096_mul(bit2_pat1,
-                                 tmp4))) & (chk_syndrome_list[5] ==
-                                            (gf4096_mul(bit2_pat0, tmp1) ^
-                                             gf4096_mul(bit2_pat1,
-                                                        tmp5))) &
-                    (chk_syndrome_list[6] ==
-                     (gf4096_mul(bit2_pat0, tmp2) ^
-                      gf4096_mul(bit2_pat1,
-                                 tmp6))) & (chk_syndrome_list[7] ==
-                                            (gf4096_mul(bit2_pat0, tmp3) ^ gf4096_mul(bit2_pat1, tmp7)))) {
-                        if ((err_pos(bit2_root0_inv) == 0xfff) | (err_pos(bit2_root1_inv) == 0xfff)) {
-                                return -EINVAL;
-                        } else {
-                                bit2_loc0 = 0x55e - err_pos(bit2_root0_inv);
-                                bit2_loc1 = 0x55e - err_pos(bit2_root1_inv);
-                                err_info[0] = 0x2;      // encode 2-symbol error as 0x2
-                                err_info[1] = bit2_loc0;
-                                err_info[2] = bit2_loc1;
-                                err_info[5] = bit2_pat0;
-                                err_info[6] = bit2_pat1;
-                                return 0;
-                        }
-                } else
-                        return -EINVAL;
-        }
-}
-static int chk_3_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
-{
-        unsigned short tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;
-        unsigned short coefs[4];
-        unsigned short err_pats[4];
-        int found_num_root = 0;
-        unsigned short bit3_root0, bit3_root1, bit3_root2;
-        unsigned short bit3_root0_inv, bit3_root1_inv, bit3_root2_inv;
-        unsigned short err_loc_eqn, test_root;
-
-        find_3bit_err_coefs(chk_syndrome_list[0], chk_syndrome_list[1],
-                            chk_syndrome_list[2], chk_syndrome_list[3],
-                            chk_syndrome_list[4], chk_syndrome_list[5], coefs);
-
-        for (test_root = 0x1; test_root < 0xfff; test_root++) {
-                err_loc_eqn = gf4096_mul(coefs[2],
-                                         gf4096_mul(gf4096_mul(test_root, test_root),
-                                                    test_root)) ^ gf4096_mul(coefs[1], gf4096_mul(test_root, test_root))
-                        ^ gf4096_mul(coefs[0], test_root) ^ 0x1;
-
-                if (err_loc_eqn == 0x0) {
-                        if (found_num_root == 0) {
-                                bit3_root0 = test_root;
-                                found_num_root = 1;
-                        } else if (found_num_root == 1) {
-                                bit3_root1 = test_root;
-                                found_num_root = 2;
-                        } else if (found_num_root == 2) {
-                                bit3_root2 = test_root;
-                                found_num_root = 3;
-                                break;
-                        }
-                }
-        }
-        if (found_num_root != 3)
-                return -EINVAL;
-        else {
-                bit3_root0_inv = gf4096_inv(bit3_root0);
-                bit3_root1_inv = gf4096_inv(bit3_root1);
-                bit3_root2_inv = gf4096_inv(bit3_root2);
-
-                find_3bit_err_pats(chk_syndrome_list[0], chk_syndrome_list[1],
-                                   chk_syndrome_list[2], bit3_root0_inv,
-                                   bit3_root1_inv, bit3_root2_inv, err_pats);
-
-                //check if only 3-bit error
-                tmp0 = gf4096_mul(bit3_root0_inv, bit3_root0_inv);
-                tmp0 = gf4096_mul(tmp0, tmp0);
-                tmp0 = gf4096_mul(tmp0, bit3_root0_inv);
-                tmp0 = gf4096_mul(tmp0, bit3_root0_inv);        //rinv0^6
-                tmp1 = gf4096_mul(tmp0, bit3_root0_inv);        //rinv0^7
-                tmp2 = gf4096_mul(bit3_root1_inv, bit3_root1_inv);
-                tmp2 = gf4096_mul(tmp2, tmp2);
-                tmp2 = gf4096_mul(tmp2, bit3_root1_inv);
-                tmp2 = gf4096_mul(tmp2, bit3_root1_inv);        //rinv1^6
-                tmp3 = gf4096_mul(tmp2, bit3_root1_inv);        //rinv1^7
-                tmp4 = gf4096_mul(bit3_root2_inv, bit3_root2_inv);
-                tmp4 = gf4096_mul(tmp4, tmp4);
-                tmp4 = gf4096_mul(tmp4, bit3_root2_inv);
-                tmp4 = gf4096_mul(tmp4, bit3_root2_inv);        //rinv2^6
-                tmp5 = gf4096_mul(tmp4, bit3_root2_inv);        //rinv2^7
-
-                //check if only 3 errors
-                if ((chk_syndrome_list[6] == (gf4096_mul(err_pats[0], tmp0) ^
-                                              gf4096_mul(err_pats[1], tmp2) ^
-                                              gf4096_mul(err_pats[2], tmp4))) &
-                    (chk_syndrome_list[7] == (gf4096_mul(err_pats[0], tmp1) ^
-                                              gf4096_mul(err_pats[1], tmp3) ^ gf4096_mul(err_pats[2], tmp5)))) {
-                        if ((err_pos(bit3_root0_inv) == 0xfff) |
-                            (err_pos(bit3_root1_inv) == 0xfff) | (err_pos(bit3_root2_inv) == 0xfff)) {
-                                return -EINVAL;
-                        } else {
-                                err_info[0] = 0x3;
-                                err_info[1] = (0x55e - err_pos(bit3_root0_inv));
-                                err_info[2] = (0x55e - err_pos(bit3_root1_inv));
-                                err_info[3] = (0x55e - err_pos(bit3_root2_inv));
-                                err_info[5] = err_pats[0];
-                                err_info[6] = err_pats[1];
-                                err_info[7] = err_pats[2];
-                                return 0;
-                        }
-                } else
-                        return -EINVAL;
-        }
-}
-static int chk_4_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
-{
-        unsigned short coefs[4];
-        unsigned short err_pats[4];
-        int found_num_root = 0;
-        unsigned short bit4_root0, bit4_root1, bit4_root2, bit4_root3;
-        unsigned short bit4_root0_inv, bit4_root1_inv, bit4_root2_inv, bit4_root3_inv;
-        unsigned short err_loc_eqn, test_root;
-
-        find_4bit_err_coefs(chk_syndrome_list[0],
-                            chk_syndrome_list[1],
-                            chk_syndrome_list[2],
-                            chk_syndrome_list[3],
-                            chk_syndrome_list[4],
-                            chk_syndrome_list[5], chk_syndrome_list[6], chk_syndrome_list[7], coefs);
-
-        for (test_root = 0x1; test_root < 0xfff; test_root++) {
-                err_loc_eqn =
-                    gf4096_mul(coefs[3],
-                               gf4096_mul(gf4096_mul
-                                          (gf4096_mul(test_root, test_root),
-                                           test_root),
-                                          test_root)) ^ gf4096_mul(coefs[2],
-                                                                   gf4096_mul
-                                                                   (gf4096_mul(test_root, test_root), test_root))
-                    ^ gf4096_mul(coefs[1], gf4096_mul(test_root, test_root)) ^ gf4096_mul(coefs[0], test_root)
-                    ^ 0x1;
-                if (err_loc_eqn == 0x0) {
-                        if (found_num_root == 0) {
-                                bit4_root0 = test_root;
-                                found_num_root = 1;
-                        } else if (found_num_root == 1) {
-                                bit4_root1 = test_root;
-                                found_num_root = 2;
-                        } else if (found_num_root == 2) {
-                                bit4_root2 = test_root;
-                                found_num_root = 3;
-                        } else {
-                                found_num_root = 4;
-                                bit4_root3 = test_root;
-                                break;
-                        }
-                }
-        }
-        if (found_num_root != 4) {
-                return -EINVAL;
-        } else {
-                bit4_root0_inv = gf4096_inv(bit4_root0);
-                bit4_root1_inv = gf4096_inv(bit4_root1);
-                bit4_root2_inv = gf4096_inv(bit4_root2);
-                bit4_root3_inv = gf4096_inv(bit4_root3);
-                find_4bit_err_pats(chk_syndrome_list[0],
-                                   chk_syndrome_list[1],
-                                   chk_syndrome_list[2],
-                                   chk_syndrome_list[3],
-                                   bit4_root0_inv, bit4_root1_inv, bit4_root2_inv, bit4_root3_inv, err_pats);
-                err_info[0] = 0x4;
-                err_info[1] = (0x55e - err_pos(bit4_root0_inv));
-                err_info[2] = (0x55e - err_pos(bit4_root1_inv));
-                err_info[3] = (0x55e - err_pos(bit4_root2_inv));
-                err_info[4] = (0x55e - err_pos(bit4_root3_inv));
-                err_info[5] = err_pats[0];
-                err_info[6] = err_pats[1];
-                err_info[7] = err_pats[2];
-                err_info[8] = err_pats[3];
-                return 0;
-        }
-}
-
-void correct_12bit_symbol(unsigned char *buf, unsigned short sym,
-                          unsigned short val)
-{
-        if (unlikely(sym > 1366)) {
-                printk(KERN_ERR "Error: symbol %d out of range; cannot correct\n", sym);
-        } else if (sym == 0) {
-                buf[0] ^= val;
-        } else if (sym & 1) {
-                buf[1+(3*(sym-1))/2] ^= (val >> 4);
-                buf[2+(3*(sym-1))/2] ^= ((val & 0xf) << 4);
-        } else {
-                buf[2+(3*(sym-2))/2] ^= (val >> 8);
-                buf[3+(3*(sym-2))/2] ^= (val & 0xff);
-        }
-}
-
-static int debugecc = 0;
-module_param(debugecc, int, 0644);
-
-int cafe_correct_ecc(unsigned char *buf,
-                     unsigned short *chk_syndrome_list)
-{
-        unsigned short err_info[9];
-        int i;
-
-        if (debugecc) {
-                printk(KERN_WARNING "cafe_correct_ecc invoked. Syndromes %x %x %x %x %x %x %x %x\n",
-                       chk_syndrome_list[0], chk_syndrome_list[1],
-                       chk_syndrome_list[2], chk_syndrome_list[3],
-                       chk_syndrome_list[4], chk_syndrome_list[5],
-                       chk_syndrome_list[6], chk_syndrome_list[7]);
-                for (i=0; i < 2048; i+=16) {
-                        printk(KERN_WARNING "D %04x: %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                               i,
-                               buf[i], buf[i+1], buf[i+2], buf[i+3],
-                               buf[i+4], buf[i+5], buf[i+6], buf[i+7],
-                               buf[i+8], buf[i+9], buf[i+10], buf[i+11],
-                               buf[i+12], buf[i+13], buf[i+14], buf[i+15]);
-                }
-                for ( ; i < 2112; i+=16) {
-                        printk(KERN_WARNING "O   %02x: %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                               i - 2048,
-                               buf[i], buf[i+1], buf[i+2], buf[i+3],
-                               buf[i+4], buf[i+5], buf[i+6], buf[i+7],
-                               buf[i+8], buf[i+9], buf[i+10], buf[i+11],
-                               buf[i+12], buf[i+13], buf[i+14], buf[i+15]);
-                }
-        }
-
-
-
-        if (chk_no_err_only(chk_syndrome_list, err_info) &&
-            chk_1_err_only(chk_syndrome_list, err_info) &&
-            chk_2_err_only(chk_syndrome_list, err_info) &&
-            chk_3_err_only(chk_syndrome_list, err_info) &&
-            chk_4_err_only(chk_syndrome_list, err_info)) {
-                return -EIO;
-        }
-
-        for (i=0; i < err_info[0]; i++) {
-                if (debugecc)
-                        printk(KERN_WARNING "Correct symbol %d with 0x%03x\n",
-                               err_info[1+i], err_info[5+i]);
-
-                correct_12bit_symbol(buf, err_info[1+i], err_info[5+i]);
-        }
-
-        return err_info[0];
-}
-
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe_nand.c
index c328a7514510..cff969d05d4a 100644
--- a/drivers/mtd/nand/cafe.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -11,6 +11,7 @@
 #undef DEBUG
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
+#include <linux/rslib.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -46,13 +47,14 @@
 #define CAFE_GLOBAL_IRQ_MASK    0x300c
 #define CAFE_NAND_RESET         0x3034
 
-int cafe_correct_ecc(unsigned char *buf,
-                     unsigned short *chk_syndrome_list);
+/* Missing from the datasheet: bit 19 of CTRL1 sets CE0 vs. CE1 */
+#define CTRL1_CHIPSELECT        (1<<19)
 
 struct cafe_priv {
         struct nand_chip nand;
         struct pci_dev *pdev;
         void __iomem *mmio;
+        struct rs_control *rs;
         uint32_t ctl1;
         uint32_t ctl2;
         int datalen;
@@ -195,8 +197,8 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
 
         cafe->data_pos = cafe->datalen = 0;
 
-        /* Set command valid bit */
-        ctl1 = 0x80000000 | command;
+        /* Set command valid bit, mask in the chip select bit  */
+        ctl1 = 0x80000000 | command | (cafe->ctl1 & CTRL1_CHIPSELECT);
 
         /* Set RD or WR bits as appropriate */
         if (command == NAND_CMD_READID || command == NAND_CMD_STATUS) {
@@ -309,8 +311,16 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
 
 static void cafe_select_chip(struct mtd_info *mtd, int chipnr)
 {
-        //struct cafe_priv *cafe = mtd->priv;
-        //      cafe_dev_dbg(&cafe->pdev->dev, "select_chip %d\n", chipnr);
+        struct cafe_priv *cafe = mtd->priv;
+
+        cafe_dev_dbg(&cafe->pdev->dev, "select_chip %d\n", chipnr);
+
+        /* Mask the appropriate bit into the stored value of ctl1
+           which will be used by cafe_nand_cmdfunc() */
+        if (chipnr)
+                cafe->ctl1 |= CTRL1_CHIPSELECT;
+        else
+                cafe->ctl1 &= ~CTRL1_CHIPSELECT;
 }
 
 static int cafe_nand_interrupt(int irq, void *id)
@@ -374,28 +384,66 @@ static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
         chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
 
         if (checkecc && cafe_readl(cafe, NAND_ECC_RESULT) & (1<<18)) {
-                unsigned short syn[8];
-                int i;
+                unsigned short syn[8], pat[4];
+                int pos[4];
+                u8 *oob = chip->oob_poi;
+                int i, n;
 
                 for (i=0; i<8; i+=2) {
                         uint32_t tmp = cafe_readl(cafe, NAND_ECC_SYN01 + (i*2));
-                        syn[i] = tmp & 0xfff;
-                        syn[i+1] = (tmp >> 16) & 0xfff;
+                        syn[i] = cafe->rs->index_of[tmp & 0xfff];
+                        syn[i+1] = cafe->rs->index_of[(tmp >> 16) & 0xfff];
+                }
+
+                n = decode_rs16(cafe->rs, NULL, NULL, 1367, syn, 0, pos, 0,
+                                pat);
+
+                for (i = 0; i < n; i++) {
+                        int p = pos[i];
+
+                        /* The 12-bit symbols are mapped to bytes here */
+
+                        if (p > 1374) {
+                                /* out of range */
+                                n = -1374;
+                        } else if (p == 0) {
+                                /* high four bits do not correspond to data */
+                                if (pat[i] > 0xff)
+                                        n = -2048;
+                                else
+                                        buf[0] ^= pat[i];
+                        } else if (p == 1365) {
+                                buf[2047] ^= pat[i] >> 4;
+                                oob[0] ^= pat[i] << 4;
+                        } else if (p > 1365) {
+                                if ((p & 1) == 1) {
+                                        oob[3*p/2 - 2048] ^= pat[i] >> 4;
+                                        oob[3*p/2 - 2047] ^= pat[i] << 4;
+                                } else {
+                                        oob[3*p/2 - 2049] ^= pat[i] >> 8;
+                                        oob[3*p/2 - 2048] ^= pat[i];
+                                }
+                        } else if ((p & 1) == 1) {
+                                buf[3*p/2] ^= pat[i] >> 4;
+                                buf[3*p/2 + 1] ^= pat[i] << 4;
+                        } else {
+                                buf[3*p/2 - 1] ^= pat[i] >> 8;
+                                buf[3*p/2] ^= pat[i];
+                        }
                 }
 
-                if ((i = cafe_correct_ecc(buf, syn)) < 0) {
+                if (n < 0) {
                         dev_dbg(&cafe->pdev->dev, "Failed to correct ECC at %08x\n",
                                 cafe_readl(cafe, NAND_ADDR2) * 2048);
-                        for (i=0; i< 0x5c; i+=4)
+                        for (i = 0; i < 0x5c; i += 4)
                                 printk("Register %x: %08x\n", i, readl(cafe->mmio + i));
                         mtd->ecc_stats.failed++;
                 } else {
-                        dev_dbg(&cafe->pdev->dev, "Corrected %d symbol errors\n", i);
-                        mtd->ecc_stats.corrected += i;
+                        dev_dbg(&cafe->pdev->dev, "Corrected %d symbol errors\n", n);
+                        mtd->ecc_stats.corrected += n;
                 }
         }
 
-
         return 0;
 }
 
@@ -416,7 +464,7 @@ static uint8_t cafe_mirror_pattern_512[] = { 0xBC };
 
 static struct nand_bbt_descr cafe_bbt_main_descr_2048 = {
         .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+                | NAND_BBT_2BIT | NAND_BBT_VERSION,
         .offs = 14,
         .len = 4,
         .veroffs = 18,
@@ -426,7 +474,7 @@ static struct nand_bbt_descr cafe_bbt_main_descr_2048 = {
 
 static struct nand_bbt_descr cafe_bbt_mirror_descr_2048 = {
         .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+                | NAND_BBT_2BIT | NAND_BBT_VERSION,
         .offs = 14,
         .len = 4,
         .veroffs = 18,
@@ -442,7 +490,7 @@ static struct nand_ecclayout cafe_oobinfo_512 = {
 
 static struct nand_bbt_descr cafe_bbt_main_descr_512 = {
         .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+                | NAND_BBT_2BIT | NAND_BBT_VERSION,
         .offs = 14,
         .len = 1,
         .veroffs = 15,
@@ -452,7 +500,7 @@ static struct nand_bbt_descr cafe_bbt_main_descr_512 = {
 
 static struct nand_bbt_descr cafe_bbt_mirror_descr_512 = {
         .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+                | NAND_BBT_2BIT | NAND_BBT_VERSION,
         .offs = 14,
         .len = 1,
         .veroffs = 15,
@@ -525,6 +573,48 @@ static int cafe_nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
         return 0;
 }
 
+/* F_2[X]/(X**6+X+1)  */
+static unsigned short __devinit gf64_mul(u8 a, u8 b)
+{
+        u8 c;
+        unsigned int i;
+
+        c = 0;
+        for (i = 0; i < 6; i++) {
+                if (a & 1)
+                        c ^= b;
+                a >>= 1;
+                b <<= 1;
+                if ((b & 0x40) != 0)
+                        b ^= 0x43;
+        }
+
+        return c;
+}
+
+/* F_64[X]/(X**2+X+A**-1) with A the generator of F_64[X]  */
+static u16 __devinit gf4096_mul(u16 a, u16 b)
+{
+        u8 ah, al, bh, bl, ch, cl;
+
+        ah = a >> 6;
+        al = a & 0x3f;
+        bh = b >> 6;
+        bl = b & 0x3f;
+
+        ch = gf64_mul(ah ^ al, bh ^ bl) ^ gf64_mul(al, bl);
+        cl = gf64_mul(gf64_mul(ah, bh), 0x21) ^ gf64_mul(al, bl);
+
+        return (ch << 6) ^ cl;
+}
+
+static int __devinit cafe_mul(int x)
+{
+        if (x == 0)
+                return 1;
+        return gf4096_mul(x, 0xe01);
+}
+
 static int __devinit cafe_nand_probe(struct pci_dev *pdev,
                                      const struct pci_device_id *ent)
 {
@@ -564,6 +654,12 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
         }
         cafe->nand.buffers = (void *)cafe->dmabuf + 2112;
 
+        cafe->rs = init_rs_non_canonical(12, &cafe_mul, 0, 1, 8);
+        if (!cafe->rs) {
+                err = -ENOMEM;
+                goto out_ior;
+        }
+
         cafe->nand.cmdfunc = cafe_nand_cmdfunc;
         cafe->nand.dev_ready = cafe_device_ready;
         cafe->nand.read_byte = cafe_read_byte;
@@ -646,7 +742,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
                 cafe_readl(cafe, GLOBAL_CTRL), cafe_readl(cafe, GLOBAL_IRQ_MASK));
 
         /* Scan to find existence of the device */
-        if (nand_scan_ident(mtd, 1)) {
+        if (nand_scan_ident(mtd, 2)) {
                 err = -ENXIO;
                 goto out_irq;
         }
@@ -713,6 +809,7 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev)
         cafe_writel(cafe, ~1 & cafe_readl(cafe, GLOBAL_IRQ_MASK), GLOBAL_IRQ_MASK);
         free_irq(pdev->irq, mtd);
         nand_release(mtd);
+        free_rs(cafe->rs);
         pci_iounmap(pdev, cafe->mmio);
         dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
         kfree(mtd);
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 04de315e4937..7e68203fe1ba 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -303,28 +303,27 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
         struct nand_chip *chip = mtd->priv;
         u16 bad;
 
+        page = (int)(ofs >> chip->page_shift) & chip->pagemask;
+
         if (getchip) {
-                page = (int)(ofs >> chip->page_shift);
                 chipnr = (int)(ofs >> chip->chip_shift);
 
                 nand_get_device(chip, mtd, FL_READING);
 
                 /* Select the NAND device */
                 chip->select_chip(mtd, chipnr);
-        } else
-                page = (int)(ofs >> chip->page_shift);
+        }
 
         if (chip->options & NAND_BUSWIDTH_16) {
                 chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos & 0xFE,
-                              page & chip->pagemask);
+                              page);
                 bad = cpu_to_le16(chip->read_word(mtd));
                 if (chip->badblockpos & 0x1)
                         bad >>= 8;
                 if ((bad & 0xFF) != 0xff)
                         res = 1;
         } else {
-                chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos,
-                              page & chip->pagemask);
+                chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos, page);
                 if (chip->read_byte(mtd) != 0xff)
                         res = 1;
         }
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
new file mode 100644
index 000000000000..cd725fc5e813
--- /dev/null
+++ b/drivers/mtd/nand/plat_nand.c
@@ -0,0 +1,150 @@
+/*
+ * Generic NAND driver
+ *
+ * Author: Vitaly Wool <vitalywool@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+
+struct plat_nand_data {
+        struct nand_chip        chip;
+        struct mtd_info         mtd;
+        void __iomem            *io_base;
+#ifdef CONFIG_MTD_PARTITIONS
+        int                     nr_parts;
+        struct mtd_partition    *parts;
+#endif
+};
+
+/*
+ * Probe for the NAND device.
+ */
+static int __init plat_nand_probe(struct platform_device *pdev)
+{
+        struct platform_nand_data *pdata = pdev->dev.platform_data;
+        struct plat_nand_data *data;
+        int res = 0;
+
+        /* Allocate memory for the device structure (and zero it) */
+        data = kzalloc(sizeof(struct plat_nand_data), GFP_KERNEL);
+        if (!data) {
+                dev_err(&pdev->dev, "failed to allocate device structure.\n");
+                return -ENOMEM;
+        }
+
+        data->io_base = ioremap(pdev->resource[0].start,
+                                pdev->resource[0].end - pdev->resource[0].start + 1);
+        if (data->io_base == NULL) {
+                dev_err(&pdev->dev, "ioremap failed\n");
+                kfree(data);
+                return -EIO;
+        }
+
+        data->chip.priv = &data;
+        data->mtd.priv = &data->chip;
+        data->mtd.owner = THIS_MODULE;
+
+        data->chip.IO_ADDR_R = data->io_base;
+        data->chip.IO_ADDR_W = data->io_base;
+        data->chip.cmd_ctrl = pdata->ctrl.cmd_ctrl;
+        data->chip.dev_ready = pdata->ctrl.dev_ready;
+        data->chip.select_chip = pdata->ctrl.select_chip;
+        data->chip.chip_delay = pdata->chip.chip_delay;
+        data->chip.options |= pdata->chip.options;
+
+        data->chip.ecc.hwctl = pdata->ctrl.hwcontrol;
+        data->chip.ecc.layout = pdata->chip.ecclayout;
+        data->chip.ecc.mode = NAND_ECC_SOFT;
+
+        platform_set_drvdata(pdev, data);
+
+        /* Scan to find existance of the device */
+        if (nand_scan(&data->mtd, 1)) {
+                res = -ENXIO;
+                goto out;
+        }
+
+#ifdef CONFIG_MTD_PARTITIONS
+        if (pdata->chip.part_probe_types) {
+                res = parse_mtd_partitions(&data->mtd,
+                                        pdata->chip.part_probe_types,
+                                        &data->parts, 0);
+                if (res > 0) {
+                        add_mtd_partitions(&data->mtd, data->parts, res);
+                        return 0;
+                }
+        }
+        if (pdata->chip.partitions) {
+                data->parts = pdata->chip.partitions;
+                res = add_mtd_partitions(&data->mtd, data->parts,
+                        pdata->chip.nr_partitions);
+        } else
+#endif
+        res = add_mtd_device(&data->mtd);
+
+        if (!res)
+                return res;
+
+        nand_release(&data->mtd);
+out:
+        platform_set_drvdata(pdev, NULL);
+        iounmap(data->io_base);
+        kfree(data);
+        return res;
+}
+
+/*
+ * Remove a NAND device.
+ */
+static int __devexit plat_nand_remove(struct platform_device *pdev)
+{
+        struct plat_nand_data *data = platform_get_drvdata(pdev);
+        struct platform_nand_data *pdata = pdev->dev.platform_data;
+
+        nand_release(&data->mtd);
+#ifdef CONFIG_MTD_PARTITIONS
+        if (data->parts && data->parts != pdata->chip.partitions)
+                kfree(data->parts);
+#endif
+        iounmap(data->io_base);
+        kfree(data);
+
+        return 0;
+}
+
+static struct platform_driver plat_nand_driver = {
+        .probe          = plat_nand_probe,
+        .remove         = plat_nand_remove,
+        .driver         = {
+                .name   = "gen_nand",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init plat_nand_init(void)
+{
+        return platform_driver_register(&plat_nand_driver);
+}
+
+static void __exit plat_nand_exit(void)
+{
+        platform_driver_unregister(&plat_nand_driver);
+}
+
+module_init(plat_nand_init);
+module_exit(plat_nand_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Vitaly Wool");
+MODULE_DESCRIPTION("Simple generic NAND driver");
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 000794c6caf5..0537fac8de74 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2192,7 +2192,7 @@ static int onenand_check_maf(int manuf)
  * @param mtd           MTD device structure
  *
  * OneNAND detection method:
- *   Compare the the values from command with ones from register
+ *   Compare the values from command with ones from register
  */
 static int onenand_probe(struct mtd_info *mtd)
 {
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 3dba5733ed1f..74002945b71b 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -940,9 +940,6 @@ static void ltree_entry_ctor(void *obj, struct kmem_cache *cache,
 {
         struct ltree_entry *le = obj;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR)
-                return;
-
         le->users = 0;
         init_rwsem(&le->mutex);
 }
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 9588da3a30e7..127f60841b10 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -95,8 +95,7 @@ static int max_interrupt_work = 10;
 #include <asm/io.h>
 #include <asm/irq.h>
 
-static char versionA[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
-static char versionB[] __initdata = "http://www.scyld.com/network/3c509.html\n";
+static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
 
 #if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA))
 #define EL3_SUSPEND
@@ -360,7 +359,7 @@ static int __init el3_common_init(struct net_device *dev)
         printk(", IRQ %d.\n", dev->irq);
 
         if (el3_debug > 0)
-                printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
+                printk(KERN_INFO "%s", version);
         return 0;
 
 }
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80924f76dee8..f26ca331615e 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -103,7 +103,7 @@ static int vortex_debug = 1;
 
 
 static char version[] __devinitdata =
-DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n";
+DRV_NAME ": Donald Becker and others.\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver ");
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 279ec625cec4..c5baa197bc08 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1104,7 +1104,7 @@ config ETH16I
 
 config NE2000
         tristate "NE2000/NE1000 support"
-        depends on NET_ISA || (Q40 && m) || M32R
+        depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938
         select CRC32
         ---help---
           If you have a network (Ethernet) card of this type, say Y and read
@@ -1898,8 +1898,12 @@ endmenu
 #       Gigabit Ethernet
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NETDEV_1000
+        bool "Ethernet (1000 Mbit)"
         depends on !UML
+        default y
+
+if NETDEV_1000
 
 config ACENIC
         tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2299,7 +2303,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
         tristate "MV-643XX Ethernet support"
-        depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
+        depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
         select MII
         help
           This driver supports the gigabit Ethernet on the Marvell MV643XX
@@ -2326,14 +2330,18 @@ config ATL1
           To compile this driver as a module, choose M here.  The module
           will be called atl1.
 
-endmenu
+endif # NETDEV_1000
 
 #
 #       10 Gigabit Ethernet
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NETDEV_10000
+        bool "Ethernet (10000 Mbit)"
         depends on !UML
+        default y
+
+if NETDEV_10000
 
 config CHELSIO_T1
         tristate "Chelsio 10Gb Ethernet support"
@@ -2488,16 +2496,34 @@ config NETXEN_NIC
 config PASEMI_MAC
         tristate "PA Semi 1/10Gbit MAC"
         depends on PPC64 && PCI
+        select PHYLIB
         help
           This driver supports the on-chip 1/10Gbit Ethernet controller on
           PA Semi's PWRficient line of chips.
 
-endmenu
+config MLX4_CORE
+        tristate
+        depends on PCI
+        default n
+
+config MLX4_DEBUG
+        bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+        depends on MLX4_CORE
+        default y
+        ---help---
+          This option causes debugging code to be compiled into the
+          mlx4_core driver.  The output can be turned on via the
+          debug_level module parameter (which can also be set after
+          the driver is loaded through sysfs).
+
+endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
+source "drivers/net/usb/Kconfig"
+
 source "drivers/net/pcmcia/Kconfig"
 
 source "drivers/net/wan/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 59c0459a037c..a77affa4f6e6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -197,6 +197,7 @@ obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
+obj-$(CONFIG_MLX4_CORE) += mlx4/
 
 obj-$(CONFIG_MACB) += macb.o
 
@@ -206,6 +207,14 @@ obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
 obj-$(CONFIG_NET_PCMCIA) += pcmcia/
+
+obj-$(CONFIG_USB_CATC)          += usb/
+obj-$(CONFIG_USB_KAWETH)        += usb/
+obj-$(CONFIG_USB_PEGASUS)       += usb/
+obj-$(CONFIG_USB_RTL8150)       += usb/
+obj-$(CONFIG_USB_USBNET)        += usb/
+obj-$(CONFIG_USB_ZD1201)        += usb/
+
 obj-y += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 152fa7a042b8..ef2cc80256a3 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -225,6 +225,16 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id)
                 if (!(phy & ((1 << 2) | 1)))
                         goto done;
         }
+        else if (lp->phy_type == MII_T78Q21x3_ID) {                     /* ack interrupt in Teridian PHY */
+                read_phy(lp->phy_address, MII_T78Q21INT_REG, &phy);
+                if (!(phy & ((1 << 2) | 1)))
+                        goto done;
+        }
+        else if (lp->phy_type == MII_DP83848_ID) {
+                read_phy(lp->phy_address, MII_DPPHYSTS_REG, &phy);      /* ack interrupt in DP83848 PHY */
+                if (!(phy & (1 << 7)))
+                        goto done;
+        }
 
         update_linkspeed(dev, 0);
 
@@ -280,6 +290,19 @@ static void enable_phyirq(struct net_device *dev)
                 dsintr = (1 << 10) | ( 1 << 8);
                 write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
         }
+        else if (lp->phy_type == MII_T78Q21x3_ID) {     /* for Teridian PHY */
+                read_phy(lp->phy_address, MII_T78Q21INT_REG, &dsintr);
+                dsintr = dsintr | 0x500;                /* set bits 8, 10 */
+                write_phy(lp->phy_address, MII_T78Q21INT_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_DP83848_ID) {      /* National Semiconductor DP83848 PHY */
+                read_phy(lp->phy_address, MII_DPMISR_REG, &dsintr);
+                dsintr = dsintr | 0x3c;                 /* set bits 2..5 */
+                write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
+                read_phy(lp->phy_address, MII_DPMICR_REG, &dsintr);
+                dsintr = dsintr | 0x3;                  /* set bits 0,1 */
+                write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
+        }
 
         disable_mdi();
         spin_unlock_irq(&lp->lock);
@@ -323,6 +346,19 @@ static void disable_phyirq(struct net_device *dev)
                 dsintr = ~((1 << 10) | (1 << 8));
                 write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
         }
+        else if (lp->phy_type == MII_T78Q21x3_ID) {     /* for Teridian PHY */
+                read_phy(lp->phy_address, MII_T78Q21INT_REG, &dsintr);
+                dsintr = dsintr & ~0x500;                       /* clear bits 8, 10 */
+                write_phy(lp->phy_address, MII_T78Q21INT_REG, dsintr);
+        }
+        else if (lp->phy_type == MII_DP83848_ID) {      /* National Semiconductor DP83848 PHY */
+                read_phy(lp->phy_address, MII_DPMICR_REG, &dsintr);
+                dsintr = dsintr & ~0x3;                         /* clear bits 0, 1 */
+                write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
+                read_phy(lp->phy_address, MII_DPMISR_REG, &dsintr);
+                dsintr = dsintr & ~0x3c;                        /* clear bits 2..5 */
+                write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
+        }
 
         disable_mdi();
         spin_unlock_irq(&lp->lock);
@@ -535,8 +571,8 @@ static void at91ether_sethashtable(struct net_device *dev)
                 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
         }
 
-        at91_emac_write(AT91_EMAC_HSH, mc_filter[0]);
-        at91_emac_write(AT91_EMAC_HSL, mc_filter[1]);
+        at91_emac_write(AT91_EMAC_HSL, mc_filter[0]);
+        at91_emac_write(AT91_EMAC_HSH, mc_filter[1]);
 }
 
 /*
@@ -1062,10 +1098,16 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                 printk(KERN_INFO "%s: Broadcom BCM5221 PHY\n", dev->name);
         else if (phy_type == MII_DP83847_ID)
                 printk(KERN_INFO "%s: National Semiconductor DP83847 PHY\n", dev->name);
+        else if (phy_type == MII_DP83848_ID)
+                printk(KERN_INFO "%s: National Semiconductor DP83848 PHY\n", dev->name);
         else if (phy_type == MII_AC101L_ID)
                 printk(KERN_INFO "%s: Altima AC101L PHY\n", dev->name);
         else if (phy_type == MII_KS8721_ID)
                 printk(KERN_INFO "%s: Micrel KS8721 PHY\n", dev->name);
+        else if (phy_type == MII_T78Q21x3_ID)
+                printk(KERN_INFO "%s: Teridian 78Q21x3 PHY\n", dev->name);
+        else if (phy_type == MII_LAN83C185_ID)
+                printk(KERN_INFO "%s: SMSC LAN83C185 PHY\n", dev->name);
 
         return 0;
 }
@@ -1103,8 +1145,11 @@ static int __init at91ether_probe(struct platform_device *pdev)
                         case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
                         case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
                         case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
+                        case MII_DP83848_ID:            /* National Semiconductor DP83848:  */
                         case MII_AC101L_ID:             /* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
                         case MII_KS8721_ID:             /* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
+                        case MII_T78Q21x3_ID:           /* Teridian 78Q21x3: PHY_ID1 = 0x0E, PHY_ID2 = 7237 */
+                        case MII_LAN83C185_ID:          /* SMSC LAN83C185: PHY_ID1 = 0x0007, PHY_ID2 = 0xC0A1 */
                                 detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
                                 break;
                 }
diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h
index b6b665de2ea0..a38fd2d053a6 100644
--- a/drivers/net/arm/at91_ether.h
+++ b/drivers/net/arm/at91_ether.h
@@ -17,39 +17,46 @@
 
 
 /* Davicom 9161 PHY */
-#define MII_DM9161_ID   0x0181b880
-#define MII_DM9161A_ID  0x0181b8a0
-
-/* Davicom specific registers */
-#define MII_DSCR_REG    16
-#define MII_DSCSR_REG   17
-#define MII_DSINTR_REG  21
+#define MII_DM9161_ID           0x0181b880
+#define MII_DM9161A_ID          0x0181b8a0
+#define MII_DSCR_REG            16
+#define MII_DSCSR_REG           17
+#define MII_DSINTR_REG          21
 
 /* Intel LXT971A PHY */
-#define MII_LXT971A_ID  0x001378E0
-
-/* Intel specific registers */
-#define MII_ISINTE_REG  18
-#define MII_ISINTS_REG  19
-#define MII_LEDCTRL_REG 20
+#define MII_LXT971A_ID          0x001378E0
+#define MII_ISINTE_REG          18
+#define MII_ISINTS_REG          19
+#define MII_LEDCTRL_REG         20
 
 /* Realtek RTL8201 PHY */
-#define MII_RTL8201_ID  0x00008200
+#define MII_RTL8201_ID          0x00008200
 
 /* Broadcom BCM5221 PHY */
-#define MII_BCM5221_ID  0x004061e0
-
-/* Broadcom specific registers */
-#define MII_BCMINTR_REG 26
+#define MII_BCM5221_ID          0x004061e0
+#define MII_BCMINTR_REG         26
 
 /* National Semiconductor DP83847 */
-#define MII_DP83847_ID  0x20005c30
+#define MII_DP83847_ID          0x20005c30
+
+/* National Semiconductor DP83848 */
+#define MII_DP83848_ID          0x20005c90
+#define MII_DPPHYSTS_REG        16
+#define MII_DPMICR_REG          17
+#define MII_DPMISR_REG          18
 
 /* Altima AC101L PHY */
-#define MII_AC101L_ID   0x00225520
+#define MII_AC101L_ID           0x00225520
 
 /* Micrel KS8721 PHY */
-#define MII_KS8721_ID   0x00221610
+#define MII_KS8721_ID           0x00221610
+
+/* Teridian 78Q2123/78Q2133 */
+#define MII_T78Q21x3_ID         0x000e7230
+#define MII_T78Q21INT_REG       17
+
+/* SMSC LAN83C185 */
+#define MII_LAN83C185_ID        0x0007C0A0
 
 /* ........................................................................ */
 
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index f075cebe84ad..f21148e7b579 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -1014,8 +1014,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         SET_NETDEV_DEV(dev, &ec->dev);
 
         dev->irq = ec->irq;
-        priv(dev)->base = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST),
-                                  ecard_resource_len(ec, ECARD_RES_IOCFAST));
+        priv(dev)->base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!priv(dev)->base) {
                 ret = -ENOMEM;
                 goto free;
@@ -1056,8 +1055,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         return 0;
 
  free:
-        if (priv(dev)->base)
-                iounmap(priv(dev)->base);
         free_netdev(dev);
  release:
         ecard_release_resources(ec);
@@ -1072,7 +1069,6 @@ static void __devexit ether1_remove(struct expansion_card *ec)
         ecard_set_drvdata(ec, NULL);    
 
         unregister_netdev(dev);
-        iounmap(priv(dev)->base);
         free_netdev(dev);
         ecard_release_resources(ec);
 }
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 32da2eb9bcee..da713500654d 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -793,8 +793,7 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &ec->dev);
 
-        priv(dev)->base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC),
-                                  ecard_resource_len(ec, ECARD_RES_MEMC));
+        priv(dev)->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!priv(dev)->base) {
                 ret = -ENOMEM;
                 goto free;
@@ -869,8 +868,6 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         return 0;
 
  free:
-        if (priv(dev)->base)
-                iounmap(priv(dev)->base);
         free_netdev(dev);
  release:
         ecard_release_resources(ec);
@@ -885,7 +882,6 @@ static void __devexit ether3_remove(struct expansion_card *ec)
         ecard_set_drvdata(ec, NULL);
 
         unregister_netdev(dev);
-        iounmap(priv(dev)->base);
         free_netdev(dev);
         ecard_release_resources(ec);
 }
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 61f574aa3a99..769ba69451f4 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -686,7 +686,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         eh->supported           = data->supported;
         eh->ctrl                = 0;
         eh->id                  = ec->cid.product;
-        eh->memc                = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC), PAGE_SIZE);
+        eh->memc                = ecardm_iomap(ec, ECARD_RES_MEMC, 0, PAGE_SIZE);
         if (!eh->memc) {
                 ret = -ENOMEM;
                 goto free;
@@ -694,7 +694,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 
         eh->ctrl_port = eh->memc;
         if (data->ctrl_ioc) {
-                eh->ioc_fast = ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST), PAGE_SIZE);
+                eh->ioc_fast = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, PAGE_SIZE);
                 if (!eh->ioc_fast) {
                         ret = -ENOMEM;
                         goto free;
@@ -710,8 +710,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
          * IRQ and control port handling - only for non-NIC slot cards.
          */
         if (ec->slot_no != 8) {
-                ec->ops         = &etherh_ops;
-                ec->irq_data    = eh;
+                ecard_setirq(ec, &etherh_ops, eh);
         } else {
                 /*
                  * If we're in the NIC slot, make sure the IRQ is enabled
@@ -759,10 +758,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         return 0;
 
  free:
-        if (eh->ioc_fast)
-                iounmap(eh->ioc_fast);
-        if (eh->memc)
-                iounmap(eh->memc);
         free_netdev(dev);
  release:
         ecard_release_resources(ec);
@@ -773,16 +768,10 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 static void __devexit etherh_remove(struct expansion_card *ec)
 {
         struct net_device *dev = ecard_get_drvdata(ec);
-        struct etherh_priv *eh = etherh_priv(dev);
 
         ecard_set_drvdata(ec, NULL);
 
         unregister_netdev(dev);
-        ec->ops = NULL;
-
-        if (eh->ioc_fast)
-                iounmap(eh->ioc_fast);
-        iounmap(eh->memc);
 
         free_netdev(dev);
 
diff --git a/drivers/net/atl1/atl1_ethtool.c b/drivers/net/atl1/atl1_ethtool.c
index c11c27798e5c..1f616c5c1473 100644
--- a/drivers/net/atl1/atl1_ethtool.c
+++ b/drivers/net/atl1/atl1_ethtool.c
@@ -156,8 +156,7 @@ static int atl1_set_settings(struct net_device *netdev,
         u16 old_media_type = hw->media_type;
 
         if (netif_running(adapter->netdev)) {
-                printk(KERN_DEBUG "%s: ethtool shutting down adapter\n",
-                        atl1_driver_name);
+                dev_dbg(&adapter->pdev->dev, "ethtool shutting down adapter\n");
                 atl1_down(adapter);
         }
 
@@ -166,9 +165,8 @@ static int atl1_set_settings(struct net_device *netdev,
         else {
                 if (ecmd->speed == SPEED_1000) {
                         if (ecmd->duplex != DUPLEX_FULL) {
-                                printk(KERN_WARNING
-                                       "%s: can't force to 1000M half duplex\n",
-                                        atl1_driver_name);
+                                dev_warn(&adapter->pdev->dev,
+                                        "can't force to 1000M half duplex\n");
                                 ret_val = -EINVAL;
                                 goto exit_sset;
                         }
@@ -206,9 +204,8 @@ static int atl1_set_settings(struct net_device *netdev,
         }
         if (atl1_phy_setup_autoneg_adv(hw)) {
                 ret_val = -EINVAL;
-                printk(KERN_WARNING
-                        "%s: invalid ethtool speed/duplex setting\n",
-                        atl1_driver_name);
+                dev_warn(&adapter->pdev->dev,
+                        "invalid ethtool speed/duplex setting\n");
                 goto exit_sset;
         }
         if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
@@ -239,12 +236,10 @@ exit_sset:
                 hw->media_type = old_media_type;
 
         if (netif_running(adapter->netdev)) {
-                printk(KERN_DEBUG "%s: ethtool starting adapter\n",
-                        atl1_driver_name);
+                dev_dbg(&adapter->pdev->dev, "ethtool starting adapter\n");
                 atl1_up(adapter);
         } else if (!ret_val) {
-                printk(KERN_DEBUG "%s: ethtool resetting adapter\n",
-                        atl1_driver_name);
+                dev_dbg(&adapter->pdev->dev, "ethtool resetting adapter\n");
                 atl1_reset(adapter);
         }
         return ret_val;
diff --git a/drivers/net/atl1/atl1_hw.c b/drivers/net/atl1/atl1_hw.c
index 69482e0d849b..ef886bdeac13 100644
--- a/drivers/net/atl1/atl1_hw.c
+++ b/drivers/net/atl1/atl1_hw.c
@@ -2,20 +2,20 @@
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
  * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
  * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
- * 
+ *
  * Derived from Intel e1000 driver
  * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * 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.
@@ -38,12 +38,13 @@
  */
 s32 atl1_reset_hw(struct atl1_hw *hw)
 {
+        struct pci_dev *pdev = hw->back->pdev;
         u32 icr;
         int i;
 
-        /* 
+        /*
          * Clear Interrupt mask to stop board from generating
-         * interrupts & Clear any pending interrupt events 
+         * interrupts & Clear any pending interrupt events
          */
         /*
          * iowrite32(0, hw->hw_addr + REG_IMR);
@@ -74,7 +75,7 @@ s32 atl1_reset_hw(struct atl1_hw *hw)
         }
 
         if (icr) {
-                printk (KERN_DEBUG "icr = %x\n", icr); 
+                dev_dbg(&pdev->dev, "ICR = 0x%x\n", icr);
                 return icr;
         }
 
@@ -136,8 +137,8 @@ s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
         int i;
 
         val = ((u32) (reg_addr & MDIO_REG_ADDR_MASK)) << MDIO_REG_ADDR_SHIFT |
-                MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW | MDIO_CLK_25_4 <<
-                MDIO_CLK_SEL_SHIFT;
+                MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW | MDIO_CLK_25_4 <<
+                MDIO_CLK_SEL_SHIFT;
         iowrite32(val, hw->hw_addr + REG_MDIO_CTRL);
         ioread32(hw->hw_addr + REG_MDIO_CTRL);
 
@@ -204,7 +205,7 @@ static bool atl1_spi_read(struct atl1_hw *hw, u32 addr, u32 *buf)
 
 /*
  * get_permanent_address
- * return 0 if get valid mac address, 
+ * return 0 if get valid mac address,
  */
 static int atl1_get_permanent_address(struct atl1_hw *hw)
 {
@@ -301,7 +302,7 @@ static int atl1_get_permanent_address(struct atl1_hw *hw)
 }
 
 /*
- * Reads the adapter's MAC address from the EEPROM 
+ * Reads the adapter's MAC address from the EEPROM
  * hw - Struct containing variables accessed by shared code
  */
 s32 atl1_read_mac_addr(struct atl1_hw *hw)
@@ -437,6 +438,7 @@ s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
  */
 static s32 atl1_phy_reset(struct atl1_hw *hw)
 {
+        struct pci_dev *pdev = hw->back->pdev;
         s32 ret_val;
         u16 phy_data;
 
@@ -468,8 +470,7 @@ static s32 atl1_phy_reset(struct atl1_hw *hw)
                 u32 val;
                 int i;
                 /* pcie serdes link may be down! */
-                printk(KERN_DEBUG "%s: autoneg caused pcie phy link down\n", 
-                        atl1_driver_name);
+                dev_dbg(&pdev->dev, "pcie phy link down\n");
 
                 for (i = 0; i < 25; i++) {
                         msleep(1);
@@ -479,9 +480,7 @@ static s32 atl1_phy_reset(struct atl1_hw *hw)
                 }
 
                 if ((val & (MDIO_START | MDIO_BUSY)) != 0) {
-                        printk(KERN_WARNING 
-                                "%s: pcie link down at least for 25ms\n", 
-                                atl1_driver_name);
+                        dev_warn(&pdev->dev, "pcie link down at least 25ms\n");
                         return ret_val;
                 }
         }
@@ -571,6 +570,7 @@ s32 atl1_phy_setup_autoneg_adv(struct atl1_hw *hw)
  */
 static s32 atl1_setup_link(struct atl1_hw *hw)
 {
+        struct pci_dev *pdev = hw->back->pdev;
         s32 ret_val;
 
         /*
@@ -581,15 +581,13 @@ static s32 atl1_setup_link(struct atl1_hw *hw)
          */
         ret_val = atl1_phy_setup_autoneg_adv(hw);
         if (ret_val) {
-                printk(KERN_DEBUG "%s: error setting up autonegotiation\n", 
-                        atl1_driver_name);
+                dev_dbg(&pdev->dev, "error setting up autonegotiation\n");
                 return ret_val;
         }
         /* SW.Reset , En-Auto-Neg if needed */
         ret_val = atl1_phy_reset(hw);
         if (ret_val) {
-                printk(KERN_DEBUG "%s: error resetting the phy\n", 
-                        atl1_driver_name);
+                dev_dbg(&pdev->dev, "error resetting phy\n");
                 return ret_val;
         }
         hw->phy_configured = true;
@@ -631,7 +629,7 @@ static void atl1_init_flash_opcode(struct atl1_hw *hw)
  * Performs basic configuration of the adapter.
  * hw - Struct containing variables accessed by shared code
  * Assumes that the controller has previously been reset and is in a
- * post-reset uninitialized state. Initializes multicast table, 
+ * post-reset uninitialized state. Initializes multicast table,
  * and  Calls routines to setup link
  * Leaves the transmit and receive units disabled and uninitialized.
  */
@@ -669,6 +667,7 @@ s32 atl1_init_hw(struct atl1_hw *hw)
  */
 s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex)
 {
+        struct pci_dev *pdev = hw->back->pdev;
         s32 ret_val;
         u16 phy_data;
 
@@ -691,8 +690,7 @@ s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex)
                 *speed = SPEED_10;
                 break;
         default:
-                printk(KERN_DEBUG "%s: error getting speed\n", 
-                        atl1_driver_name);
+                dev_dbg(&pdev->dev, "error getting speed\n");
                 return ATL1_ERR_PHY_SPEED;
                 break;
         }
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 4b1d4d153ecf..78cf00ff3d38 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -188,8 +188,7 @@ s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
         size = sizeof(struct atl1_buffer) * (tpd_ring->count + rfd_ring->count);
         tpd_ring->buffer_info = kzalloc(size, GFP_KERNEL);
         if (unlikely(!tpd_ring->buffer_info)) {
-                printk(KERN_WARNING "%s: kzalloc failed , size = D%d\n",
-                        atl1_driver_name, size);
+                dev_err(&pdev->dev, "kzalloc failed , size = D%d\n", size);
                 goto err_nomem;
         }
         rfd_ring->buffer_info =
@@ -207,9 +206,7 @@ s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
         ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,
                                                 &ring_header->dma);
         if (unlikely(!ring_header->desc)) {
-                printk(KERN_WARNING
-                        "%s: pci_alloc_consistent failed, size = D%d\n",
-                        atl1_driver_name, size);
+                dev_err(&pdev->dev, "pci_alloc_consistent failed\n");
                 goto err_nomem;
         }
 
@@ -373,8 +370,7 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
                 if (rrd->err_flg & (ERR_FLAG_CRC | ERR_FLAG_TRUNC |
                                         ERR_FLAG_CODE | ERR_FLAG_OV)) {
                         adapter->hw_csum_err++;
-                        printk(KERN_DEBUG "%s: rx checksum error\n",
-                                atl1_driver_name);
+                        dev_dbg(&adapter->pdev->dev, "rx checksum error\n");
                         return;
                 }
         }
@@ -393,8 +389,9 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
         }
 
         /* IPv4, but hardware thinks its checksum is wrong */
-        printk(KERN_DEBUG "%s: hw csum wrong pkt_flag:%x, err_flag:%x\n",
-                atl1_driver_name, rrd->pkt_flg, rrd->err_flg);
+        dev_dbg(&adapter->pdev->dev,
+                "hw csum wrong, pkt_flag:%x, err_flag:%x\n",
+                rrd->pkt_flg, rrd->err_flg);
         skb->ip_summed = CHECKSUM_COMPLETE;
         skb->csum = htons(rrd->xsz.xsum_sz.rx_chksum);
         adapter->hw_csum_err++;
@@ -507,14 +504,13 @@ chk_rrd:
                         /* rrd seems to be bad */
                         if (unlikely(i-- > 0)) {
                                 /* rrd may not be DMAed completely */
-                                printk(KERN_DEBUG
-                                        "%s: RRD may not be DMAed completely\n",
-                                        atl1_driver_name);
+                                dev_dbg(&adapter->pdev->dev,
+                                        "incomplete RRD DMA transfer\n");
                                 udelay(1);
                                 goto chk_rrd;
                         }
                         /* bad rrd */
-                        printk(KERN_DEBUG "%s: bad RRD\n", atl1_driver_name);
+                        dev_dbg(&adapter->pdev->dev, "bad RRD\n");
                         /* see if update RFD index */
                         if (rrd->num_buf > 1) {
                                 u16 num_buf;
@@ -685,8 +681,8 @@ static void atl1_check_for_link(struct atl1_adapter *adapter)
         /* notify upper layer link down ASAP */
         if (!(phy_data & BMSR_LSTATUS)) {       /* Link Down */
                 if (netif_carrier_ok(netdev)) { /* old link state: Up */
-                        printk(KERN_INFO "%s: %s link is down\n",
-                               atl1_driver_name, netdev->name);
+                        dev_info(&adapter->pdev->dev, "%s link is down\n",
+                                netdev->name);
                         adapter->link_speed = SPEED_0;
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
@@ -731,8 +727,8 @@ static irqreturn_t atl1_intr(int irq, void *data)
 
                 /* check if PCIE PHY Link down */
                 if (status & ISR_PHY_LINKDOWN) {
-                        printk(KERN_DEBUG "%s: pcie phy link down %x\n",
-                                atl1_driver_name, status);
+                        dev_dbg(&adapter->pdev->dev, "pcie phy link down %x\n",
+                                status);
                         if (netif_running(adapter->netdev)) {   /* reset MAC */
                                 iowrite32(0, adapter->hw.hw_addr + REG_IMR);
                                 schedule_work(&adapter->pcie_dma_to_rst_task);
@@ -742,9 +738,9 @@ static irqreturn_t atl1_intr(int irq, void *data)
 
                 /* check if DMA read/write error ? */
                 if (status & (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {
-                        printk(KERN_DEBUG
-                                "%s: pcie DMA r/w error (status = 0x%x)\n",
-                                atl1_driver_name, status);
+                        dev_dbg(&adapter->pdev->dev,
+                                "pcie DMA r/w error (status = 0x%x)\n",
+                                status);
                         iowrite32(0, adapter->hw.hw_addr + REG_IMR);
                         schedule_work(&adapter->pcie_dma_to_rst_task);
                         return IRQ_HANDLED;
@@ -762,14 +758,13 @@ static irqreturn_t atl1_intr(int irq, void *data)
 
                 /* rx exception */
                 if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN |
+                        ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
+                        ISR_HOST_RRD_OV | ISR_CMB_RX))) {
+                        if (status & (ISR_RXF_OV | ISR_RFD_UNRUN |
                                 ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
-                                ISR_HOST_RRD_OV | ISR_CMB_RX))) {
-                        if (status &
-                            (ISR_RXF_OV | ISR_RFD_UNRUN | ISR_RRD_OV |
-                             ISR_HOST_RFD_UNRUN | ISR_HOST_RRD_OV))
-                                printk(KERN_INFO
-                                        "%s: rx exception: status = 0x%x\n",
-                                        atl1_driver_name, status);
+                                ISR_HOST_RRD_OV))
+                                dev_dbg(&adapter->pdev->dev,
+                                        "rx exception, ISR = 0x%x\n", status);
                         atl1_intr_rx(adapter);
                 }
 
@@ -874,8 +869,7 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
         atl1_read_phy_reg(hw, MII_BMSR, &phy_data);
         if (!(phy_data & BMSR_LSTATUS)) {       /* link down */
                 if (netif_carrier_ok(netdev)) { /* old link state: Up */
-                        printk(KERN_INFO "%s: link is down\n",
-                                atl1_driver_name);
+                        dev_info(&adapter->pdev->dev, "link is down\n");
                         adapter->link_speed = SPEED_0;
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
@@ -918,11 +912,11 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
                         adapter->link_speed = speed;
                         adapter->link_duplex = duplex;
                         atl1_setup_mac_ctrl(adapter);
-                        printk(KERN_INFO "%s: %s link is up %d Mbps %s\n",
-                               atl1_driver_name, netdev->name,
-                               adapter->link_speed,
-                               adapter->link_duplex ==
-                               FULL_DUPLEX ? "full duplex" : "half duplex");
+                        dev_info(&adapter->pdev->dev,
+                                "%s link is up %d Mbps %s\n",
+                                netdev->name, adapter->link_speed,
+                                adapter->link_duplex == FULL_DUPLEX ?
+                                "full duplex" : "half duplex");
                 }
                 if (!netif_carrier_ok(netdev)) {        /* Link down -> Up */
                         netif_carrier_on(netdev);
@@ -1330,8 +1324,8 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
                 cso = skb_transport_offset(skb);
                 css = cso + skb->csum_offset;
                 if (unlikely(cso & 0x1)) {
-                        printk(KERN_DEBUG "%s: payload offset != even number\n",
-                                atl1_driver_name);
+                        dev_dbg(&adapter->pdev->dev,
+                                "payload offset not an even number\n");
                         return -1;
                 }
                 csum->csumpl |= (cso & CSUM_PARAM_PLOADOFFSET_MASK) <<
@@ -1579,7 +1573,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         if (!spin_trylock(&adapter->lock)) {
                 /* Can't get lock - tell upper layer to requeue */
                 local_irq_restore(flags);
-                printk(KERN_DEBUG "%s: TX locked\n", atl1_driver_name);
+                dev_dbg(&adapter->pdev->dev, "tx locked\n");
                 return NETDEV_TX_LOCKED;
         }
 
@@ -1587,7 +1581,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 /* not enough descriptors */
                 netif_stop_queue(netdev);
                 spin_unlock_irqrestore(&adapter->lock, flags);
-                printk(KERN_DEBUG "%s: TX busy\n", atl1_driver_name);
+                dev_dbg(&adapter->pdev->dev, "tx busy\n");
                 return NETDEV_TX_BUSY;
         }
 
@@ -1841,8 +1835,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu)
 
         if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
             (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-                printk(KERN_WARNING "%s: invalid MTU setting\n",
-                        atl1_driver_name);
+                dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");
                 return -EINVAL;
         }
 
@@ -2045,6 +2038,15 @@ static int atl1_close(struct net_device *netdev)
         return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void atl1_poll_controller(struct net_device *netdev)
+{
+        disable_irq(netdev->irq);
+        atl1_intr(netdev->irq, netdev);
+        enable_irq(netdev->irq);
+}
+#endif
+
 /*
  * If TPD Buffer size equal to 0, PCIE DMAR_TO_INT
  * will assert. We do soft reset <0x1400=1> according
@@ -2136,9 +2138,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         if (err) {
                 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (err) {
-                        printk(KERN_DEBUG
-                                "%s: no usable DMA configuration, aborting\n",
-                                atl1_driver_name);
+                        dev_err(&pdev->dev, "no usable DMA configuration\n");
                         goto err_dma;
                 }
                 pci_using_64 = false;
@@ -2175,7 +2175,9 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
                 goto err_pci_iomap;
         }
         /* get device revision number */
-        adapter->hw.dev_rev = ioread16(adapter->hw.hw_addr + (REG_MASTER_CTRL + 2));
+        adapter->hw.dev_rev = ioread16(adapter->hw.hw_addr +
+                                        (REG_MASTER_CTRL + 2));
+        dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
 
         /* set default ring resource counts */
         adapter->rfd_ring.count = adapter->rrd_ring.count = ATL1_DEFAULT_RFD;
@@ -2197,6 +2199,9 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         netdev->do_ioctl = &atl1_ioctl;
         netdev->tx_timeout = &atl1_tx_timeout;
         netdev->watchdog_timeo = 5 * HZ;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        netdev->poll_controller = atl1_poll_controller;
+#endif
         netdev->vlan_rx_register = atl1_vlan_rx_register;
         netdev->vlan_rx_add_vid = atl1_vlan_rx_add_vid;
         netdev->vlan_rx_kill_vid = atl1_vlan_rx_kill_vid;
@@ -2466,8 +2471,6 @@ static void __exit atl1_exit_module(void)
  */
 static int __init atl1_init_module(void)
 {
-        printk(KERN_INFO "%s - version %s\n", atl1_driver_string, DRIVER_VERSION);
-        printk(KERN_INFO "%s\n", atl1_copyright);
         return pci_register_driver(&atl1_driver);
 }
 
diff --git a/drivers/net/atl1/atl1_param.c b/drivers/net/atl1/atl1_param.c
index bcd0bd891722..4246bb9bd50e 100644
--- a/drivers/net/atl1/atl1_param.c
+++ b/drivers/net/atl1/atl1_param.c
@@ -23,6 +23,7 @@
 
 #include <linux/types.h>
 #include <linux/moduleparam.h>
+#include <linux/pci.h>
 #include "atl1.h"
 
 /*
@@ -93,7 +94,7 @@ struct atl1_option {
         } arg;
 };
 
-static int __devinit atl1_validate_option(int *value, struct atl1_option *opt)
+static int __devinit atl1_validate_option(int *value, struct atl1_option *opt, struct pci_dev *pdev)
 {
         if (*value == OPTION_UNSET) {
                 *value = opt->def;
@@ -104,19 +105,17 @@ static int __devinit atl1_validate_option(int *value, struct atl1_option *opt)
         case enable_option:
                 switch (*value) {
                 case OPTION_ENABLED:
-                        printk(KERN_INFO "%s: %s Enabled\n", atl1_driver_name,
-                                opt->name);
+                        dev_info(&pdev->dev, "%s enabled\n", opt->name);
                         return 0;
                 case OPTION_DISABLED:
-                        printk(KERN_INFO "%s: %s Disabled\n", atl1_driver_name,
-                                opt->name);
+                        dev_info(&pdev->dev, "%s disabled\n", opt->name);
                         return 0;
                 }
                 break;
         case range_option:
                 if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                        printk(KERN_INFO "%s: %s set to %i\n",
-                                atl1_driver_name, opt->name, *value);
+                        dev_info(&pdev->dev, "%s set to %i\n", opt->name,
+                                *value);
                         return 0;
                 }
                 break;
@@ -128,8 +127,8 @@ static int __devinit atl1_validate_option(int *value, struct atl1_option *opt)
                                 ent = &opt->arg.l.p[i];
                                 if (*value == ent->i) {
                                         if (ent->str[0] != '\0')
-                                                printk(KERN_INFO "%s: %s\n",
-                                                       atl1_driver_name, ent->str);
+                                                dev_info(&pdev->dev, "%s\n",
+                                                        ent->str);
                                         return 0;
                                 }
                         }
@@ -140,8 +139,8 @@ static int __devinit atl1_validate_option(int *value, struct atl1_option *opt)
                 break;
         }
 
-        printk(KERN_INFO "%s: invalid %s specified (%i) %s\n",
-               atl1_driver_name, opt->name, *value, opt->err);
+        dev_info(&pdev->dev, "invalid %s specified (%i) %s\n",
+                opt->name, *value, opt->err);
         *value = opt->def;
         return -1;
 }
@@ -157,12 +156,11 @@ static int __devinit atl1_validate_option(int *value, struct atl1_option *opt)
  */
 void __devinit atl1_check_options(struct atl1_adapter *adapter)
 {
+        struct pci_dev *pdev = adapter->pdev;
         int bd = adapter->bd_number;
         if (bd >= ATL1_MAX_NIC) {
-                printk(KERN_NOTICE "%s: warning: no configuration for board #%i\n",
-                        atl1_driver_name, bd);
-                printk(KERN_NOTICE "%s: using defaults for all values\n",
-                        atl1_driver_name);
+                dev_notice(&pdev->dev, "no configuration for board#%i\n", bd);
+                dev_notice(&pdev->dev, "using defaults for all values\n");
         }
         {                       /* Interrupt Moderate Timer */
                 struct atl1_option opt = {
@@ -177,7 +175,7 @@ void __devinit atl1_check_options(struct atl1_adapter *adapter)
                 int val;
                 if (num_int_mod_timer > bd) {
                         val = int_mod_timer[bd];
-                        atl1_validate_option(&val, &opt);
+                        atl1_validate_option(&val, &opt, pdev);
                         adapter->imt = (u16) val;
                 } else
                         adapter->imt = (u16) (opt.def);
@@ -197,7 +195,7 @@ void __devinit atl1_check_options(struct atl1_adapter *adapter)
                 int val;
                 if (num_flash_vendor > bd) {
                         val = flash_vendor[bd];
-                        atl1_validate_option(&val, &opt);
+                        atl1_validate_option(&val, &opt, pdev);
                         adapter->hw.flash_vendor = (u8) val;
                 } else
                         adapter->hw.flash_vendor = (u8) (opt.def);
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 18aba838c1ff..82d78ff8399b 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -31,10 +31,8 @@
 
 */
 
-static const char versionA[] =
+static const char version[] =
 "atp.c:v1.09=ac 2002/10/01 Donald Becker <becker@scyld.com>\n";
-static const char versionB[] =
-"  http://www.scyld.com/network/atp.html\n";
 
 /* The user-configurable values.
    These may be modified when a driver module is loaded.*/
@@ -324,7 +322,7 @@ static int __init atp_probe1(long ioaddr)
 
 #ifndef MODULE
         if (net_debug)
-                printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
+                printk(KERN_INFO "%s", version);
 #endif
 
         printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM "
@@ -926,7 +924,7 @@ static void set_rx_mode_8012(struct net_device *dev)
 
 static int __init atp_init_module(void) {
         if (debug)                                      /* Emit version even if no cards detected. */
-                printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
+                printk(KERN_INFO "%s", version);
         return atp_init();
 }
 
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 4612725965df..9b8d7d9dbe86 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1260,9 +1260,10 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
                 printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
                 return -ENODEV;
         }
-        prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
+        prop_addr = of_get_property(macio_get_of_node(mdev),
+                        "mac-address", NULL);
         if (prop_addr == NULL) {
-                prop_addr = get_property(macio_get_of_node(mdev),
+                prop_addr = of_get_property(macio_get_of_node(mdev),
                                 "local-mac-address", NULL);
                 if (prop_addr == NULL) {
                         printk(KERN_ERR "BMAC: Can't get mac-address\n");
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 724bce51f936..223517dcbcfd 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3461,7 +3461,7 @@ void bond_unregister_arp(struct bonding *bond)
 /*---------------------------- Hashing Policies -----------------------------*/
 
 /*
- * Hash for the the output device based upon layer 3 and layer 4 data. If
+ * Hash for the output device based upon layer 3 and layer 4 data. If
  * the packet is a frag or not TCP or UDP, just use layer 3 data.  If it is
  * altogether not IP, mimic bond_xmit_hash_policy_l2()
  */
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 95d854e2295c..b2577f40124e 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -932,8 +932,6 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Kick the lance: transmit now */
         writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD);
 
-        spin_unlock_irq(&lp->lock);
-
         dev->trans_start = jiffies;
         dev_kfree_skb(skb);
 
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 8cc1174e7f64..264fa0e2e075 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -77,9 +77,6 @@
 
 #define DM9000_PHY              0x40    /* PHY address 0x01 */
 
-#define TRUE                    1
-#define FALSE                   0
-
 #define CARDNAME "dm9000"
 #define PFX CARDNAME ": "
 
@@ -601,7 +598,7 @@ dm9000_probe(struct platform_device *pdev)
         printk("%s: not found (%d).\n", CARDNAME, ret);
 
         dm9000_release_board(pdev, db);
-        kfree(ndev);
+        free_netdev(ndev);
 
         return ret;
 }
@@ -896,7 +893,7 @@ dm9000_rx(struct net_device *dev)
         struct dm9000_rxhdr rxhdr;
         struct sk_buff *skb;
         u8 rxbyte, *rdptr;
-        int GoodPacket;
+        bool GoodPacket;
         int RxLen;
 
         /* Check packet ready or not */
@@ -918,7 +915,7 @@ dm9000_rx(struct net_device *dev)
                         return;
 
                 /* A packet ready now  & Get status/length */
-                GoodPacket = TRUE;
+                GoodPacket = true;
                 writeb(DM9000_MRCMD, db->io_addr);
 
                 (db->inblk)(db->io_data, &rxhdr, sizeof(rxhdr));
@@ -927,7 +924,7 @@ dm9000_rx(struct net_device *dev)
 
                 /* Packet Status check */
                 if (RxLen < 0x40) {
-                        GoodPacket = FALSE;
+                        GoodPacket = false;
                         PRINTK1("Bad Packet received (runt)\n");
                 }
 
@@ -936,7 +933,7 @@ dm9000_rx(struct net_device *dev)
                 }
 
                 if (rxhdr.RxStatus & 0xbf00) {
-                        GoodPacket = FALSE;
+                        GoodPacket = false;
                         if (rxhdr.RxStatus & 0x100) {
                                 PRINTK1("fifo error\n");
                                 db->stats.rx_fifo_errors++;
@@ -1193,7 +1190,7 @@ dm9000_drv_remove(struct platform_device *pdev)
 
         unregister_netdev(ndev);
         dm9000_release_board(pdev, (board_info_t *) ndev->priv);
-        kfree(ndev);            /* free device structure */
+        free_netdev(ndev);              /* free device structure */
 
         PRINTK1("clean_module() exit\n");
 
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index a9ea67e75c1b..16a6edfeba41 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -333,11 +333,9 @@ struct e1000_adapter {
         struct e1000_tx_ring test_tx_ring;
         struct e1000_rx_ring test_rx_ring;
 
-
         int msg_enable;
-#ifdef CONFIG_PCI_MSI
         boolean_t have_msi;
-#endif
+
         /* to not mess up cache alignment, always add to the bottom */
         boolean_t tso_force;
         boolean_t smart_power_down;     /* phy smart power down */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 3a03a74c0609..cbc7febe9cdc 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -158,9 +158,7 @@ static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
 static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
 static int e1000_set_mac(struct net_device *netdev, void *p);
 static irqreturn_t e1000_intr(int irq, void *data);
-#ifdef CONFIG_PCI_MSI
 static irqreturn_t e1000_intr_msi(int irq, void *data);
-#endif
 static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter,
                                     struct e1000_tx_ring *tx_ring);
 #ifdef CONFIG_E1000_NAPI
@@ -300,31 +298,26 @@ module_exit(e1000_exit_module);
 static int e1000_request_irq(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        int flags, err = 0;
+        void (*handler) = &e1000_intr;
+        int irq_flags = IRQF_SHARED;
+        int err;
 
-        flags = IRQF_SHARED;
-#ifdef CONFIG_PCI_MSI
         if (adapter->hw.mac_type >= e1000_82571) {
-                adapter->have_msi = TRUE;
-                if ((err = pci_enable_msi(adapter->pdev))) {
-                        DPRINTK(PROBE, ERR,
-                         "Unable to allocate MSI interrupt Error: %d\n", err);
-                        adapter->have_msi = FALSE;
+                adapter->have_msi = !pci_enable_msi(adapter->pdev);
+                if (adapter->have_msi) {
+                        handler = &e1000_intr_msi;
+                        irq_flags = 0;
                 }
         }
-        if (adapter->have_msi) {
-                flags &= ~IRQF_SHARED;
-                err = request_irq(adapter->pdev->irq, &e1000_intr_msi, flags,
-                                  netdev->name, netdev);
-                if (err)
-                        DPRINTK(PROBE, ERR,
-                               "Unable to allocate interrupt Error: %d\n", err);
-        } else
-#endif
-        if ((err = request_irq(adapter->pdev->irq, &e1000_intr, flags,
-                               netdev->name, netdev)))
+
+        err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
+                          netdev);
+        if (err) {
+                if (adapter->have_msi)
+                        pci_disable_msi(adapter->pdev);
                 DPRINTK(PROBE, ERR,
                         "Unable to allocate interrupt Error: %d\n", err);
+        }
 
         return err;
 }
@@ -335,10 +328,8 @@ static void e1000_free_irq(struct e1000_adapter *adapter)
 
         free_irq(adapter->pdev->irq, netdev);
 
-#ifdef CONFIG_PCI_MSI
         if (adapter->have_msi)
                 pci_disable_msi(adapter->pdev);
-#endif
 }
 
 /**
@@ -1214,7 +1205,7 @@ e1000_remove(struct pci_dev *pdev)
         int i;
 #endif
 
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
 
         e1000_release_manageability(adapter);
 
@@ -1440,10 +1431,6 @@ e1000_open(struct net_device *netdev)
         /* From here on the code is the same as e1000_up() */
         clear_bit(__E1000_DOWN, &adapter->flags);
 
-#ifdef CONFIG_E1000_NAPI
-        netif_poll_enable(netdev);
-#endif
-
         e1000_irq_enable(adapter);
 
         /* fire a link status change interrupt to start the watchdog */
@@ -3744,7 +3731,6 @@ e1000_update_stats(struct e1000_adapter *adapter)
 
         spin_unlock_irqrestore(&adapter->stats_lock, flags);
 }
-#ifdef CONFIG_PCI_MSI
 
 /**
  * e1000_intr_msi - Interrupt Handler
@@ -3810,7 +3796,6 @@ e1000_intr_msi(int irq, void *data)
 
         return IRQ_HANDLED;
 }
-#endif
 
 /**
  * e1000_intr - Interrupt Handler
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 39654e1e2bed..47680237f783 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -1126,7 +1126,7 @@ static void eepro_tx_timeout (struct net_device *dev)
         printk (KERN_ERR "%s: transmit timed out, %s?\n", dev->name,
                 "network cable problem");
         /* This is not a duplicate. One message for the console,
-           one for the the log file  */
+           one for the log file  */
         printk (KERN_DEBUG "%s: transmit timed out, %s?\n", dev->name,
                 "network cable problem");
         eepro_complete_selreset(ioaddr);
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 6c267c38df97..9800341956a2 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -28,7 +28,7 @@
 */
 
 static const char * const version =
-"eepro100.c:v1.09j-t 9/29/99 Donald Becker http://www.scyld.com/network/eepro100.html\n"
+"eepro100.c:v1.09j-t 9/29/99 Donald Becker\n"
 "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n";
 
 /* A few user-configurable values that apply to all boards.
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index c7a5614e66c0..f6e0cb1ada1f 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -1803,10 +1803,10 @@ static inline int ehea_hash_skb(struct sk_buff *skb, int num_qps)
         u32 tmp;
 
         if ((skb->protocol == htons(ETH_P_IP)) &&
-            (skb->nh.iph->protocol == IPPROTO_TCP)) {
-                tcp = (struct tcphdr*)(skb->nh.raw + (skb->nh.iph->ihl * 4));
+            (ip_hdr(skb)->protocol == IPPROTO_TCP)) {
+                tcp = (struct tcphdr*)(skb_network_header(skb) + (ip_hdr(skb)->ihl * 4));
                 tmp = (tcp->source + (tcp->dest << 16)) % 31;
-                tmp += skb->nh.iph->daddr % 31;
+                tmp += ip_hdr(skb)->daddr % 31;
                 return tmp % num_qps;
         }
         else
@@ -2603,14 +2603,13 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
-
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
         int i = 0;
 
         lhea_dn = adapter->ebus_dev->ofdev.node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
-                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
                                                     NULL);
                 if (!dn_log_port_id) {
                         ehea_error("bad device node: eth_dn name=%s",
@@ -2645,12 +2644,12 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
 
         lhea_dn = adapter->ebus_dev->ofdev.node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
-                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
                                                     NULL);
                 if (dn_log_port_id)
                         if (*dn_log_port_id == logical_port_id)
@@ -2774,7 +2773,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
                                         const struct of_device_id *id)
 {
         struct ehea_adapter *adapter;
-        u64 *adapter_handle;
+        const u64 *adapter_handle;
         int ret;
 
         if (!dev || !dev->ofdev.node) {
@@ -2791,7 +2790,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
 
         adapter->ebus_dev = dev;
 
-        adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
+        adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle",
                                             NULL);
         if (adapter_handle)
                 adapter->handle = *adapter_handle;
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 4e3f14c9c717..5e517946f46a 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -93,8 +93,6 @@ static int rx_copybreak;
 static char version[] __devinitdata =
 DRV_NAME ".c:v1.11 1/7/2001 Written by Donald Becker <becker@scyld.com>\n";
 static char version2[] __devinitdata =
-"  http://www.scyld.com/network/epic100.html\n";
-static char version3[] __devinitdata =
 "  (unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
@@ -323,8 +321,8 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
 #ifndef MODULE
         static int printed_version;
         if (!printed_version++)
-                printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s",
-                        version, version2, version3);
+                printk (KERN_INFO "%s" KERN_INFO "%s",
+                        version, version2);
 #endif
 
         card_idx++;
@@ -1596,8 +1594,8 @@ static int __init epic_init (void)
 {
 /* when a module, this is printed whether or not devices are found in probe */
 #ifdef MODULE
-        printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s",
-                version, version2, version3);
+        printk (KERN_INFO "%s" KERN_INFO "%s",
+                version, version2);
 #endif
 
         return pci_register_driver(&epic_driver);
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index d0f28981b55a..7540966687ec 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -167,7 +167,7 @@ static int allocate_bd(struct net_device *dev)
 
         fep->ring_mem_addr = cpm_dpalloc((fpi->tx_ring + fpi->rx_ring) *
                                          sizeof(cbd_t), 8);
-        if (IS_DPERR(fep->ring_mem_addr))
+        if (IS_ERR_VALUE(fep->ring_mem_addr))
                 return -ENOMEM;
 
         fep->ring_base = cpm_dpram_addr(fep->ring_mem_addr);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index b666a0cc0642..f5b3cba23fc5 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1025,6 +1025,15 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         dev->trans_start = jiffies;
 
+        /* The powerpc-specific eieio() is used, as wmb() has too strong
+         * semantics (it requires synchronization between cacheable and
+         * uncacheable mappings, which eieio doesn't provide and which we
+         * don't need), thus requiring a more expensive sync instruction.  At
+         * some point, the set of architecture-independent barrier functions
+         * should be expanded to include weaker barriers.
+         */
+
+        eieio();
         txbdp->status = status;
 
         /* If this was the last BD in the ring, the next one */
@@ -1301,6 +1310,7 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)
         bdp->length = 0;
 
         /* Mark the buffer empty */
+        eieio();
         bdp->status |= (RXBD_EMPTY | RXBD_INTERRUPT);
 
         return skb;
@@ -1484,6 +1494,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
         bdp = priv->cur_rx;
 
         while (!((bdp->status & RXBD_EMPTY) || (--rx_work_limit < 0))) {
+                rmb();
                 skb = priv->rx_skbuff[priv->skb_currx];
 
                 if (!(bdp->status &
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 6e90619b3b41..36d2c7d4f4d0 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -140,7 +140,7 @@ config BAYCOM_SER_HDX
           modems that connect to a serial interface. The driver supports the
           ser12 design in half-duplex mode. This is the old driver.  It is
           still provided in case your serial interface chip does not work with
-          the full-duplex driver. This driver is depreciated.  To configure
+          the full-duplex driver. This driver is deprecated.  To configure
           the driver, use the sethdlc utility available in the standard ax25
           utilities package. For information on the modems, see
           <http://www.baycom.de/> and
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 50035ebd4f52..f752e5fc65ba 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -926,7 +926,7 @@ static int emac_link_differs(struct ocp_enet_private *dev)
         int duplex = r & EMAC_MR1_FDE ? DUPLEX_FULL : DUPLEX_HALF;
         int speed, pause, asym_pause;
 
-        if (r & (EMAC_MR1_MF_1000 | EMAC_MR1_MF_1000GPCS))
+        if (r & EMAC_MR1_MF_1000)
                 speed = SPEED_1000;
         else if (r & EMAC_MR1_MF_100)
                 speed = SPEED_100;
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.c b/drivers/net/ibm_emac/ibm_emac_mal.c
index 6c0f071e4052..cabd9846a5ee 100644
--- a/drivers/net/ibm_emac/ibm_emac_mal.c
+++ b/drivers/net/ibm_emac/ibm_emac_mal.c
@@ -59,8 +59,7 @@ int __init mal_register_commac(struct ibm_ocp_mal *mal,
         return 0;
 }
 
-void __exit mal_unregister_commac(struct ibm_ocp_mal *mal,
-                                  struct mal_commac *commac)
+void mal_unregister_commac(struct ibm_ocp_mal *mal, struct mal_commac *commac)
 {
         unsigned long flags;
         local_irq_save(flags);
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h
index 407d2acbf7c7..64bc338acc6c 100644
--- a/drivers/net/ibm_emac/ibm_emac_mal.h
+++ b/drivers/net/ibm_emac/ibm_emac_mal.h
@@ -223,8 +223,7 @@ void mal_exit(void) __exit;
 
 int mal_register_commac(struct ibm_ocp_mal *mal,
                         struct mal_commac *commac) __init;
-void mal_unregister_commac(struct ibm_ocp_mal *mal,
-                           struct mal_commac *commac) __exit;
+void mal_unregister_commac(struct ibm_ocp_mal *mal, struct mal_commac *commac);
 int mal_set_rcbs(struct ibm_ocp_mal *mal, int channel, unsigned long size);
 
 /* Returns BD ring offset for a particular channel
diff --git a/drivers/net/ibm_emac/ibm_emac_phy.c b/drivers/net/ibm_emac/ibm_emac_phy.c
index 9074f76ee2bf..e57862b34cae 100644
--- a/drivers/net/ibm_emac/ibm_emac_phy.c
+++ b/drivers/net/ibm_emac/ibm_emac_phy.c
@@ -22,6 +22,7 @@
 
 #include <asm/ocp.h>
 
+#include "ibm_emac_core.h"
 #include "ibm_emac_phy.h"
 
 static inline int phy_read(struct mii_phy *phy, int reg)
@@ -34,11 +35,39 @@ static inline void phy_write(struct mii_phy *phy, int reg, int val)
         phy->mdio_write(phy->dev, phy->address, reg, val);
 }
 
-int mii_reset_phy(struct mii_phy *phy)
+/*
+ * polls MII_BMCR until BMCR_RESET bit clears or operation times out.
+ *
+ * returns:
+ *      >= 0 => success, value in BMCR returned to caller
+ *      -EBUSY => failure, RESET bit never cleared
+ *      otherwise => failure, lower level PHY read failed
+ */
+static int mii_spin_reset_complete(struct mii_phy *phy)
 {
         int val;
         int limit = 10000;
 
+        while (limit--) {
+                val = phy_read(phy, MII_BMCR);
+                if (val >= 0 && !(val & BMCR_RESET))
+                        return val;     /* success */
+                udelay(10);
+        }
+        if (val & BMCR_RESET)
+                val = -EBUSY;
+
+        if (net_ratelimit())
+                printk(KERN_ERR "emac%d: PHY reset timeout (%d)\n", 
+                       ((struct ocp_enet_private *)phy->dev->priv)->def->index,
+                       val);
+        return val;                 
+}
+
+int mii_reset_phy(struct mii_phy *phy)
+{
+        int val;
+
         val = phy_read(phy, MII_BMCR);
         val &= ~BMCR_ISOLATE;
         val |= BMCR_RESET;
@@ -46,16 +75,11 @@ int mii_reset_phy(struct mii_phy *phy)
 
         udelay(300);
 
-        while (limit--) {
-                val = phy_read(phy, MII_BMCR);
-                if (val >= 0 && (val & BMCR_RESET) == 0)
-                        break;
-                udelay(10);
-        }
-        if ((val & BMCR_ISOLATE) && limit > 0)
+        val = mii_spin_reset_complete(phy);
+        if (val >= 0 && (val & BMCR_ISOLATE))
                 phy_write(phy, MII_BMCR, val & ~BMCR_ISOLATE);
 
-        return limit <= 0;
+        return val < 0;
 }
 
 static int genmii_setup_aneg(struct mii_phy *phy, u32 advertise)
@@ -102,8 +126,14 @@ static int genmii_setup_aneg(struct mii_phy *phy, u32 advertise)
         }
 
         /* Start/Restart aneg */
-        ctl = phy_read(phy, MII_BMCR);
-        ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
+        /* on some PHYs (e.g. National DP83843) a write to MII_ADVERTISE
+         * causes BMCR_RESET to be set on the next read of MII_BMCR, which
+         * if not checked for causes the PHY to be reset below */
+        ctl = mii_spin_reset_complete(phy);
+        if (ctl < 0)
+                return ctl;
+
+        ctl |= BMCR_ANENABLE | BMCR_ANRESTART;
         phy_write(phy, MII_BMCR, ctl);
 
         return 0;
@@ -118,13 +148,13 @@ static int genmii_setup_forced(struct mii_phy *phy, int speed, int fd)
         phy->duplex = fd;
         phy->pause = phy->asym_pause = 0;
 
+        /* First reset the PHY */
+        mii_reset_phy(phy);
+
         ctl = phy_read(phy, MII_BMCR);
         if (ctl < 0)
                 return ctl;
-        ctl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_ANENABLE);
-
-        /* First reset the PHY */
-        phy_write(phy, MII_BMCR, ctl | BMCR_RESET);
+        ctl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_ANENABLE | BMCR_SPEED1000);
 
         /* Select speed & duplex */
         switch (speed) {
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.c b/drivers/net/ibm_emac/ibm_emac_rgmii.c
index 53d281cb9a16..9dbb5e5936c3 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.c
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.c
@@ -162,7 +162,7 @@ void rgmii_set_speed(struct ocp_device *ocpdev, int input, int speed)
         out_be32(&dev->base->ssr, ssr);
 }
 
-void __exit __rgmii_fini(struct ocp_device *ocpdev, int input)
+void __rgmii_fini(struct ocp_device *ocpdev, int input)
 {
         struct ibm_ocp_rgmii *dev = ocp_get_drvdata(ocpdev);
         BUG_ON(!dev || dev->users == 0);
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index 117ea486c2ca..971e45815c6c 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -37,7 +37,7 @@ struct ibm_ocp_rgmii {
 #ifdef CONFIG_IBM_EMAC_RGMII
 int rgmii_attach(void *emac) __init;
 
-void __rgmii_fini(struct ocp_device *ocpdev, int input) __exit;
+void __rgmii_fini(struct ocp_device *ocpdev, int input);
 static inline void rgmii_fini(struct ocp_device *ocpdev, int input)
 {
         if (ocpdev)
diff --git a/drivers/net/ibm_emac/ibm_emac_tah.c b/drivers/net/ibm_emac/ibm_emac_tah.c
index e287b451bb44..3c2d5ba522a1 100644
--- a/drivers/net/ibm_emac/ibm_emac_tah.c
+++ b/drivers/net/ibm_emac/ibm_emac_tah.c
@@ -63,7 +63,7 @@ int __init tah_attach(void *emac)
         return 0;
 }
 
-void __exit __tah_fini(struct ocp_device *ocpdev)
+void __tah_fini(struct ocp_device *ocpdev)
 {
         struct tah_regs *p = ocp_get_drvdata(ocpdev);
         BUG_ON(!p);
diff --git a/drivers/net/ibm_emac/ibm_emac_tah.h b/drivers/net/ibm_emac/ibm_emac_tah.h
index 38153945a240..ccf64915e1e4 100644
--- a/drivers/net/ibm_emac/ibm_emac_tah.h
+++ b/drivers/net/ibm_emac/ibm_emac_tah.h
@@ -55,7 +55,7 @@ struct tah_regs {
 #ifdef CONFIG_IBM_EMAC_TAH
 int tah_attach(void *emac) __init;
 
-void __tah_fini(struct ocp_device *ocpdev) __exit;
+void __tah_fini(struct ocp_device *ocpdev);
 static inline void tah_fini(struct ocp_device *ocpdev)
 {
         if (ocpdev)
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.c b/drivers/net/ibm_emac/ibm_emac_zmii.c
index 37dc8f342868..2c0fdb0cabff 100644
--- a/drivers/net/ibm_emac/ibm_emac_zmii.c
+++ b/drivers/net/ibm_emac/ibm_emac_zmii.c
@@ -215,7 +215,7 @@ void __zmii_set_speed(struct ocp_device *ocpdev, int input, int speed)
         out_be32(&dev->base->ssr, ssr);
 }
 
-void __exit __zmii_fini(struct ocp_device *ocpdev, int input)
+void __zmii_fini(struct ocp_device *ocpdev, int input)
 {
         struct ibm_ocp_zmii *dev = ocp_get_drvdata(ocpdev);
         BUG_ON(!dev || dev->users == 0);
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.h b/drivers/net/ibm_emac/ibm_emac_zmii.h
index 972e3a44a09f..fad6d8bf983a 100644
--- a/drivers/net/ibm_emac/ibm_emac_zmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_zmii.h
@@ -40,7 +40,7 @@ struct ibm_ocp_zmii {
 #ifdef CONFIG_IBM_EMAC_ZMII
 int zmii_attach(void *emac) __init;
 
-void __zmii_fini(struct ocp_device *ocpdev, int input) __exit;
+void __zmii_fini(struct ocp_device *ocpdev, int input);
 static inline void zmii_fini(struct ocp_device *ocpdev, int input)
 {
         if (ocpdev)
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 7c8ccc09b601..829da9a1d113 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -141,6 +141,20 @@ config ACT200L_DONGLE
           To activate support for ACTiSYS IR-200L dongle you will have to
           start irattach like this: "irattach -d act200l".
 
+config KINGSUN_DONGLE
+        tristate "KingSun/DonShine DS-620 IrDA-USB dongle"
+        depends on IRDA && USB && EXPERIMENTAL
+        help
+          Say Y or M here if you want to build support for the KingSun/DonShine
+          DS-620 IrDA-USB bridge device driver.
+
+          This USB bridge does not conform to the IrDA-USB device class
+          specification, and therefore needs its own specific driver. This
+          dongle supports SIR speed only (9600 bps).
+
+          To compile it as a module, choose M here: the module will be called
+          kingsun-sir.
+
 comment "Old SIR device drivers"
 
 config IRPORT_SIR
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile
index 5be09f1b9ee2..233a2f923730 100644
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_MCP2120_DONGLE)	+= mcp2120-sir.o
 obj-$(CONFIG_ACT200L_DONGLE)    += act200l-sir.o
 obj-$(CONFIG_MA600_DONGLE)      += ma600-sir.o
 obj-$(CONFIG_TOIM3232_DONGLE)   += toim3232-sir.o
+obj-$(CONFIG_KINGSUN_DONGLE)    += kingsun-sir.o
 
 # The SIR helper module
 sir-dev-objs := sir_dev.o sir_dongle.o
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h
index 2ab173d9a0e4..1e67720f1066 100644
--- a/drivers/net/irda/donauboe.h
+++ b/drivers/net/irda/donauboe.h
@@ -113,7 +113,7 @@
 /* RxOver  overflow in Recv FIFO                                */
 /* SipRcv  received serial gap  (or other condition you set)    */
 /* Interrupts are enabled by writing a one to the IER register  */
-/* Interrupts are cleared by writting a one to the ISR register */
+/* Interrupts are cleared by writing a one to the ISR register */
 /*                                                              */
 /* 6. The remaining registers: 0x6 and 0x3 appear to be         */
 /*    reserved parts of 16 or 32 bit registersthe remainder     */
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
new file mode 100644
index 000000000000..217429122e79
--- /dev/null
+++ b/drivers/net/irda/kingsun-sir.c
@@ -0,0 +1,657 @@
+/*****************************************************************************
+*
+* Filename:      kingsun-sir.c
+* Version:       0.1.1
+* Description:   Irda KingSun/DonShine USB Dongle
+* Status:        Experimental
+* Author:        Alex Villac�s Lasso <a_villacis@palosanto.com>
+*
+*       Based on stir4200 and mcs7780 drivers, with (strange?) differences
+*
+*       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.
+*
+*       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.
+*
+*****************************************************************************/
+
+/*
+ * This is my current (2007-04-25) understanding of how this dongle is supposed
+ * to work. This is based on reverse-engineering and examination of the packet
+ * data sent and received by the WinXP driver using USBSnoopy. Feel free to
+ * update here as more of this dongle is known:
+ *
+ * General: Unlike the other USB IrDA dongles, this particular dongle exposes,
+ * not two bulk (in and out) endpoints, but two *interrupt* ones. This dongle,
+ * like the bulk based ones (stir4200.c and mcs7780.c), requires polling in
+ * order to receive data.
+ * Transmission: Just like stir4200, this dongle uses a raw stream of data,
+ * which needs to be wrapped and escaped in a similar way as in stir4200.c.
+ * Reception: Poll-based, as in stir4200. Each read returns the contents of a
+ * 8-byte buffer, of which the first byte (LSB) indicates the number of bytes
+ * (1-7) of valid data contained within the remaining 7 bytes. For example, if
+ * the buffer had the following contents:
+ *  06 ff ff ff c0 01 04 aa
+ * This means that (06) there are 6 bytes of valid data. The byte 0xaa at the
+ * end is garbage (left over from a previous reception) and is discarded.
+ * If a read returns an "impossible" value as the length of valid data (such as
+ * 0x36) in the first byte, then the buffer is uninitialized (as is the case of
+ * first plug-in) and its contents should be discarded. There is currently no
+ * evidence that the top 5 bits of the 1st byte of the buffer can have values
+ * other than 0 once reception begins.
+ * Once valid bytes are collected, the assembled stream is a sequence of
+ * wrapped IrDA frames that is unwrapped and unescaped as in stir4200.c.
+ * BIG FAT WARNING: the dongle does *not* reset the RX buffer in any way after
+ * a successful read from the host, which means that in absence of further
+ * reception, repeated reads from the dongle will return the exact same
+ * contents repeatedly. Attempts to be smart and cache a previous read seem
+ * to result in corrupted packets, so this driver depends on the unwrap logic
+ * to sort out any repeated reads.
+ * Speed change: no commands observed so far to change speed, assumed fixed
+ * 9600bps (SIR).
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/kref.h>
+#include <linux/usb.h>
+#include <linux/device.h>
+#include <linux/crc32.h>
+
+#include <asm/unaligned.h>
+#include <asm/byteorder.h>
+#include <asm/uaccess.h>
+
+#include <net/irda/irda.h>
+#include <net/irda/wrapper.h>
+#include <net/irda/crc.h>
+
+/*
+ * According to lsusb, 0x07c0 is assigned to
+ * "Code Mercenaries Hard- und Software GmbH"
+ */
+#define KING_VENDOR_ID 0x07c0
+#define KING_PRODUCT_ID 0x4200
+
+/* These are the currently known USB ids */
+static struct usb_device_id dongles[] = {
+    /* KingSun Co,Ltd  IrDA/USB Bridge */
+    { USB_DEVICE(KING_VENDOR_ID, KING_PRODUCT_ID) },
+    { }
+};
+
+MODULE_DEVICE_TABLE(usb, dongles);
+
+#define KINGSUN_MTT 0x07
+
+#define KINGSUN_FIFO_SIZE               4096
+#define KINGSUN_EP_IN                   0
+#define KINGSUN_EP_OUT                  1
+
+struct kingsun_cb {
+        struct usb_device *usbdev;      /* init: probe_irda */
+        struct net_device *netdev;      /* network layer */
+        struct irlap_cb   *irlap;       /* The link layer we are binded to */
+        struct net_device_stats stats;  /* network statistics */
+        struct qos_info   qos;
+
+        __u8              *in_buf;      /* receive buffer */
+        __u8              *out_buf;     /* transmit buffer */
+        __u8              max_rx;       /* max. atomic read from dongle
+                                           (usually 8), also size of in_buf */
+        __u8              max_tx;       /* max. atomic write to dongle
+                                           (usually 8) */
+
+        iobuff_t          rx_buff;      /* receive unwrap state machine */
+        struct timeval    rx_time;
+        spinlock_t lock;
+        int receiving;
+
+        __u8 ep_in;
+        __u8 ep_out;
+
+        struct urb       *tx_urb;
+        struct urb       *rx_urb;
+};
+
+/* Callback transmission routine */
+static void kingsun_send_irq(struct urb *urb)
+{
+        struct kingsun_cb *kingsun = urb->context;
+        struct net_device *netdev = kingsun->netdev;
+
+        /* in process of stopping, just drop data */
+        if (!netif_running(kingsun->netdev)) {
+                err("kingsun_send_irq: Network not running!");
+                return;
+        }
+
+        /* unlink, shutdown, unplug, other nasties */
+        if (urb->status != 0) {
+                err("kingsun_send_irq: urb asynchronously failed - %d",
+                    urb->status);
+        }
+        netif_wake_queue(netdev);
+}
+
+/*
+ * Called from net/core when new frame is available.
+ */
+static int kingsun_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct kingsun_cb *kingsun;
+        int wraplen;
+        int ret = 0;
+
+        if (skb == NULL || netdev == NULL)
+                return -EINVAL;
+
+        netif_stop_queue(netdev);
+
+        /* the IRDA wrapping routines don't deal with non linear skb */
+        SKB_LINEAR_ASSERT(skb);
+
+        kingsun = netdev_priv(netdev);
+
+        spin_lock(&kingsun->lock);
+
+        /* Append data to the end of whatever data remains to be transmitted */
+        wraplen = async_wrap_skb(skb,
+                kingsun->out_buf,
+                KINGSUN_FIFO_SIZE);
+
+        /* Calculate how much data can be transmitted in this urb */
+        usb_fill_int_urb(kingsun->tx_urb, kingsun->usbdev,
+                usb_sndintpipe(kingsun->usbdev, kingsun->ep_out),
+                kingsun->out_buf, wraplen, kingsun_send_irq,
+                kingsun, 1);
+
+        if ((ret = usb_submit_urb(kingsun->tx_urb, GFP_ATOMIC))) {
+                err("kingsun_hard_xmit: failed tx_urb submit: %d", ret);
+                switch (ret) {
+                case -ENODEV:
+                case -EPIPE:
+                        break;
+                default:
+                        kingsun->stats.tx_errors++;
+                        netif_start_queue(netdev);
+                }
+        } else {
+                kingsun->stats.tx_packets++;
+                kingsun->stats.tx_bytes += skb->len;
+        }
+
+        dev_kfree_skb(skb);
+        spin_unlock(&kingsun->lock);
+
+        return ret;
+}
+
+/* Receive callback function */
+static void kingsun_rcv_irq(struct urb *urb)
+{
+        struct kingsun_cb *kingsun = urb->context;
+        int ret;
+
+        /* in process of stopping, just drop data */
+        if (!netif_running(kingsun->netdev)) {
+                kingsun->receiving = 0;
+                return;
+        }
+
+        /* unlink, shutdown, unplug, other nasties */
+        if (urb->status != 0) {
+                err("kingsun_rcv_irq: urb asynchronously failed - %d",
+                    urb->status);
+                kingsun->receiving = 0;
+                return;
+        }
+
+        if (urb->actual_length == kingsun->max_rx) {
+                __u8 *bytes = urb->transfer_buffer;
+                int i;
+
+                /* The very first byte in the buffer indicates the length of
+                   valid data in the read. This byte must be in the range
+                   1..kingsun->max_rx -1 . Values outside this range indicate
+                   an uninitialized Rx buffer when the dongle has just been
+                   plugged in. */
+                if (bytes[0] >= 1 && bytes[0] < kingsun->max_rx) {
+                        for (i = 1; i <= bytes[0]; i++) {
+                                async_unwrap_char(kingsun->netdev,
+                                                  &kingsun->stats,
+                                                  &kingsun->rx_buff, bytes[i]);
+                        }
+                        kingsun->netdev->last_rx = jiffies;
+                        do_gettimeofday(&kingsun->rx_time);
+                        kingsun->receiving =
+                                (kingsun->rx_buff.state != OUTSIDE_FRAME)
+                                ? 1 : 0;
+                }
+        } else if (urb->actual_length > 0) {
+                err("%s(): Unexpected response length, expected %d got %d",
+                    __FUNCTION__, kingsun->max_rx, urb->actual_length);
+        }
+        /* This urb has already been filled in kingsun_net_open */
+        ret = usb_submit_urb(urb, GFP_ATOMIC);
+}
+
+/*
+ * Function kingsun_net_open (dev)
+ *
+ *    Network device is taken up. Usually this is done by "ifconfig irda0 up"
+ */
+static int kingsun_net_open(struct net_device *netdev)
+{
+        struct kingsun_cb *kingsun = netdev_priv(netdev);
+        int err = -ENOMEM;
+        char hwname[16];
+
+        /* At this point, urbs are NULL, and skb is NULL (see kingsun_probe) */
+        kingsun->receiving = 0;
+
+        /* Initialize for SIR to copy data directly into skb.  */
+        kingsun->rx_buff.in_frame = FALSE;
+        kingsun->rx_buff.state = OUTSIDE_FRAME;
+        kingsun->rx_buff.truesize = IRDA_SKB_MAX_MTU;
+        kingsun->rx_buff.skb = dev_alloc_skb(IRDA_SKB_MAX_MTU);
+        if (!kingsun->rx_buff.skb)
+                goto free_mem;
+
+        skb_reserve(kingsun->rx_buff.skb, 1);
+        kingsun->rx_buff.head = kingsun->rx_buff.skb->data;
+        do_gettimeofday(&kingsun->rx_time);
+
+        kingsun->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!kingsun->rx_urb)
+                goto free_mem;
+
+        kingsun->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!kingsun->tx_urb)
+                goto free_mem;
+
+        /*
+         * Now that everything should be initialized properly,
+         * Open new IrLAP layer instance to take care of us...
+         */
+        sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
+        kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
+        if (!kingsun->irlap) {
+                err("kingsun-sir: irlap_open failed");
+                goto free_mem;
+        }
+
+        /* Start first reception */
+        usb_fill_int_urb(kingsun->rx_urb, kingsun->usbdev,
+                          usb_rcvintpipe(kingsun->usbdev, kingsun->ep_in),
+                          kingsun->in_buf, kingsun->max_rx,
+                          kingsun_rcv_irq, kingsun, 1);
+        kingsun->rx_urb->status = 0;
+        err = usb_submit_urb(kingsun->rx_urb, GFP_KERNEL);
+        if (err) {
+                err("kingsun-sir: first urb-submit failed: %d", err);
+                goto close_irlap;
+        }
+
+        netif_start_queue(netdev);
+
+        /* Situation at this point:
+           - all work buffers allocated
+           - urbs allocated and ready to fill
+           - max rx packet known (in max_rx)
+           - unwrap state machine initialized, in state outside of any frame
+           - receive request in progress
+           - IrLAP layer started, about to hand over packets to send
+         */
+
+        return 0;
+
+ close_irlap:
+        irlap_close(kingsun->irlap);
+ free_mem:
+        if (kingsun->tx_urb) {
+                usb_free_urb(kingsun->tx_urb);
+                kingsun->tx_urb = NULL;
+        }
+        if (kingsun->rx_urb) {
+                usb_free_urb(kingsun->rx_urb);
+                kingsun->rx_urb = NULL;
+        }
+        if (kingsun->rx_buff.skb) {
+                kfree_skb(kingsun->rx_buff.skb);
+                kingsun->rx_buff.skb = NULL;
+                kingsun->rx_buff.head = NULL;
+        }
+        return err;
+}
+
+/*
+ * Function kingsun_net_close (kingsun)
+ *
+ *    Network device is taken down. Usually this is done by
+ *    "ifconfig irda0 down"
+ */
+static int kingsun_net_close(struct net_device *netdev)
+{
+        struct kingsun_cb *kingsun = netdev_priv(netdev);
+
+        /* Stop transmit processing */
+        netif_stop_queue(netdev);
+
+        /* Mop up receive && transmit urb's */
+        usb_kill_urb(kingsun->tx_urb);
+        usb_kill_urb(kingsun->rx_urb);
+
+        usb_free_urb(kingsun->tx_urb);
+        usb_free_urb(kingsun->rx_urb);
+
+        kingsun->tx_urb = NULL;
+        kingsun->rx_urb = NULL;
+
+        kfree_skb(kingsun->rx_buff.skb);
+        kingsun->rx_buff.skb = NULL;
+        kingsun->rx_buff.head = NULL;
+        kingsun->rx_buff.in_frame = FALSE;
+        kingsun->rx_buff.state = OUTSIDE_FRAME;
+        kingsun->receiving = 0;
+
+        /* Stop and remove instance of IrLAP */
+        if (kingsun->irlap)
+                irlap_close(kingsun->irlap);
+
+        kingsun->irlap = NULL;
+
+        return 0;
+}
+
+/*
+ * IOCTLs : Extra out-of-band network commands...
+ */
+static int kingsun_net_ioctl(struct net_device *netdev, struct ifreq *rq,
+                             int cmd)
+{
+        struct if_irda_req *irq = (struct if_irda_req *) rq;
+        struct kingsun_cb *kingsun = netdev_priv(netdev);
+        int ret = 0;
+
+        switch (cmd) {
+        case SIOCSBANDWIDTH: /* Set bandwidth */
+                if (!capable(CAP_NET_ADMIN))
+                        return -EPERM;
+
+                /* Check if the device is still there */
+                if (netif_device_present(kingsun->netdev))
+                        /* No observed commands for speed change */
+                        ret = -EOPNOTSUPP;
+                break;
+
+        case SIOCSMEDIABUSY: /* Set media busy */
+                if (!capable(CAP_NET_ADMIN))
+                        return -EPERM;
+
+                /* Check if the IrDA stack is still there */
+                if (netif_running(kingsun->netdev))
+                        irda_device_set_media_busy(kingsun->netdev, TRUE);
+                break;
+
+        case SIOCGRECEIVING:
+                /* Only approximately true */
+                irq->ifr_receiving = kingsun->receiving;
+                break;
+
+        default:
+                ret = -EOPNOTSUPP;
+        }
+
+        return ret;
+}
+
+/*
+ * Get device stats (for /proc/net/dev and ifconfig)
+ */
+static struct net_device_stats *
+kingsun_net_get_stats(struct net_device *netdev)
+{
+        struct kingsun_cb *kingsun = netdev_priv(netdev);
+        return &kingsun->stats;
+}
+
+/*
+ * This routine is called by the USB subsystem for each new device
+ * in the system. We need to check if the device is ours, and in
+ * this case start handling it.
+ */
+static int kingsun_probe(struct usb_interface *intf,
+                      const struct usb_device_id *id)
+{
+        struct usb_host_interface *interface;
+        struct usb_endpoint_descriptor *endpoint;
+
+        struct usb_device *dev = interface_to_usbdev(intf);
+        struct kingsun_cb *kingsun = NULL;
+        struct net_device *net = NULL;
+        int ret = -ENOMEM;
+        int pipe, maxp_in, maxp_out;
+        __u8 ep_in;
+        __u8 ep_out;
+
+        /* Check that there really are two interrupt endpoints.
+           Check based on the one in drivers/usb/input/usbmouse.c
+         */
+        interface = intf->cur_altsetting;
+        if (interface->desc.bNumEndpoints != 2) {
+                err("kingsun-sir: expected 2 endpoints, found %d",
+                    interface->desc.bNumEndpoints);
+                return -ENODEV;
+        }
+        endpoint = &interface->endpoint[KINGSUN_EP_IN].desc;
+        if (!usb_endpoint_is_int_in(endpoint)) {
+                err("kingsun-sir: endpoint 0 is not interrupt IN");
+                return -ENODEV;
+        }
+
+        ep_in = endpoint->bEndpointAddress;
+        pipe = usb_rcvintpipe(dev, ep_in);
+        maxp_in = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
+        if (maxp_in > 255 || maxp_in <= 1) {
+                err("%s: endpoint 0 has max packet size %d not in range",
+                    __FILE__, maxp_in);
+                return -ENODEV;
+        }
+
+        endpoint = &interface->endpoint[KINGSUN_EP_OUT].desc;
+        if (!usb_endpoint_is_int_out(endpoint)) {
+                err("kingsun-sir: endpoint 1 is not interrupt OUT");
+                return -ENODEV;
+        }
+
+        ep_out = endpoint->bEndpointAddress;
+        pipe = usb_sndintpipe(dev, ep_out);
+        maxp_out = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
+
+        /* Allocate network device container. */
+        net = alloc_irdadev(sizeof(*kingsun));
+        if(!net)
+                goto err_out1;
+
+        SET_MODULE_OWNER(net);
+        SET_NETDEV_DEV(net, &intf->dev);
+        kingsun = netdev_priv(net);
+        kingsun->irlap = NULL;
+        kingsun->tx_urb = NULL;
+        kingsun->rx_urb = NULL;
+        kingsun->ep_in = ep_in;
+        kingsun->ep_out = ep_out;
+        kingsun->in_buf = NULL;
+        kingsun->out_buf = NULL;
+        kingsun->max_rx = (__u8)maxp_in;
+        kingsun->max_tx = (__u8)maxp_out;
+        kingsun->netdev = net;
+        kingsun->usbdev = dev;
+        kingsun->rx_buff.in_frame = FALSE;
+        kingsun->rx_buff.state = OUTSIDE_FRAME;
+        kingsun->rx_buff.skb = NULL;
+        kingsun->receiving = 0;
+        spin_lock_init(&kingsun->lock);
+
+        /* Allocate input buffer */
+        kingsun->in_buf = (__u8 *)kmalloc(kingsun->max_rx, GFP_KERNEL);
+        if (!kingsun->in_buf)
+                goto free_mem;
+
+        /* Allocate output buffer */
+        kingsun->out_buf = (__u8 *)kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL);
+        if (!kingsun->out_buf)
+                goto free_mem;
+
+        printk(KERN_INFO "KingSun/DonShine IRDA/USB found at address %d, "
+                "Vendor: %x, Product: %x\n",
+               dev->devnum, le16_to_cpu(dev->descriptor.idVendor),
+               le16_to_cpu(dev->descriptor.idProduct));
+
+        /* Initialize QoS for this device */
+        irda_init_max_qos_capabilies(&kingsun->qos);
+
+        /* That's the Rx capability. */
+        kingsun->qos.baud_rate.bits       &= IR_9600;
+        kingsun->qos.min_turn_time.bits   &= KINGSUN_MTT;
+        irda_qos_bits_to_value(&kingsun->qos);
+
+        /* Override the network functions we need to use */
+        net->hard_start_xmit = kingsun_hard_xmit;
+        net->open            = kingsun_net_open;
+        net->stop            = kingsun_net_close;
+        net->get_stats       = kingsun_net_get_stats;
+        net->do_ioctl        = kingsun_net_ioctl;
+
+        ret = register_netdev(net);
+        if (ret != 0)
+                goto free_mem;
+
+        info("IrDA: Registered KingSun/DonShine device %s", net->name);
+
+        usb_set_intfdata(intf, kingsun);
+
+        /* Situation at this point:
+           - all work buffers allocated
+           - urbs not allocated, set to NULL
+           - max rx packet known (in max_rx)
+           - unwrap state machine (partially) initialized, but skb == NULL
+         */
+
+        return 0;
+
+free_mem:
+        if (kingsun->out_buf) kfree(kingsun->out_buf);
+        if (kingsun->in_buf) kfree(kingsun->in_buf);
+        free_netdev(net);
+err_out1:
+        return ret;
+}
+
+/*
+ * The current device is removed, the USB layer tell us to shut it down...
+ */
+static void kingsun_disconnect(struct usb_interface *intf)
+{
+        struct kingsun_cb *kingsun = usb_get_intfdata(intf);
+
+        if (!kingsun)
+                return;
+
+        unregister_netdev(kingsun->netdev);
+
+        /* Mop up receive && transmit urb's */
+        if (kingsun->tx_urb != NULL) {
+                usb_kill_urb(kingsun->tx_urb);
+                usb_free_urb(kingsun->tx_urb);
+                kingsun->tx_urb = NULL;
+        }
+        if (kingsun->rx_urb != NULL) {
+                usb_kill_urb(kingsun->rx_urb);
+                usb_free_urb(kingsun->rx_urb);
+                kingsun->rx_urb = NULL;
+        }
+
+        kfree(kingsun->out_buf);
+        kfree(kingsun->in_buf);
+        free_netdev(kingsun->netdev);
+
+        usb_set_intfdata(intf, NULL);
+}
+
+#ifdef CONFIG_PM
+/* USB suspend, so power off the transmitter/receiver */
+static int kingsun_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct kingsun_cb *kingsun = usb_get_intfdata(intf);
+
+        netif_device_detach(kingsun->netdev);
+        if (kingsun->tx_urb != NULL) usb_kill_urb(kingsun->tx_urb);
+        if (kingsun->rx_urb != NULL) usb_kill_urb(kingsun->rx_urb);
+        return 0;
+}
+
+/* Coming out of suspend, so reset hardware */
+static int kingsun_resume(struct usb_interface *intf)
+{
+        struct kingsun_cb *kingsun = usb_get_intfdata(intf);
+
+        if (kingsun->rx_urb != NULL)
+                usb_submit_urb(kingsun->rx_urb, GFP_KERNEL);
+        netif_device_attach(kingsun->netdev);
+
+        return 0;
+}
+#endif
+
+/*
+ * USB device callbacks
+ */
+static struct usb_driver irda_driver = {
+        .name           = "kingsun-sir",
+        .probe          = kingsun_probe,
+        .disconnect     = kingsun_disconnect,
+        .id_table       = dongles,
+#ifdef CONFIG_PM
+        .suspend        = kingsun_suspend,
+        .resume         = kingsun_resume,
+#endif
+};
+
+/*
+ * Module insertion
+ */
+static int __init kingsun_init(void)
+{
+        return usb_register(&irda_driver);
+}
+module_init(kingsun_init);
+
+/*
+ * Module removal
+ */
+static void __exit kingsun_cleanup(void)
+{
+        /* Deregister the driver and remove all pending instances */
+        usb_deregister(&irda_driver);
+}
+module_exit(kingsun_cleanup);
+
+MODULE_AUTHOR("Alex Villac�s Lasso <a_villacis@palosanto.com>");
+MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun/DonShine");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index 17b0c3ab6201..9d6c8f391b2d 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 
 #include <net/irda/irda.h>
diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c
index d7e32d9554fc..25d5b8a96bdc 100644
--- a/drivers/net/irda/sir_dongle.c
+++ b/drivers/net/irda/sir_dongle.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/kmod.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 198bf3bfa70f..9043bf4aa49e 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -79,11 +79,17 @@ MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
 MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
 MODULE_LICENSE("GPL");
 
-static int ircc_dma = 255;
+static int smsc_nopnp;
+module_param_named(nopnp, smsc_nopnp, bool, 0);
+MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings");
+
+#define DMA_INVAL 255
+static int ircc_dma = DMA_INVAL;
 module_param(ircc_dma, int, 0);
 MODULE_PARM_DESC(ircc_dma, "DMA channel");
 
-static int ircc_irq = 255;
+#define IRQ_INVAL 255
+static int ircc_irq = IRQ_INVAL;
 module_param(ircc_irq, int, 0);
 MODULE_PARM_DESC(ircc_irq, "IRQ line");
 
@@ -360,7 +366,6 @@ static inline void register_bank(int iobase, int bank)
                iobase + IRCC_MASTER);
 }
 
-#ifdef  CONFIG_PNP
 /* PNP hotplug support */
 static const struct pnp_device_id smsc_ircc_pnp_table[] = {
         { .id = "SMCf010", .driver_data = 0 },
@@ -368,7 +373,35 @@ static const struct pnp_device_id smsc_ircc_pnp_table[] = {
         { }
 };
 MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table);
-#endif
+
+static int pnp_driver_registered;
+
+static int __init smsc_ircc_pnp_probe(struct pnp_dev *dev,
+                                      const struct pnp_device_id *dev_id)
+{
+        unsigned int firbase, sirbase;
+        u8 dma, irq;
+
+        if (!(pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) &&
+              pnp_dma_valid(dev, 0) && pnp_irq_valid(dev, 0)))
+                return -EINVAL;
+
+        sirbase = pnp_port_start(dev, 0);
+        firbase = pnp_port_start(dev, 1);
+        dma = pnp_dma(dev, 0);
+        irq = pnp_irq(dev, 0);
+
+        if (smsc_ircc_open(firbase, sirbase, dma, irq))
+                return -ENODEV;
+
+        return 0;
+}
+
+static struct pnp_driver smsc_ircc_pnp_driver = {
+        .name           = "smsc-ircc2",
+        .id_table       = smsc_ircc_pnp_table,
+        .probe          = smsc_ircc_pnp_probe,
+};
 
 
 /*******************************************************************************
@@ -379,6 +412,35 @@ MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table);
  *
  *******************************************************************************/
 
+static int __init smsc_ircc_legacy_probe(void)
+{
+        int ret = 0;
+
+        if (ircc_fir > 0 && ircc_sir > 0) {
+                IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
+                IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
+
+                if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq))
+                        ret = -ENODEV;
+        } else {
+                ret = -ENODEV;
+
+                /* try user provided configuration register base address */
+                if (ircc_cfg > 0) {
+                        IRDA_MESSAGE(" Overriding configuration address "
+                                     "0x%04x\n", ircc_cfg);
+                        if (!smsc_superio_fdc(ircc_cfg))
+                                ret = 0;
+                        if (!smsc_superio_lpc(ircc_cfg))
+                                ret = 0;
+                }
+
+                if (smsc_ircc_look_for_chips() > 0)
+                        ret = 0;
+        }
+        return ret;
+}
+
 /*
  * Function smsc_ircc_init ()
  *
@@ -406,31 +468,20 @@ static int __init smsc_ircc_init(void)
 
         dev_count = 0;
 
-        if (ircc_fir > 0 && ircc_sir > 0) {
-                IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
-                IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
-
-                if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq))
-                        ret = -ENODEV;
+        if (smsc_nopnp || !pnp_platform_devices ||
+            ircc_cfg || ircc_fir || ircc_sir ||
+            ircc_dma != DMA_INVAL || ircc_irq != IRQ_INVAL) {
+                ret = smsc_ircc_legacy_probe();
         } else {
-                ret = -ENODEV;
-
-                /* try user provided configuration register base address */
-                if (ircc_cfg > 0) {
-                        IRDA_MESSAGE(" Overriding configuration address "
-                                     "0x%04x\n", ircc_cfg);
-                        if (!smsc_superio_fdc(ircc_cfg))
-                                ret = 0;
-                        if (!smsc_superio_lpc(ircc_cfg))
-                                ret = 0;
-                }
-
-                if (smsc_ircc_look_for_chips() > 0)
-                        ret = 0;
+                if (pnp_register_driver(&smsc_ircc_pnp_driver) == 0)
+                        pnp_driver_registered = 1;
         }
 
-        if (ret)
+        if (ret) {
+                if (pnp_driver_registered)
+                        pnp_unregister_driver(&smsc_ircc_pnp_driver);
                 platform_driver_unregister(&smsc_ircc_driver);
+        }
 
         return ret;
 }
@@ -646,7 +697,7 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
         self->io.fifo_size = SMSC_IRCC2_FIFO_SIZE;
         self->io.speed = SMSC_IRCC2_C_IRDA_FALLBACK_SPEED;
 
-        if (irq < 255) {
+        if (irq != IRQ_INVAL) {
                 if (irq != chip_irq)
                         IRDA_MESSAGE("%s, Overriding IRQ - chip says %d, using %d\n",
                                      driver_name, chip_irq, irq);
@@ -654,7 +705,7 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
         } else
                 self->io.irq = chip_irq;
 
-        if (dma < 255) {
+        if (dma != DMA_INVAL) {
                 if (dma != chip_dma)
                         IRDA_MESSAGE("%s, Overriding DMA - chip says %d, using %d\n",
                                      driver_name, chip_dma, dma);
@@ -1840,6 +1891,9 @@ static void __exit smsc_ircc_cleanup(void)
                         smsc_ircc_close(dev_self[i]);
         }
 
+        if (pnp_driver_registered)
+                pnp_unregister_driver(&smsc_ircc_pnp_driver);
+
         platform_driver_unregister(&smsc_ircc_driver);
 }
 
@@ -2836,9 +2890,9 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
                                         tmpconf.fir_io = ircc_fir;
                                 if (ircc_sir != 0)
                                         tmpconf.sir_io = ircc_sir;
-                                if (ircc_dma != 0xff)
+                                if (ircc_dma != DMA_INVAL)
                                         tmpconf.fir_dma = ircc_dma;
-                                if (ircc_irq != 0xff)
+                                if (ircc_irq != IRQ_INVAL)
                                         tmpconf.fir_irq = ircc_irq;
 
                                 IRDA_MESSAGE("Detected unconfigured %s SMSC IrDA chip, pre-configuring device.\n", conf->name);
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index c4be973867a6..bf78ef1120ad 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -44,7 +44,6 @@ MODULE_LICENSE("GPL");
 #include <linux/time.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
 
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index c8e90861f869..3569d5b03388 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -193,8 +193,6 @@ struct ixgb_adapter {
         u16 msg_enable;
         struct ixgb_hw_stats stats;
         uint32_t alloc_rx_buff_failed;
-#ifdef CONFIG_PCI_MSI
         boolean_t have_msi;
-#endif
 };
 #endif /* _IXGB_H_ */
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index f15aebde7b90..52c99d01d568 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -315,7 +315,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw)
  * hw - Struct containing variables accessed by shared code
  *
  * Reads the first 64 16 bit words of the EEPROM and sums the values read.
- * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
+ * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
  * valid.
  *
  * Returns:
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 6d2b059371f1..991c8833e23c 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -227,7 +227,7 @@ int
 ixgb_up(struct ixgb_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        int err;
+        int err, irq_flags = IRQF_SHARED;
         int max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
         struct ixgb_hw *hw = &adapter->hw;
 
@@ -246,26 +246,21 @@ ixgb_up(struct ixgb_adapter *adapter)
         /* disable interrupts and get the hardware into a known state */
         IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
 
-#ifdef CONFIG_PCI_MSI
-        {
-        boolean_t pcix = (IXGB_READ_REG(&adapter->hw, STATUS) & 
-                                                  IXGB_STATUS_PCIX_MODE) ? TRUE : FALSE;
-        adapter->have_msi = TRUE;
-
-        if (!pcix)
-           adapter->have_msi = FALSE;
-        else if((err = pci_enable_msi(adapter->pdev))) {
-                DPRINTK(PROBE, ERR,
-                 "Unable to allocate MSI interrupt Error: %d\n", err);
-                adapter->have_msi = FALSE;
+        /* only enable MSI if bus is in PCI-X mode */
+        if (IXGB_READ_REG(&adapter->hw, STATUS) & IXGB_STATUS_PCIX_MODE) {
+                err = pci_enable_msi(adapter->pdev);
+                if (!err) {
+                        adapter->have_msi = 1;
+                        irq_flags = 0;
+                }
                 /* proceed to try to request regular interrupt */
         }
-        }
 
-#endif
-        if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
-                                  IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                                  netdev->name, netdev))) {
+        err = request_irq(adapter->pdev->irq, &ixgb_intr, irq_flags,
+                          netdev->name, netdev);
+        if (err) {
+                if (adapter->have_msi)
+                        pci_disable_msi(adapter->pdev);
                 DPRINTK(PROBE, ERR,
                  "Unable to allocate interrupt Error: %d\n", err);
                 return err;
@@ -307,11 +302,10 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
 
         ixgb_irq_disable(adapter);
         free_irq(adapter->pdev->irq, netdev);
-#ifdef CONFIG_PCI_MSI
-        if(adapter->have_msi == TRUE)
+
+        if (adapter->have_msi)
                 pci_disable_msi(adapter->pdev);
 
-#endif
         if(kill_watchdog)
                 del_timer_sync(&adapter->watchdog_timer);
 #ifdef CONFIG_IXGB_NAPI
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index b3bd62394958..52b9332810c5 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -110,9 +110,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
                 return -ENODEV;
         }
 
-        addr = get_property(mace, "mac-address", NULL);
+        addr = of_get_property(mace, "mac-address", NULL);
         if (addr == NULL) {
-                addr = get_property(mace, "local-mac-address", NULL);
+                addr = of_get_property(mace, "local-mac-address", NULL);
                 if (addr == NULL) {
                         printk(KERN_ERR "Can't get mac-address for MACE %s\n",
                                mace->full_name);
diff --git a/drivers/net/meth.h b/drivers/net/meth.h
index 84960dae2a22..ea3b8fc86d1e 100644
--- a/drivers/net/meth.h
+++ b/drivers/net/meth.h
@@ -126,7 +126,7 @@ typedef struct rx_packet {
                                        /*   Note: when loopback is set this bit becomes collision control.  Setting this bit will */
                                        /*         cause a collision to be reported. */
 
-                                       /* Bits 5 and 6 are used to determine the the Destination address filter mode */
+                                       /* Bits 5 and 6 are used to determine the Destination address filter mode */
 #define METH_ACCEPT_MY 0                        /* 00: Accept PHY address only */
 #define METH_ACCEPT_MCAST 0x20  /* 01: Accept physical, broadcast, and multicast filter matches only */
 #define METH_ACCEPT_AMCAST 0x40 /* 10: Accept physical, broadcast, and all multicast packets */
diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
new file mode 100644
index 000000000000..0952a6528f58
--- /dev/null
+++ b/drivers/net/mlx4/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_MLX4_CORE)         += mlx4_core.o
+
+mlx4_core-y :=  alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \
+                mr.o pd.o profile.o qp.o reset.o srq.o
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
new file mode 100644
index 000000000000..dfbd5809d744
--- /dev/null
+++ b/drivers/net/mlx4/alloc.c
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/bitmap.h>
+#include <linux/dma-mapping.h>
+
+#include "mlx4.h"
+
+u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)
+{
+        u32 obj;
+
+        spin_lock(&bitmap->lock);
+
+        obj = find_next_zero_bit(bitmap->table, bitmap->max, bitmap->last);
+        if (obj >= bitmap->max) {
+                bitmap->top = (bitmap->top + bitmap->max) & bitmap->mask;
+                obj = find_first_zero_bit(bitmap->table, bitmap->max);
+        }
+
+        if (obj < bitmap->max) {
+                set_bit(obj, bitmap->table);
+                obj |= bitmap->top;
+                bitmap->last = obj + 1;
+        } else
+                obj = -1;
+
+        spin_unlock(&bitmap->lock);
+
+        return obj;
+}
+
+void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj)
+{
+        obj &= bitmap->max - 1;
+
+        spin_lock(&bitmap->lock);
+        clear_bit(obj, bitmap->table);
+        bitmap->last = min(bitmap->last, obj);
+        bitmap->top = (bitmap->top + bitmap->max) & bitmap->mask;
+        spin_unlock(&bitmap->lock);
+}
+
+int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask, u32 reserved)
+{
+        int i;
+
+        /* num must be a power of 2 */
+        if (num != roundup_pow_of_two(num))
+                return -EINVAL;
+
+        bitmap->last = 0;
+        bitmap->top  = 0;
+        bitmap->max  = num;
+        bitmap->mask = mask;
+        spin_lock_init(&bitmap->lock);
+        bitmap->table = kzalloc(BITS_TO_LONGS(num) * sizeof (long), GFP_KERNEL);
+        if (!bitmap->table)
+                return -ENOMEM;
+
+        for (i = 0; i < reserved; ++i)
+                set_bit(i, bitmap->table);
+
+        return 0;
+}
+
+void mlx4_bitmap_cleanup(struct mlx4_bitmap *bitmap)
+{
+        kfree(bitmap->table);
+}
+
+/*
+ * Handling for queue buffers -- we allocate a bunch of memory and
+ * register it in a memory region at HCA virtual address 0.  If the
+ * requested size is > max_direct, we split the allocation into
+ * multiple pages, so we don't require too much contiguous memory.
+ */
+
+int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
+                   struct mlx4_buf *buf)
+{
+        dma_addr_t t;
+
+        if (size <= max_direct) {
+                buf->nbufs        = 1;
+                buf->npages       = 1;
+                buf->page_shift   = get_order(size) + PAGE_SHIFT;
+                buf->u.direct.buf = dma_alloc_coherent(&dev->pdev->dev,
+                                                       size, &t, GFP_KERNEL);
+                if (!buf->u.direct.buf)
+                        return -ENOMEM;
+
+                buf->u.direct.map = t;
+
+                while (t & ((1 << buf->page_shift) - 1)) {
+                        --buf->page_shift;
+                        buf->npages *= 2;
+                }
+
+                memset(buf->u.direct.buf, 0, size);
+        } else {
+                int i;
+
+                buf->nbufs       = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+                buf->npages      = buf->nbufs;
+                buf->page_shift  = PAGE_SHIFT;
+                buf->u.page_list = kzalloc(buf->nbufs * sizeof *buf->u.page_list,
+                                           GFP_KERNEL);
+                if (!buf->u.page_list)
+                        return -ENOMEM;
+
+                for (i = 0; i < buf->nbufs; ++i) {
+                        buf->u.page_list[i].buf =
+                                dma_alloc_coherent(&dev->pdev->dev, PAGE_SIZE,
+                                                   &t, GFP_KERNEL);
+                        if (!buf->u.page_list[i].buf)
+                                goto err_free;
+
+                        buf->u.page_list[i].map = t;
+
+                        memset(buf->u.page_list[i].buf, 0, PAGE_SIZE);
+                }
+        }
+
+        return 0;
+
+err_free:
+        mlx4_buf_free(dev, size, buf);
+
+        return -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(mlx4_buf_alloc);
+
+void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf)
+{
+        int i;
+
+        if (buf->nbufs == 1)
+                dma_free_coherent(&dev->pdev->dev, size, buf->u.direct.buf,
+                                  buf->u.direct.map);
+        else {
+                for (i = 0; i < buf->nbufs; ++i)
+                        dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
+                                          buf->u.page_list[i].buf,
+                                          buf->u.page_list[i].map);
+                kfree(buf->u.page_list);
+        }
+}
+EXPORT_SYMBOL_GPL(mlx4_buf_free);
diff --git a/drivers/net/mlx4/catas.c b/drivers/net/mlx4/catas.c
new file mode 100644
index 000000000000..1bb088aeaf71
--- /dev/null
+++ b/drivers/net/mlx4/catas.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "mlx4.h"
+
+void mlx4_handle_catas_err(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        int i;
+
+        mlx4_err(dev, "Catastrophic error detected:\n");
+        for (i = 0; i < priv->fw.catas_size; ++i)
+                mlx4_err(dev, "  buf[%02x]: %08x\n",
+                         i, swab32(readl(priv->catas_err.map + i)));
+
+        mlx4_dispatch_event(dev, MLX4_EVENT_TYPE_LOCAL_CATAS_ERROR, 0, 0);
+}
+
+void mlx4_map_catas_buf(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        unsigned long addr;
+
+        addr = pci_resource_start(dev->pdev, priv->fw.catas_bar) +
+                priv->fw.catas_offset;
+
+        priv->catas_err.map = ioremap(addr, priv->fw.catas_size * 4);
+        if (!priv->catas_err.map)
+                mlx4_warn(dev, "Failed to map catastrophic error buffer at 0x%lx\n",
+                          addr);
+
+}
+
+void mlx4_unmap_catas_buf(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        if (priv->catas_err.map)
+                iounmap(priv->catas_err.map);
+}
diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c
new file mode 100644
index 000000000000..c1f81a993f5d
--- /dev/null
+++ b/drivers/net/mlx4/cmd.c
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include <asm/io.h>
+
+#include "mlx4.h"
+
+#define CMD_POLL_TOKEN 0xffff
+
+enum {
+        /* command completed successfully: */
+        CMD_STAT_OK             = 0x00,
+        /* Internal error (such as a bus error) occurred while processing command: */
+        CMD_STAT_INTERNAL_ERR   = 0x01,
+        /* Operation/command not supported or opcode modifier not supported: */
+        CMD_STAT_BAD_OP         = 0x02,
+        /* Parameter not supported or parameter out of range: */
+        CMD_STAT_BAD_PARAM      = 0x03,
+        /* System not enabled or bad system state: */
+        CMD_STAT_BAD_SYS_STATE  = 0x04,
+        /* Attempt to access reserved or unallocaterd resource: */
+        CMD_STAT_BAD_RESOURCE   = 0x05,
+        /* Requested resource is currently executing a command, or is otherwise busy: */
+        CMD_STAT_RESOURCE_BUSY  = 0x06,
+        /* Required capability exceeds device limits: */
+        CMD_STAT_EXCEED_LIM     = 0x08,
+        /* Resource is not in the appropriate state or ownership: */
+        CMD_STAT_BAD_RES_STATE  = 0x09,
+        /* Index out of range: */
+        CMD_STAT_BAD_INDEX      = 0x0a,
+        /* FW image corrupted: */
+        CMD_STAT_BAD_NVMEM      = 0x0b,
+        /* Attempt to modify a QP/EE which is not in the presumed state: */
+        CMD_STAT_BAD_QP_STATE   = 0x10,
+        /* Bad segment parameters (Address/Size): */
+        CMD_STAT_BAD_SEG_PARAM  = 0x20,
+        /* Memory Region has Memory Windows bound to: */
+        CMD_STAT_REG_BOUND      = 0x21,
+        /* HCA local attached memory not present: */
+        CMD_STAT_LAM_NOT_PRE    = 0x22,
+        /* Bad management packet (silently discarded): */
+        CMD_STAT_BAD_PKT        = 0x30,
+        /* More outstanding CQEs in CQ than new CQ size: */
+        CMD_STAT_BAD_SIZE       = 0x40
+};
+
+enum {
+        HCR_IN_PARAM_OFFSET     = 0x00,
+        HCR_IN_MODIFIER_OFFSET  = 0x08,
+        HCR_OUT_PARAM_OFFSET    = 0x0c,
+        HCR_TOKEN_OFFSET        = 0x14,
+        HCR_STATUS_OFFSET       = 0x18,
+
+        HCR_OPMOD_SHIFT         = 12,
+        HCR_T_BIT               = 21,
+        HCR_E_BIT               = 22,
+        HCR_GO_BIT              = 23
+};
+
+enum {
+        GO_BIT_TIMEOUT          = 10000
+};
+
+struct mlx4_cmd_context {
+        struct completion       done;
+        int                     result;
+        int                     next;
+        u64                     out_param;
+        u16                     token;
+};
+
+static int mlx4_status_to_errno(u8 status) {
+        static const int trans_table[] = {
+                [CMD_STAT_INTERNAL_ERR]   = -EIO,
+                [CMD_STAT_BAD_OP]         = -EPERM,
+                [CMD_STAT_BAD_PARAM]      = -EINVAL,
+                [CMD_STAT_BAD_SYS_STATE]  = -ENXIO,
+                [CMD_STAT_BAD_RESOURCE]   = -EBADF,
+                [CMD_STAT_RESOURCE_BUSY]  = -EBUSY,
+                [CMD_STAT_EXCEED_LIM]     = -ENOMEM,
+                [CMD_STAT_BAD_RES_STATE]  = -EBADF,
+                [CMD_STAT_BAD_INDEX]      = -EBADF,
+                [CMD_STAT_BAD_NVMEM]      = -EFAULT,
+                [CMD_STAT_BAD_QP_STATE]   = -EINVAL,
+                [CMD_STAT_BAD_SEG_PARAM]  = -EFAULT,
+                [CMD_STAT_REG_BOUND]      = -EBUSY,
+                [CMD_STAT_LAM_NOT_PRE]    = -EAGAIN,
+                [CMD_STAT_BAD_PKT]        = -EINVAL,
+                [CMD_STAT_BAD_SIZE]       = -ENOMEM,
+        };
+
+        if (status >= ARRAY_SIZE(trans_table) ||
+            (status != CMD_STAT_OK && trans_table[status] == 0))
+                return -EIO;
+
+        return trans_table[status];
+}
+
+static int cmd_pending(struct mlx4_dev *dev)
+{
+        u32 status = readl(mlx4_priv(dev)->cmd.hcr + HCR_STATUS_OFFSET);
+
+        return (status & swab32(1 << HCR_GO_BIT)) ||
+                (mlx4_priv(dev)->cmd.toggle ==
+                 !!(status & swab32(1 << HCR_T_BIT)));
+}
+
+static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,
+                         u32 in_modifier, u8 op_modifier, u16 op, u16 token,
+                         int event)
+{
+        struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd;
+        u32 __iomem *hcr = cmd->hcr;
+        int ret = -EAGAIN;
+        unsigned long end;
+
+        mutex_lock(&cmd->hcr_mutex);
+
+        end = jiffies;
+        if (event)
+                end += HZ * 10;
+
+        while (cmd_pending(dev)) {
+                if (time_after_eq(jiffies, end))
+                        goto out;
+                cond_resched();
+        }
+
+        /*
+         * We use writel (instead of something like memcpy_toio)
+         * because writes of less than 32 bits to the HCR don't work
+         * (and some architectures such as ia64 implement memcpy_toio
+         * in terms of writeb).
+         */
+        __raw_writel((__force u32) cpu_to_be32(in_param >> 32),           hcr + 0);
+        __raw_writel((__force u32) cpu_to_be32(in_param & 0xfffffffful),  hcr + 1);
+        __raw_writel((__force u32) cpu_to_be32(in_modifier),              hcr + 2);
+        __raw_writel((__force u32) cpu_to_be32(out_param >> 32),          hcr + 3);
+        __raw_writel((__force u32) cpu_to_be32(out_param & 0xfffffffful), hcr + 4);
+        __raw_writel((__force u32) cpu_to_be32(token << 16),              hcr + 5);
+
+        /* __raw_writel may not order writes. */
+        wmb();
+
+        __raw_writel((__force u32) cpu_to_be32((1 << HCR_GO_BIT)                |
+                                               (cmd->toggle << HCR_T_BIT)       |
+                                               (event ? (1 << HCR_E_BIT) : 0)   |
+                                               (op_modifier << HCR_OPMOD_SHIFT) |
+                                               op),                       hcr + 6);
+        cmd->toggle = cmd->toggle ^ 1;
+
+        ret = 0;
+
+out:
+        mutex_unlock(&cmd->hcr_mutex);
+        return ret;
+}
+
+static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
+                         int out_is_imm, u32 in_modifier, u8 op_modifier,
+                         u16 op, unsigned long timeout)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        void __iomem *hcr = priv->cmd.hcr;
+        int err = 0;
+        unsigned long end;
+
+        down(&priv->cmd.poll_sem);
+
+        err = mlx4_cmd_post(dev, in_param, out_param ? *out_param : 0,
+                            in_modifier, op_modifier, op, CMD_POLL_TOKEN, 0);
+        if (err)
+                goto out;
+
+        end = msecs_to_jiffies(timeout) + jiffies;
+        while (cmd_pending(dev) && time_before(jiffies, end))
+                cond_resched();
+
+        if (cmd_pending(dev)) {
+                err = -ETIMEDOUT;
+                goto out;
+        }
+
+        if (out_is_imm)
+                *out_param =
+                        (u64) be32_to_cpu((__force __be32)
+                                          __raw_readl(hcr + HCR_OUT_PARAM_OFFSET)) << 32 |
+                        (u64) be32_to_cpu((__force __be32)
+                                          __raw_readl(hcr + HCR_OUT_PARAM_OFFSET + 4));
+
+        err = mlx4_status_to_errno(be32_to_cpu((__force __be32)
+                                               __raw_readl(hcr + HCR_STATUS_OFFSET)) >> 24);
+
+out:
+        up(&priv->cmd.poll_sem);
+        return err;
+}
+
+void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 status, u64 out_param)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cmd_context *context =
+                &priv->cmd.context[token & priv->cmd.token_mask];
+
+        /* previously timed out command completing at long last */
+        if (token != context->token)
+                return;
+
+        context->result    = mlx4_status_to_errno(status);
+        context->out_param = out_param;
+
+        context->token += priv->cmd.token_mask + 1;
+
+        complete(&context->done);
+}
+
+static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
+                         int out_is_imm, u32 in_modifier, u8 op_modifier,
+                         u16 op, unsigned long timeout)
+{
+        struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd;
+        struct mlx4_cmd_context *context;
+        int err = 0;
+
+        down(&cmd->event_sem);
+
+        spin_lock(&cmd->context_lock);
+        BUG_ON(cmd->free_head < 0);
+        context = &cmd->context[cmd->free_head];
+        cmd->free_head = context->next;
+        spin_unlock(&cmd->context_lock);
+
+        init_completion(&context->done);
+
+        mlx4_cmd_post(dev, in_param, out_param ? *out_param : 0,
+                      in_modifier, op_modifier, op, context->token, 1);
+
+        if (!wait_for_completion_timeout(&context->done, msecs_to_jiffies(timeout))) {
+                err = -EBUSY;
+                goto out;
+        }
+
+        err = context->result;
+        if (err)
+                goto out;
+
+        if (out_is_imm)
+                *out_param = context->out_param;
+
+out:
+        spin_lock(&cmd->context_lock);
+        context->next = cmd->free_head;
+        cmd->free_head = context - cmd->context;
+        spin_unlock(&cmd->context_lock);
+
+        up(&cmd->event_sem);
+        return err;
+}
+
+int __mlx4_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
+               int out_is_imm, u32 in_modifier, u8 op_modifier,
+               u16 op, unsigned long timeout)
+{
+        if (mlx4_priv(dev)->cmd.use_events)
+                return mlx4_cmd_wait(dev, in_param, out_param, out_is_imm,
+                                     in_modifier, op_modifier, op, timeout);
+        else
+                return mlx4_cmd_poll(dev, in_param, out_param, out_is_imm,
+                                     in_modifier, op_modifier, op, timeout);
+}
+EXPORT_SYMBOL_GPL(__mlx4_cmd);
+
+int mlx4_cmd_init(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        mutex_init(&priv->cmd.hcr_mutex);
+        sema_init(&priv->cmd.poll_sem, 1);
+        priv->cmd.use_events = 0;
+        priv->cmd.toggle     = 1;
+
+        priv->cmd.hcr = ioremap(pci_resource_start(dev->pdev, 0) + MLX4_HCR_BASE,
+                                MLX4_HCR_SIZE);
+        if (!priv->cmd.hcr) {
+                mlx4_err(dev, "Couldn't map command register.");
+                return -ENOMEM;
+        }
+
+        priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev,
+                                         MLX4_MAILBOX_SIZE,
+                                         MLX4_MAILBOX_SIZE, 0);
+        if (!priv->cmd.pool) {
+                iounmap(priv->cmd.hcr);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+void mlx4_cmd_cleanup(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        pci_pool_destroy(priv->cmd.pool);
+        iounmap(priv->cmd.hcr);
+}
+
+/*
+ * Switch to using events to issue FW commands (can only be called
+ * after event queue for command events has been initialized).
+ */
+int mlx4_cmd_use_events(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int i;
+
+        priv->cmd.context = kmalloc(priv->cmd.max_cmds *
+                                   sizeof (struct mlx4_cmd_context),
+                                   GFP_KERNEL);
+        if (!priv->cmd.context)
+                return -ENOMEM;
+
+        for (i = 0; i < priv->cmd.max_cmds; ++i) {
+                priv->cmd.context[i].token = i;
+                priv->cmd.context[i].next  = i + 1;
+        }
+
+        priv->cmd.context[priv->cmd.max_cmds - 1].next = -1;
+        priv->cmd.free_head = 0;
+
+        sema_init(&priv->cmd.event_sem, priv->cmd.max_cmds);
+        spin_lock_init(&priv->cmd.context_lock);
+
+        for (priv->cmd.token_mask = 1;
+             priv->cmd.token_mask < priv->cmd.max_cmds;
+             priv->cmd.token_mask <<= 1)
+                ; /* nothing */
+        --priv->cmd.token_mask;
+
+        priv->cmd.use_events = 1;
+
+        down(&priv->cmd.poll_sem);
+
+        return 0;
+}
+
+/*
+ * Switch back to polling (used when shutting down the device)
+ */
+void mlx4_cmd_use_polling(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int i;
+
+        priv->cmd.use_events = 0;
+
+        for (i = 0; i < priv->cmd.max_cmds; ++i)
+                down(&priv->cmd.event_sem);
+
+        kfree(priv->cmd.context);
+
+        up(&priv->cmd.poll_sem);
+}
+
+struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+
+        mailbox = kmalloc(sizeof *mailbox, GFP_KERNEL);
+        if (!mailbox)
+                return ERR_PTR(-ENOMEM);
+
+        mailbox->buf = pci_pool_alloc(mlx4_priv(dev)->cmd.pool, GFP_KERNEL,
+                                      &mailbox->dma);
+        if (!mailbox->buf) {
+                kfree(mailbox);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        return mailbox;
+}
+EXPORT_SYMBOL_GPL(mlx4_alloc_cmd_mailbox);
+
+void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox)
+{
+        if (!mailbox)
+                return;
+
+        pci_pool_free(mlx4_priv(dev)->cmd.pool, mailbox->buf, mailbox->dma);
+        kfree(mailbox);
+}
+EXPORT_SYMBOL_GPL(mlx4_free_cmd_mailbox);
diff --git a/drivers/net/mlx4/cq.c b/drivers/net/mlx4/cq.c
new file mode 100644
index 000000000000..437d78ad0912
--- /dev/null
+++ b/drivers/net/mlx4/cq.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/hardirq.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4.h"
+#include "icm.h"
+
+struct mlx4_cq_context {
+        __be32                  flags;
+        u16                     reserved1[3];
+        __be16                  page_offset;
+        __be32                  logsize_usrpage;
+        u8                      reserved2;
+        u8                      cq_period;
+        u8                      reserved3;
+        u8                      cq_max_count;
+        u8                      reserved4[3];
+        u8                      comp_eqn;
+        u8                      log_page_size;
+        u8                      reserved5[2];
+        u8                      mtt_base_addr_h;
+        __be32                  mtt_base_addr_l;
+        __be32                  last_notified_index;
+        __be32                  solicit_producer_index;
+        __be32                  consumer_index;
+        __be32                  producer_index;
+        u8                      reserved6[2];
+        __be64                  db_rec_addr;
+};
+
+#define MLX4_CQ_STATUS_OK               ( 0 << 28)
+#define MLX4_CQ_STATUS_OVERFLOW         ( 9 << 28)
+#define MLX4_CQ_STATUS_WRITE_FAIL       (10 << 28)
+#define MLX4_CQ_FLAG_CC                 ( 1 << 18)
+#define MLX4_CQ_FLAG_OI                 ( 1 << 17)
+#define MLX4_CQ_STATE_ARMED             ( 9 <<  8)
+#define MLX4_CQ_STATE_ARMED_SOL         ( 6 <<  8)
+#define MLX4_EQ_STATE_FIRED             (10 <<  8)
+
+void mlx4_cq_completion(struct mlx4_dev *dev, u32 cqn)
+{
+        struct mlx4_cq *cq;
+
+        cq = radix_tree_lookup(&mlx4_priv(dev)->cq_table.tree,
+                               cqn & (dev->caps.num_cqs - 1));
+        if (!cq) {
+                mlx4_warn(dev, "Completion event for bogus CQ %08x\n", cqn);
+                return;
+        }
+
+        ++cq->arm_sn;
+
+        cq->comp(cq);
+}
+
+void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type)
+{
+        struct mlx4_cq_table *cq_table = &mlx4_priv(dev)->cq_table;
+        struct mlx4_cq *cq;
+
+        spin_lock(&cq_table->lock);
+
+        cq = radix_tree_lookup(&cq_table->tree, cqn & (dev->caps.num_cqs - 1));
+        if (cq)
+                atomic_inc(&cq->refcount);
+
+        spin_unlock(&cq_table->lock);
+
+        if (!cq) {
+                mlx4_warn(dev, "Async event for bogus CQ %08x\n", cqn);
+                return;
+        }
+
+        cq->event(cq, event_type);
+
+        if (atomic_dec_and_test(&cq->refcount))
+                complete(&cq->free);
+}
+
+static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                         int cq_num)
+{
+        return mlx4_cmd(dev, mailbox->dma, cq_num, 0, MLX4_CMD_SW2HW_CQ,
+                        MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                         int cq_num)
+{
+        return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0, cq_num,
+                            mailbox ? 0 : 1, MLX4_CMD_HW2SW_CQ,
+                            MLX4_CMD_TIME_CLASS_A);
+}
+
+int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
+                  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cq_table *cq_table = &priv->cq_table;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_cq_context *cq_context;
+        u64 mtt_addr;
+        int err;
+
+        cq->cqn = mlx4_bitmap_alloc(&cq_table->bitmap);
+        if (cq->cqn == -1)
+                return -ENOMEM;
+
+        err = mlx4_table_get(dev, &cq_table->table, cq->cqn);
+        if (err)
+                goto err_out;
+
+        err = mlx4_table_get(dev, &cq_table->cmpt_table, cq->cqn);
+        if (err)
+                goto err_put;
+
+        spin_lock_irq(&cq_table->lock);
+        err = radix_tree_insert(&cq_table->tree, cq->cqn, cq);
+        spin_unlock_irq(&cq_table->lock);
+        if (err)
+                goto err_cmpt_put;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                err = PTR_ERR(mailbox);
+                goto err_radix;
+        }
+
+        cq_context = mailbox->buf;
+        memset(cq_context, 0, sizeof *cq_context);
+
+        cq_context->logsize_usrpage = cpu_to_be32((ilog2(nent) << 24) | uar->index);
+        cq_context->comp_eqn        = priv->eq_table.eq[MLX4_EQ_COMP].eqn;
+        cq_context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
+
+        mtt_addr = mlx4_mtt_addr(dev, mtt);
+        cq_context->mtt_base_addr_h = mtt_addr >> 32;
+        cq_context->mtt_base_addr_l = cpu_to_be32(mtt_addr & 0xffffffff);
+        cq_context->db_rec_addr     = cpu_to_be64(db_rec);
+
+        err = mlx4_SW2HW_CQ(dev, mailbox, cq->cqn);
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        if (err)
+                goto err_radix;
+
+        cq->cons_index = 0;
+        cq->arm_sn     = 1;
+        cq->uar        = uar;
+        atomic_set(&cq->refcount, 1);
+        init_completion(&cq->free);
+
+        return 0;
+
+err_radix:
+        spin_lock_irq(&cq_table->lock);
+        radix_tree_delete(&cq_table->tree, cq->cqn);
+        spin_unlock_irq(&cq_table->lock);
+
+err_cmpt_put:
+        mlx4_table_put(dev, &cq_table->cmpt_table, cq->cqn);
+
+err_put:
+        mlx4_table_put(dev, &cq_table->table, cq->cqn);
+
+err_out:
+        mlx4_bitmap_free(&cq_table->bitmap, cq->cqn);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_cq_alloc);
+
+void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cq_table *cq_table = &priv->cq_table;
+        int err;
+
+        err = mlx4_HW2SW_CQ(dev, NULL, cq->cqn);
+        if (err)
+                mlx4_warn(dev, "HW2SW_CQ failed (%d) for CQN %06x\n", err, cq->cqn);
+
+        synchronize_irq(priv->eq_table.eq[MLX4_EQ_COMP].irq);
+
+        spin_lock_irq(&cq_table->lock);
+        radix_tree_delete(&cq_table->tree, cq->cqn);
+        spin_unlock_irq(&cq_table->lock);
+
+        if (atomic_dec_and_test(&cq->refcount))
+                complete(&cq->free);
+        wait_for_completion(&cq->free);
+
+        mlx4_table_put(dev, &cq_table->table, cq->cqn);
+        mlx4_bitmap_free(&cq_table->bitmap, cq->cqn);
+}
+EXPORT_SYMBOL_GPL(mlx4_cq_free);
+
+int __devinit mlx4_init_cq_table(struct mlx4_dev *dev)
+{
+        struct mlx4_cq_table *cq_table = &mlx4_priv(dev)->cq_table;
+        int err;
+
+        spin_lock_init(&cq_table->lock);
+        INIT_RADIX_TREE(&cq_table->tree, GFP_ATOMIC);
+
+        err = mlx4_bitmap_init(&cq_table->bitmap, dev->caps.num_cqs,
+                               dev->caps.num_cqs - 1, dev->caps.reserved_cqs);
+        if (err)
+                return err;
+
+        return 0;
+}
+
+void mlx4_cleanup_cq_table(struct mlx4_dev *dev)
+{
+        /* Nothing to do to clean up radix_tree */
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->cq_table.bitmap);
+}
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c
new file mode 100644
index 000000000000..0f11adb8eb4a
--- /dev/null
+++ b/drivers/net/mlx4/eq.c
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4.h"
+#include "fw.h"
+
+enum {
+        MLX4_NUM_ASYNC_EQE      = 0x100,
+        MLX4_NUM_SPARE_EQE      = 0x80,
+        MLX4_EQ_ENTRY_SIZE      = 0x20
+};
+
+/*
+ * Must be packed because start is 64 bits but only aligned to 32 bits.
+ */
+struct mlx4_eq_context {
+        __be32                  flags;
+        u16                     reserved1[3];
+        __be16                  page_offset;
+        u8                      log_eq_size;
+        u8                      reserved2[4];
+        u8                      eq_period;
+        u8                      reserved3;
+        u8                      eq_max_count;
+        u8                      reserved4[3];
+        u8                      intr;
+        u8                      log_page_size;
+        u8                      reserved5[2];
+        u8                      mtt_base_addr_h;
+        __be32                  mtt_base_addr_l;
+        u32                     reserved6[2];
+        __be32                  consumer_index;
+        __be32                  producer_index;
+        u32                     reserved7[4];
+};
+
+#define MLX4_EQ_STATUS_OK          ( 0 << 28)
+#define MLX4_EQ_STATUS_WRITE_FAIL  (10 << 28)
+#define MLX4_EQ_OWNER_SW           ( 0 << 24)
+#define MLX4_EQ_OWNER_HW           ( 1 << 24)
+#define MLX4_EQ_FLAG_EC            ( 1 << 18)
+#define MLX4_EQ_FLAG_OI            ( 1 << 17)
+#define MLX4_EQ_STATE_ARMED        ( 9 <<  8)
+#define MLX4_EQ_STATE_FIRED        (10 <<  8)
+#define MLX4_EQ_STATE_ALWAYS_ARMED (11 <<  8)
+
+#define MLX4_ASYNC_EVENT_MASK ((1ull << MLX4_EVENT_TYPE_PATH_MIG)           | \
+                               (1ull << MLX4_EVENT_TYPE_COMM_EST)           | \
+                               (1ull << MLX4_EVENT_TYPE_SQ_DRAINED)         | \
+                               (1ull << MLX4_EVENT_TYPE_CQ_ERROR)           | \
+                               (1ull << MLX4_EVENT_TYPE_WQ_CATAS_ERROR)     | \
+                               (1ull << MLX4_EVENT_TYPE_EEC_CATAS_ERROR)    | \
+                               (1ull << MLX4_EVENT_TYPE_PATH_MIG_FAILED)    | \
+                               (1ull << MLX4_EVENT_TYPE_WQ_INVAL_REQ_ERROR) | \
+                               (1ull << MLX4_EVENT_TYPE_WQ_ACCESS_ERROR)    | \
+                               (1ull << MLX4_EVENT_TYPE_LOCAL_CATAS_ERROR)  | \
+                               (1ull << MLX4_EVENT_TYPE_PORT_CHANGE)        | \
+                               (1ull << MLX4_EVENT_TYPE_ECC_DETECT)         | \
+                               (1ull << MLX4_EVENT_TYPE_SRQ_CATAS_ERROR)    | \
+                               (1ull << MLX4_EVENT_TYPE_SRQ_QP_LAST_WQE)    | \
+                               (1ull << MLX4_EVENT_TYPE_SRQ_LIMIT)          | \
+                               (1ull << MLX4_EVENT_TYPE_CMD))
+#define MLX4_CATAS_EVENT_MASK  (1ull << MLX4_EVENT_TYPE_LOCAL_CATAS_ERROR)
+
+struct mlx4_eqe {
+        u8                      reserved1;
+        u8                      type;
+        u8                      reserved2;
+        u8                      subtype;
+        union {
+                u32             raw[6];
+                struct {
+                        __be32  cqn;
+                } __attribute__((packed)) comp;
+                struct {
+                        u16     reserved1;
+                        __be16  token;
+                        u32     reserved2;
+                        u8      reserved3[3];
+                        u8      status;
+                        __be64  out_param;
+                } __attribute__((packed)) cmd;
+                struct {
+                        __be32  qpn;
+                } __attribute__((packed)) qp;
+                struct {
+                        __be32  srqn;
+                } __attribute__((packed)) srq;
+                struct {
+                        __be32  cqn;
+                        u32     reserved1;
+                        u8      reserved2[3];
+                        u8      syndrome;
+                } __attribute__((packed)) cq_err;
+                struct {
+                        u32     reserved1[2];
+                        __be32  port;
+                } __attribute__((packed)) port_change;
+        }                       event;
+        u8                      reserved3[3];
+        u8                      owner;
+} __attribute__((packed));
+
+static void eq_set_ci(struct mlx4_eq *eq, int req_not)
+{
+        __raw_writel((__force u32) cpu_to_be32((eq->cons_index & 0xffffff) |
+                                               req_not << 31),
+                     eq->doorbell);
+        /* We still want ordering, just not swabbing, so add a barrier */
+        mb();
+}
+
+static struct mlx4_eqe *get_eqe(struct mlx4_eq *eq, u32 entry)
+{
+        unsigned long off = (entry & (eq->nent - 1)) * MLX4_EQ_ENTRY_SIZE;
+        return eq->page_list[off / PAGE_SIZE].buf + off % PAGE_SIZE;
+}
+
+static struct mlx4_eqe *next_eqe_sw(struct mlx4_eq *eq)
+{
+        struct mlx4_eqe *eqe = get_eqe(eq, eq->cons_index);
+        return !!(eqe->owner & 0x80) ^ !!(eq->cons_index & eq->nent) ? NULL : eqe;
+}
+
+static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
+{
+        struct mlx4_eqe *eqe;
+        int cqn;
+        int eqes_found = 0;
+        int set_ci = 0;
+
+        while ((eqe = next_eqe_sw(eq))) {
+                /*
+                 * Make sure we read EQ entry contents after we've
+                 * checked the ownership bit.
+                 */
+                rmb();
+
+                switch (eqe->type) {
+                case MLX4_EVENT_TYPE_COMP:
+                        cqn = be32_to_cpu(eqe->event.comp.cqn) & 0xffffff;
+                        mlx4_cq_completion(dev, cqn);
+                        break;
+
+                case MLX4_EVENT_TYPE_PATH_MIG:
+                case MLX4_EVENT_TYPE_COMM_EST:
+                case MLX4_EVENT_TYPE_SQ_DRAINED:
+                case MLX4_EVENT_TYPE_SRQ_QP_LAST_WQE:
+                case MLX4_EVENT_TYPE_WQ_CATAS_ERROR:
+                case MLX4_EVENT_TYPE_PATH_MIG_FAILED:
+                case MLX4_EVENT_TYPE_WQ_INVAL_REQ_ERROR:
+                case MLX4_EVENT_TYPE_WQ_ACCESS_ERROR:
+                        mlx4_qp_event(dev, be32_to_cpu(eqe->event.qp.qpn) & 0xffffff,
+                                      eqe->type);
+                        break;
+
+                case MLX4_EVENT_TYPE_SRQ_LIMIT:
+                case MLX4_EVENT_TYPE_SRQ_CATAS_ERROR:
+                        mlx4_srq_event(dev, be32_to_cpu(eqe->event.srq.srqn) & 0xffffff,
+                                      eqe->type);
+                        break;
+
+                case MLX4_EVENT_TYPE_CMD:
+                        mlx4_cmd_event(dev,
+                                       be16_to_cpu(eqe->event.cmd.token),
+                                       eqe->event.cmd.status,
+                                       be64_to_cpu(eqe->event.cmd.out_param));
+                        break;
+
+                case MLX4_EVENT_TYPE_PORT_CHANGE:
+                        mlx4_dispatch_event(dev, eqe->type, eqe->subtype,
+                                            be32_to_cpu(eqe->event.port_change.port) >> 28);
+                        break;
+
+                case MLX4_EVENT_TYPE_CQ_ERROR:
+                        mlx4_warn(dev, "CQ %s on CQN %06x\n",
+                                  eqe->event.cq_err.syndrome == 1 ?
+                                  "overrun" : "access violation",
+                                  be32_to_cpu(eqe->event.cq_err.cqn) & 0xffffff);
+                        mlx4_cq_event(dev, be32_to_cpu(eqe->event.cq_err.cqn),
+                                      eqe->type);
+                        break;
+
+                case MLX4_EVENT_TYPE_EQ_OVERFLOW:
+                        mlx4_warn(dev, "EQ overrun on EQN %d\n", eq->eqn);
+                        break;
+
+                case MLX4_EVENT_TYPE_EEC_CATAS_ERROR:
+                case MLX4_EVENT_TYPE_ECC_DETECT:
+                default:
+                        mlx4_warn(dev, "Unhandled event %02x(%02x) on EQ %d at index %u\n",
+                                  eqe->type, eqe->subtype, eq->eqn, eq->cons_index);
+                        break;
+                };
+
+                ++eq->cons_index;
+                eqes_found = 1;
+                ++set_ci;
+
+                /*
+                 * The HCA will think the queue has overflowed if we
+                 * don't tell it we've been processing events.  We
+                 * create our EQs with MLX4_NUM_SPARE_EQE extra
+                 * entries, so we must update our consumer index at
+                 * least that often.
+                 */
+                if (unlikely(set_ci >= MLX4_NUM_SPARE_EQE)) {
+                        /*
+                         * Conditional on hca_type is OK here because
+                         * this is a rare case, not the fast path.
+                         */
+                        eq_set_ci(eq, 0);
+                        set_ci = 0;
+                }
+        }
+
+        eq_set_ci(eq, 1);
+
+        return eqes_found;
+}
+
+static irqreturn_t mlx4_interrupt(int irq, void *dev_ptr)
+{
+        struct mlx4_dev *dev = dev_ptr;
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int work = 0;
+        int i;
+
+        writel(priv->eq_table.clr_mask, priv->eq_table.clr_int);
+
+        for (i = 0; i < MLX4_EQ_CATAS; ++i)
+                work |= mlx4_eq_int(dev, &priv->eq_table.eq[i]);
+
+        return IRQ_RETVAL(work);
+}
+
+static irqreturn_t mlx4_msi_x_interrupt(int irq, void *eq_ptr)
+{
+        struct mlx4_eq  *eq  = eq_ptr;
+        struct mlx4_dev *dev = eq->dev;
+
+        mlx4_eq_int(dev, eq);
+
+        /* MSI-X vectors always belong to us */
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t mlx4_catas_interrupt(int irq, void *dev_ptr)
+{
+        mlx4_handle_catas_err(dev_ptr);
+
+        /* MSI-X vectors always belong to us */
+        return IRQ_HANDLED;
+}
+
+static int mlx4_MAP_EQ(struct mlx4_dev *dev, u64 event_mask, int unmap,
+                        int eq_num)
+{
+        return mlx4_cmd(dev, event_mask, (unmap << 31) | eq_num,
+                        0, MLX4_CMD_MAP_EQ, MLX4_CMD_TIME_CLASS_B);
+}
+
+static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                         int eq_num)
+{
+        return mlx4_cmd(dev, mailbox->dma, eq_num, 0, MLX4_CMD_SW2HW_EQ,
+                        MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_HW2SW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                         int eq_num)
+{
+        return mlx4_cmd_box(dev, 0, mailbox->dma, eq_num, 0, MLX4_CMD_HW2SW_EQ,
+                            MLX4_CMD_TIME_CLASS_A);
+}
+
+static void __devinit __iomem *mlx4_get_eq_uar(struct mlx4_dev *dev,
+                                               struct mlx4_eq *eq)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int index;
+
+        index = eq->eqn / 4 - dev->caps.reserved_eqs / 4;
+
+        if (!priv->eq_table.uar_map[index]) {
+                priv->eq_table.uar_map[index] =
+                        ioremap(pci_resource_start(dev->pdev, 2) +
+                                ((eq->eqn / 4) << PAGE_SHIFT),
+                                PAGE_SIZE);
+                if (!priv->eq_table.uar_map[index]) {
+                        mlx4_err(dev, "Couldn't map EQ doorbell for EQN 0x%06x\n",
+                                 eq->eqn);
+                        return NULL;
+                }
+        }
+
+        return priv->eq_table.uar_map[index] + 0x800 + 8 * (eq->eqn % 4);
+}
+
+static int __devinit mlx4_create_eq(struct mlx4_dev *dev, int nent,
+                                    u8 intr, struct mlx4_eq *eq)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_eq_context *eq_context;
+        int npages;
+        u64 *dma_list = NULL;
+        dma_addr_t t;
+        u64 mtt_addr;
+        int err = -ENOMEM;
+        int i;
+
+        eq->dev   = dev;
+        eq->nent  = roundup_pow_of_two(max(nent, 2));
+        npages = PAGE_ALIGN(eq->nent * MLX4_EQ_ENTRY_SIZE) / PAGE_SIZE;
+
+        eq->page_list = kmalloc(npages * sizeof *eq->page_list,
+                                GFP_KERNEL);
+        if (!eq->page_list)
+                goto err_out;
+
+        for (i = 0; i < npages; ++i)
+                eq->page_list[i].buf = NULL;
+
+        dma_list = kmalloc(npages * sizeof *dma_list, GFP_KERNEL);
+        if (!dma_list)
+                goto err_out_free;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                goto err_out_free;
+        eq_context = mailbox->buf;
+
+        for (i = 0; i < npages; ++i) {
+                eq->page_list[i].buf = dma_alloc_coherent(&dev->pdev->dev,
+                                                          PAGE_SIZE, &t, GFP_KERNEL);
+                if (!eq->page_list[i].buf)
+                        goto err_out_free_pages;
+
+                dma_list[i] = t;
+                eq->page_list[i].map = t;
+
+                memset(eq->page_list[i].buf, 0, PAGE_SIZE);
+        }
+
+        eq->eqn = mlx4_bitmap_alloc(&priv->eq_table.bitmap);
+        if (eq->eqn == -1)
+                goto err_out_free_pages;
+
+        eq->doorbell = mlx4_get_eq_uar(dev, eq);
+        if (!eq->doorbell) {
+                err = -ENOMEM;
+                goto err_out_free_eq;
+        }
+
+        err = mlx4_mtt_init(dev, npages, PAGE_SHIFT, &eq->mtt);
+        if (err)
+                goto err_out_free_eq;
+
+        err = mlx4_write_mtt(dev, &eq->mtt, 0, npages, dma_list);
+        if (err)
+                goto err_out_free_mtt;
+
+        memset(eq_context, 0, sizeof *eq_context);
+        eq_context->flags         = cpu_to_be32(MLX4_EQ_STATUS_OK   |
+                                                MLX4_EQ_STATE_ARMED);
+        eq_context->log_eq_size   = ilog2(eq->nent);
+        eq_context->intr          = intr;
+        eq_context->log_page_size = PAGE_SHIFT - MLX4_ICM_PAGE_SHIFT;
+
+        mtt_addr = mlx4_mtt_addr(dev, &eq->mtt);
+        eq_context->mtt_base_addr_h = mtt_addr >> 32;
+        eq_context->mtt_base_addr_l = cpu_to_be32(mtt_addr & 0xffffffff);
+
+        err = mlx4_SW2HW_EQ(dev, mailbox, eq->eqn);
+        if (err) {
+                mlx4_warn(dev, "SW2HW_EQ failed (%d)\n", err);
+                goto err_out_free_mtt;
+        }
+
+        kfree(dma_list);
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+        eq->cons_index = 0;
+
+        return err;
+
+err_out_free_mtt:
+        mlx4_mtt_cleanup(dev, &eq->mtt);
+
+err_out_free_eq:
+        mlx4_bitmap_free(&priv->eq_table.bitmap, eq->eqn);
+
+err_out_free_pages:
+        for (i = 0; i < npages; ++i)
+                if (eq->page_list[i].buf)
+                        dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
+                                          eq->page_list[i].buf,
+                                          eq->page_list[i].map);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+err_out_free:
+        kfree(eq->page_list);
+        kfree(dma_list);
+
+err_out:
+        return err;
+}
+
+static void mlx4_free_eq(struct mlx4_dev *dev,
+                         struct mlx4_eq *eq)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cmd_mailbox *mailbox;
+        int err;
+        int npages = PAGE_ALIGN(MLX4_EQ_ENTRY_SIZE * eq->nent) / PAGE_SIZE;
+        int i;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return;
+
+        err = mlx4_HW2SW_EQ(dev, mailbox, eq->eqn);
+        if (err)
+                mlx4_warn(dev, "HW2SW_EQ failed (%d)\n", err);
+
+        if (0) {
+                mlx4_dbg(dev, "Dumping EQ context %02x:\n", eq->eqn);
+                for (i = 0; i < sizeof (struct mlx4_eq_context) / 4; ++i) {
+                        if (i % 4 == 0)
+                                printk("[%02x] ", i * 4);
+                        printk(" %08x", be32_to_cpup(mailbox->buf + i * 4));
+                        if ((i + 1) % 4 == 0)
+                                printk("\n");
+                }
+        }
+
+        mlx4_mtt_cleanup(dev, &eq->mtt);
+        for (i = 0; i < npages; ++i)
+                pci_free_consistent(dev->pdev, PAGE_SIZE,
+                                    eq->page_list[i].buf,
+                                    eq->page_list[i].map);
+
+        kfree(eq->page_list);
+        mlx4_bitmap_free(&priv->eq_table.bitmap, eq->eqn);
+        mlx4_free_cmd_mailbox(dev, mailbox);
+}
+
+static void mlx4_free_irqs(struct mlx4_dev *dev)
+{
+        struct mlx4_eq_table *eq_table = &mlx4_priv(dev)->eq_table;
+        int i;
+
+        if (eq_table->have_irq)
+                free_irq(dev->pdev->irq, dev);
+        for (i = 0; i < MLX4_NUM_EQ; ++i)
+                if (eq_table->eq[i].have_irq)
+                        free_irq(eq_table->eq[i].irq, eq_table->eq + i);
+}
+
+static int __devinit mlx4_map_clr_int(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        priv->clr_base = ioremap(pci_resource_start(dev->pdev, priv->fw.clr_int_bar) +
+                                 priv->fw.clr_int_base, MLX4_CLR_INT_SIZE);
+        if (!priv->clr_base) {
+                mlx4_err(dev, "Couldn't map interrupt clear register, aborting.\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void mlx4_unmap_clr_int(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        iounmap(priv->clr_base);
+}
+
+int __devinit mlx4_map_eq_icm(struct mlx4_dev *dev, u64 icm_virt)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int ret;
+
+        /*
+         * We assume that mapping one page is enough for the whole EQ
+         * context table.  This is fine with all current HCAs, because
+         * we only use 32 EQs and each EQ uses 64 bytes of context
+         * memory, or 1 KB total.
+         */
+        priv->eq_table.icm_virt = icm_virt;
+        priv->eq_table.icm_page = alloc_page(GFP_HIGHUSER);
+        if (!priv->eq_table.icm_page)
+                return -ENOMEM;
+        priv->eq_table.icm_dma  = pci_map_page(dev->pdev, priv->eq_table.icm_page, 0,
+                                               PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+        if (pci_dma_mapping_error(priv->eq_table.icm_dma)) {
+                __free_page(priv->eq_table.icm_page);
+                return -ENOMEM;
+        }
+
+        ret = mlx4_MAP_ICM_page(dev, priv->eq_table.icm_dma, icm_virt);
+        if (ret) {
+                pci_unmap_page(dev->pdev, priv->eq_table.icm_dma, PAGE_SIZE,
+                               PCI_DMA_BIDIRECTIONAL);
+                __free_page(priv->eq_table.icm_page);
+        }
+
+        return ret;
+}
+
+void mlx4_unmap_eq_icm(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        mlx4_UNMAP_ICM(dev, priv->eq_table.icm_virt, 1);
+        pci_unmap_page(dev->pdev, priv->eq_table.icm_dma, PAGE_SIZE,
+                       PCI_DMA_BIDIRECTIONAL);
+        __free_page(priv->eq_table.icm_page);
+}
+
+int __devinit mlx4_init_eq_table(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+        int i;
+
+        err = mlx4_bitmap_init(&priv->eq_table.bitmap, dev->caps.num_eqs,
+                               dev->caps.num_eqs - 1, dev->caps.reserved_eqs);
+        if (err)
+                return err;
+
+        for (i = 0; i < ARRAY_SIZE(priv->eq_table.uar_map); ++i)
+                priv->eq_table.uar_map[i] = NULL;
+
+        err = mlx4_map_clr_int(dev);
+        if (err)
+                goto err_out_free;
+
+        priv->eq_table.clr_mask =
+                swab32(1 << (priv->eq_table.inta_pin & 31));
+        priv->eq_table.clr_int  = priv->clr_base +
+                (priv->eq_table.inta_pin < 32 ? 4 : 0);
+
+        err = mlx4_create_eq(dev, dev->caps.num_cqs + MLX4_NUM_SPARE_EQE,
+                             (dev->flags & MLX4_FLAG_MSI_X) ? MLX4_EQ_COMP : 0,
+                             &priv->eq_table.eq[MLX4_EQ_COMP]);
+        if (err)
+                goto err_out_unmap;
+
+        err = mlx4_create_eq(dev, MLX4_NUM_ASYNC_EQE + MLX4_NUM_SPARE_EQE,
+                             (dev->flags & MLX4_FLAG_MSI_X) ? MLX4_EQ_ASYNC : 0,
+                             &priv->eq_table.eq[MLX4_EQ_ASYNC]);
+        if (err)
+                goto err_out_comp;
+
+        if (dev->flags & MLX4_FLAG_MSI_X) {
+                static const char *eq_name[] = {
+                        [MLX4_EQ_COMP]  = DRV_NAME " (comp)",
+                        [MLX4_EQ_ASYNC] = DRV_NAME " (async)",
+                        [MLX4_EQ_CATAS] = DRV_NAME " (catas)"
+                };
+
+                err = mlx4_create_eq(dev, 1, MLX4_EQ_CATAS,
+                                     &priv->eq_table.eq[MLX4_EQ_CATAS]);
+                if (err)
+                        goto err_out_async;
+
+                for (i = 0; i < MLX4_EQ_CATAS; ++i) {
+                        err = request_irq(priv->eq_table.eq[i].irq,
+                                          mlx4_msi_x_interrupt,
+                                          0, eq_name[i], priv->eq_table.eq + i);
+                        if (err)
+                                goto err_out_catas;
+
+                        priv->eq_table.eq[i].have_irq = 1;
+                }
+
+                err = request_irq(priv->eq_table.eq[MLX4_EQ_CATAS].irq,
+                                  mlx4_catas_interrupt, 0,
+                                  eq_name[MLX4_EQ_CATAS], dev);
+                if (err)
+                        goto err_out_catas;
+
+                priv->eq_table.eq[MLX4_EQ_CATAS].have_irq = 1;
+        } else {
+                err = request_irq(dev->pdev->irq, mlx4_interrupt,
+                                  IRQF_SHARED, DRV_NAME, dev);
+                if (err)
+                        goto err_out_async;
+
+                priv->eq_table.have_irq = 1;
+        }
+
+        err = mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 0,
+                          priv->eq_table.eq[MLX4_EQ_ASYNC].eqn);
+        if (err)
+                mlx4_warn(dev, "MAP_EQ for async EQ %d failed (%d)\n",
+                           priv->eq_table.eq[MLX4_EQ_ASYNC].eqn, err);
+
+        for (i = 0; i < MLX4_EQ_CATAS; ++i)
+                eq_set_ci(&priv->eq_table.eq[i], 1);
+
+        if (dev->flags & MLX4_FLAG_MSI_X) {
+                err = mlx4_MAP_EQ(dev, MLX4_CATAS_EVENT_MASK, 0,
+                                  priv->eq_table.eq[MLX4_EQ_CATAS].eqn);
+                if (err)
+                        mlx4_warn(dev, "MAP_EQ for catas EQ %d failed (%d)\n",
+                                  priv->eq_table.eq[MLX4_EQ_CATAS].eqn, err);
+        }
+
+        return 0;
+
+err_out_catas:
+        mlx4_free_eq(dev, &priv->eq_table.eq[MLX4_EQ_CATAS]);
+
+err_out_async:
+        mlx4_free_eq(dev, &priv->eq_table.eq[MLX4_EQ_ASYNC]);
+
+err_out_comp:
+        mlx4_free_eq(dev, &priv->eq_table.eq[MLX4_EQ_COMP]);
+
+err_out_unmap:
+        mlx4_unmap_clr_int(dev);
+        mlx4_free_irqs(dev);
+
+err_out_free:
+        mlx4_bitmap_cleanup(&priv->eq_table.bitmap);
+        return err;
+}
+
+void mlx4_cleanup_eq_table(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int i;
+
+        if (dev->flags & MLX4_FLAG_MSI_X)
+                mlx4_MAP_EQ(dev, MLX4_CATAS_EVENT_MASK, 1,
+                            priv->eq_table.eq[MLX4_EQ_CATAS].eqn);
+
+        mlx4_MAP_EQ(dev, MLX4_ASYNC_EVENT_MASK, 1,
+                    priv->eq_table.eq[MLX4_EQ_ASYNC].eqn);
+
+        mlx4_free_irqs(dev);
+
+        for (i = 0; i < MLX4_EQ_CATAS; ++i)
+                mlx4_free_eq(dev, &priv->eq_table.eq[i]);
+        if (dev->flags & MLX4_FLAG_MSI_X)
+                mlx4_free_eq(dev, &priv->eq_table.eq[MLX4_EQ_CATAS]);
+
+        mlx4_unmap_clr_int(dev);
+
+        for (i = 0; i < ARRAY_SIZE(priv->eq_table.uar_map); ++i)
+                if (priv->eq_table.uar_map[i])
+                        iounmap(priv->eq_table.uar_map[i]);
+
+        mlx4_bitmap_cleanup(&priv->eq_table.bitmap);
+}
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
new file mode 100644
index 000000000000..cfa5cc072339
--- /dev/null
+++ b/drivers/net/mlx4/fw.c
@@ -0,0 +1,775 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/mlx4/cmd.h>
+
+#include "fw.h"
+#include "icm.h"
+
+extern void __buggy_use_of_MLX4_GET(void);
+extern void __buggy_use_of_MLX4_PUT(void);
+
+#define MLX4_GET(dest, source, offset)                                \
+        do {                                                          \
+                void *__p = (char *) (source) + (offset);             \
+                switch (sizeof (dest)) {                              \
+                case 1: (dest) = *(u8 *) __p;       break;            \
+                case 2: (dest) = be16_to_cpup(__p); break;            \
+                case 4: (dest) = be32_to_cpup(__p); break;            \
+                case 8: (dest) = be64_to_cpup(__p); break;            \
+                default: __buggy_use_of_MLX4_GET();                   \
+                }                                                     \
+        } while (0)
+
+#define MLX4_PUT(dest, source, offset)                                \
+        do {                                                          \
+                void *__d = ((char *) (dest) + (offset));             \
+                switch (sizeof(source)) {                             \
+                case 1: *(u8 *) __d = (source);                break; \
+                case 2: *(__be16 *) __d = cpu_to_be16(source); break; \
+                case 4: *(__be32 *) __d = cpu_to_be32(source); break; \
+                case 8: *(__be64 *) __d = cpu_to_be64(source); break; \
+                default: __buggy_use_of_MLX4_PUT();                   \
+                }                                                     \
+        } while (0)
+
+static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
+{
+        static const char *fname[] = {
+                [ 0] = "RC transport",
+                [ 1] = "UC transport",
+                [ 2] = "UD transport",
+                [ 3] = "SRC transport",
+                [ 4] = "reliable multicast",
+                [ 5] = "FCoIB support",
+                [ 6] = "SRQ support",
+                [ 7] = "IPoIB checksum offload",
+                [ 8] = "P_Key violation counter",
+                [ 9] = "Q_Key violation counter",
+                [10] = "VMM",
+                [16] = "MW support",
+                [17] = "APM support",
+                [18] = "Atomic ops support",
+                [19] = "Raw multicast support",
+                [20] = "Address vector port checking support",
+                [21] = "UD multicast support",
+                [24] = "Demand paging support",
+                [25] = "Router support"
+        };
+        int i;
+
+        mlx4_dbg(dev, "DEV_CAP flags:\n");
+        for (i = 0; i < ARRAY_SIZE(fname); ++i)
+                if (fname[i] && (flags & (1 << i)))
+                        mlx4_dbg(dev, "    %s\n", fname[i]);
+}
+
+int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        u32 *outbox;
+        u8 field;
+        u16 size;
+        u16 stat_rate;
+        int err;
+
+#define QUERY_DEV_CAP_OUT_SIZE                 0x100
+#define QUERY_DEV_CAP_MAX_SRQ_SZ_OFFSET         0x10
+#define QUERY_DEV_CAP_MAX_QP_SZ_OFFSET          0x11
+#define QUERY_DEV_CAP_RSVD_QP_OFFSET            0x12
+#define QUERY_DEV_CAP_MAX_QP_OFFSET             0x13
+#define QUERY_DEV_CAP_RSVD_SRQ_OFFSET           0x14
+#define QUERY_DEV_CAP_MAX_SRQ_OFFSET            0x15
+#define QUERY_DEV_CAP_RSVD_EEC_OFFSET           0x16
+#define QUERY_DEV_CAP_MAX_EEC_OFFSET            0x17
+#define QUERY_DEV_CAP_MAX_CQ_SZ_OFFSET          0x19
+#define QUERY_DEV_CAP_RSVD_CQ_OFFSET            0x1a
+#define QUERY_DEV_CAP_MAX_CQ_OFFSET             0x1b
+#define QUERY_DEV_CAP_MAX_MPT_OFFSET            0x1d
+#define QUERY_DEV_CAP_RSVD_EQ_OFFSET            0x1e
+#define QUERY_DEV_CAP_MAX_EQ_OFFSET             0x1f
+#define QUERY_DEV_CAP_RSVD_MTT_OFFSET           0x20
+#define QUERY_DEV_CAP_MAX_MRW_SZ_OFFSET         0x21
+#define QUERY_DEV_CAP_RSVD_MRW_OFFSET           0x22
+#define QUERY_DEV_CAP_MAX_MTT_SEG_OFFSET        0x23
+#define QUERY_DEV_CAP_MAX_AV_OFFSET             0x27
+#define QUERY_DEV_CAP_MAX_REQ_QP_OFFSET         0x29
+#define QUERY_DEV_CAP_MAX_RES_QP_OFFSET         0x2b
+#define QUERY_DEV_CAP_MAX_RDMA_OFFSET           0x2f
+#define QUERY_DEV_CAP_RSZ_SRQ_OFFSET            0x33
+#define QUERY_DEV_CAP_ACK_DELAY_OFFSET          0x35
+#define QUERY_DEV_CAP_MTU_WIDTH_OFFSET          0x36
+#define QUERY_DEV_CAP_VL_PORT_OFFSET            0x37
+#define QUERY_DEV_CAP_MAX_GID_OFFSET            0x3b
+#define QUERY_DEV_CAP_RATE_SUPPORT_OFFSET       0x3c
+#define QUERY_DEV_CAP_MAX_PKEY_OFFSET           0x3f
+#define QUERY_DEV_CAP_FLAGS_OFFSET              0x44
+#define QUERY_DEV_CAP_RSVD_UAR_OFFSET           0x48
+#define QUERY_DEV_CAP_UAR_SZ_OFFSET             0x49
+#define QUERY_DEV_CAP_PAGE_SZ_OFFSET            0x4b
+#define QUERY_DEV_CAP_BF_OFFSET                 0x4c
+#define QUERY_DEV_CAP_LOG_BF_REG_SZ_OFFSET      0x4d
+#define QUERY_DEV_CAP_LOG_MAX_BF_REGS_PER_PAGE_OFFSET   0x4e
+#define QUERY_DEV_CAP_LOG_MAX_BF_PAGES_OFFSET   0x4f
+#define QUERY_DEV_CAP_MAX_SG_SQ_OFFSET          0x51
+#define QUERY_DEV_CAP_MAX_DESC_SZ_SQ_OFFSET     0x52
+#define QUERY_DEV_CAP_MAX_SG_RQ_OFFSET          0x55
+#define QUERY_DEV_CAP_MAX_DESC_SZ_RQ_OFFSET     0x56
+#define QUERY_DEV_CAP_MAX_QP_MCG_OFFSET         0x61
+#define QUERY_DEV_CAP_RSVD_MCG_OFFSET           0x62
+#define QUERY_DEV_CAP_MAX_MCG_OFFSET            0x63
+#define QUERY_DEV_CAP_RSVD_PD_OFFSET            0x64
+#define QUERY_DEV_CAP_MAX_PD_OFFSET             0x65
+#define QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET    0x80
+#define QUERY_DEV_CAP_QPC_ENTRY_SZ_OFFSET       0x82
+#define QUERY_DEV_CAP_AUX_ENTRY_SZ_OFFSET       0x84
+#define QUERY_DEV_CAP_ALTC_ENTRY_SZ_OFFSET      0x86
+#define QUERY_DEV_CAP_EQC_ENTRY_SZ_OFFSET       0x88
+#define QUERY_DEV_CAP_CQC_ENTRY_SZ_OFFSET       0x8a
+#define QUERY_DEV_CAP_SRQ_ENTRY_SZ_OFFSET       0x8c
+#define QUERY_DEV_CAP_C_MPT_ENTRY_SZ_OFFSET     0x8e
+#define QUERY_DEV_CAP_MTT_ENTRY_SZ_OFFSET       0x90
+#define QUERY_DEV_CAP_D_MPT_ENTRY_SZ_OFFSET     0x92
+#define QUERY_DEV_CAP_BMME_FLAGS_OFFSET         0x97
+#define QUERY_DEV_CAP_RSVD_LKEY_OFFSET          0x98
+#define QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET         0xa0
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        outbox = mailbox->buf;
+
+        err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_DEV_CAP,
+                           MLX4_CMD_TIME_CLASS_A);
+
+        if (err)
+                goto out;
+
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_QP_OFFSET);
+        dev_cap->reserved_qps = 1 << (field & 0xf);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_QP_OFFSET);
+        dev_cap->max_qps = 1 << (field & 0x1f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_SRQ_OFFSET);
+        dev_cap->reserved_srqs = 1 << (field >> 4);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_SRQ_OFFSET);
+        dev_cap->max_srqs = 1 << (field & 0x1f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_CQ_SZ_OFFSET);
+        dev_cap->max_cq_sz = 1 << field;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_CQ_OFFSET);
+        dev_cap->reserved_cqs = 1 << (field & 0xf);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_CQ_OFFSET);
+        dev_cap->max_cqs = 1 << (field & 0x1f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MPT_OFFSET);
+        dev_cap->max_mpts = 1 << (field & 0x3f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_EQ_OFFSET);
+        dev_cap->reserved_eqs = 1 << (field & 0xf);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_EQ_OFFSET);
+        dev_cap->max_eqs = 1 << (field & 0x7);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET);
+        dev_cap->reserved_mtts = 1 << (field >> 4);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MRW_SZ_OFFSET);
+        dev_cap->max_mrw_sz = 1 << field;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MRW_OFFSET);
+        dev_cap->reserved_mrws = 1 << (field & 0xf);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MTT_SEG_OFFSET);
+        dev_cap->max_mtt_seg = 1 << (field & 0x3f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_REQ_QP_OFFSET);
+        dev_cap->max_requester_per_qp = 1 << (field & 0x3f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_RES_QP_OFFSET);
+        dev_cap->max_responder_per_qp = 1 << (field & 0x3f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_RDMA_OFFSET);
+        dev_cap->max_rdma_global = 1 << (field & 0x3f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_ACK_DELAY_OFFSET);
+        dev_cap->local_ca_ack_delay = field & 0x1f;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MTU_WIDTH_OFFSET);
+        dev_cap->max_mtu        = field >> 4;
+        dev_cap->max_port_width = field & 0xf;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_VL_PORT_OFFSET);
+        dev_cap->max_vl    = field >> 4;
+        dev_cap->num_ports = field & 0xf;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_GID_OFFSET);
+        dev_cap->max_gids = 1 << (field & 0xf);
+        MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);
+        dev_cap->stat_rate_support = stat_rate;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_PKEY_OFFSET);
+        dev_cap->max_pkeys = 1 << (field & 0xf);
+        MLX4_GET(dev_cap->flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_UAR_OFFSET);
+        dev_cap->reserved_uars = field >> 4;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_UAR_SZ_OFFSET);
+        dev_cap->uar_size = 1 << ((field & 0x3f) + 20);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_PAGE_SZ_OFFSET);
+        dev_cap->min_page_sz = 1 << field;
+
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_BF_OFFSET);
+        if (field & 0x80) {
+                MLX4_GET(field, outbox, QUERY_DEV_CAP_LOG_BF_REG_SZ_OFFSET);
+                dev_cap->bf_reg_size = 1 << (field & 0x1f);
+                MLX4_GET(field, outbox, QUERY_DEV_CAP_LOG_MAX_BF_REGS_PER_PAGE_OFFSET);
+                dev_cap->bf_regs_per_page = 1 << (field & 0x3f);
+                mlx4_dbg(dev, "BlueFlame available (reg size %d, regs/page %d)\n",
+                         dev_cap->bf_reg_size, dev_cap->bf_regs_per_page);
+        } else {
+                dev_cap->bf_reg_size = 0;
+                mlx4_dbg(dev, "BlueFlame not available\n");
+        }
+
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_SG_SQ_OFFSET);
+        dev_cap->max_sq_sg = field;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_MAX_DESC_SZ_SQ_OFFSET);
+        dev_cap->max_sq_desc_sz = size;
+
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_QP_MCG_OFFSET);
+        dev_cap->max_qp_per_mcg = 1 << field;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MCG_OFFSET);
+        dev_cap->reserved_mgms = field & 0xf;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MCG_OFFSET);
+        dev_cap->max_mcgs = 1 << field;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_PD_OFFSET);
+        dev_cap->reserved_pds = field >> 4;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_PD_OFFSET);
+        dev_cap->max_pds = 1 << (field & 0x3f);
+
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET);
+        dev_cap->rdmarc_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_QPC_ENTRY_SZ_OFFSET);
+        dev_cap->qpc_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_AUX_ENTRY_SZ_OFFSET);
+        dev_cap->aux_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_ALTC_ENTRY_SZ_OFFSET);
+        dev_cap->altc_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_EQC_ENTRY_SZ_OFFSET);
+        dev_cap->eqc_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_CQC_ENTRY_SZ_OFFSET);
+        dev_cap->cqc_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_SRQ_ENTRY_SZ_OFFSET);
+        dev_cap->srq_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_C_MPT_ENTRY_SZ_OFFSET);
+        dev_cap->cmpt_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_MTT_ENTRY_SZ_OFFSET);
+        dev_cap->mtt_entry_sz = size;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_D_MPT_ENTRY_SZ_OFFSET);
+        dev_cap->dmpt_entry_sz = size;
+
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_SRQ_SZ_OFFSET);
+        dev_cap->max_srq_sz = 1 << field;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_QP_SZ_OFFSET);
+        dev_cap->max_qp_sz = 1 << field;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSZ_SRQ_OFFSET);
+        dev_cap->resize_srq = field & 1;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_SG_RQ_OFFSET);
+        dev_cap->max_rq_sg = field;
+        MLX4_GET(size, outbox, QUERY_DEV_CAP_MAX_DESC_SZ_RQ_OFFSET);
+        dev_cap->max_rq_desc_sz = size;
+
+        MLX4_GET(dev_cap->bmme_flags, outbox,
+                 QUERY_DEV_CAP_BMME_FLAGS_OFFSET);
+        MLX4_GET(dev_cap->reserved_lkey, outbox,
+                 QUERY_DEV_CAP_RSVD_LKEY_OFFSET);
+        MLX4_GET(dev_cap->max_icm_sz, outbox,
+                 QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);
+
+        if (dev_cap->bmme_flags & 1)
+                mlx4_dbg(dev, "Base MM extensions: yes "
+                         "(flags %d, rsvd L_Key %08x)\n",
+                         dev_cap->bmme_flags, dev_cap->reserved_lkey);
+        else
+                mlx4_dbg(dev, "Base MM extensions: no\n");
+
+        /*
+         * Each UAR has 4 EQ doorbells; so if a UAR is reserved, then
+         * we can't use any EQs whose doorbell falls on that page,
+         * even if the EQ itself isn't reserved.
+         */
+        dev_cap->reserved_eqs = max(dev_cap->reserved_uars * 4,
+                                    dev_cap->reserved_eqs);
+
+        mlx4_dbg(dev, "Max ICM size %lld MB\n",
+                 (unsigned long long) dev_cap->max_icm_sz >> 20);
+        mlx4_dbg(dev, "Max QPs: %d, reserved QPs: %d, entry size: %d\n",
+                 dev_cap->max_qps, dev_cap->reserved_qps, dev_cap->qpc_entry_sz);
+        mlx4_dbg(dev, "Max SRQs: %d, reserved SRQs: %d, entry size: %d\n",
+                 dev_cap->max_srqs, dev_cap->reserved_srqs, dev_cap->srq_entry_sz);
+        mlx4_dbg(dev, "Max CQs: %d, reserved CQs: %d, entry size: %d\n",
+                 dev_cap->max_cqs, dev_cap->reserved_cqs, dev_cap->cqc_entry_sz);
+        mlx4_dbg(dev, "Max EQs: %d, reserved EQs: %d, entry size: %d\n",
+                 dev_cap->max_eqs, dev_cap->reserved_eqs, dev_cap->eqc_entry_sz);
+        mlx4_dbg(dev, "reserved MPTs: %d, reserved MTTs: %d\n",
+                 dev_cap->reserved_mrws, dev_cap->reserved_mtts);
+        mlx4_dbg(dev, "Max PDs: %d, reserved PDs: %d, reserved UARs: %d\n",
+                 dev_cap->max_pds, dev_cap->reserved_pds, dev_cap->reserved_uars);
+        mlx4_dbg(dev, "Max QP/MCG: %d, reserved MGMs: %d\n",
+                 dev_cap->max_pds, dev_cap->reserved_mgms);
+        mlx4_dbg(dev, "Max CQEs: %d, max WQEs: %d, max SRQ WQEs: %d\n",
+                 dev_cap->max_cq_sz, dev_cap->max_qp_sz, dev_cap->max_srq_sz);
+        mlx4_dbg(dev, "Local CA ACK delay: %d, max MTU: %d, port width cap: %d\n",
+                 dev_cap->local_ca_ack_delay, 128 << dev_cap->max_mtu,
+                 dev_cap->max_port_width);
+        mlx4_dbg(dev, "Max SQ desc size: %d, max SQ S/G: %d\n",
+                 dev_cap->max_sq_desc_sz, dev_cap->max_sq_sg);
+        mlx4_dbg(dev, "Max RQ desc size: %d, max RQ S/G: %d\n",
+                 dev_cap->max_rq_desc_sz, dev_cap->max_rq_sg);
+
+        dump_dev_cap_flags(dev, dev_cap->flags);
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+
+int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_icm_iter iter;
+        __be64 *pages;
+        int lg;
+        int nent = 0;
+        int i;
+        int err = 0;
+        int ts = 0, tc = 0;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        memset(mailbox->buf, 0, MLX4_MAILBOX_SIZE);
+        pages = mailbox->buf;
+
+        for (mlx4_icm_first(icm, &iter);
+             !mlx4_icm_last(&iter);
+             mlx4_icm_next(&iter)) {
+                /*
+                 * We have to pass pages that are aligned to their
+                 * size, so find the least significant 1 in the
+                 * address or size and use that as our log2 size.
+                 */
+                lg = ffs(mlx4_icm_addr(&iter) | mlx4_icm_size(&iter)) - 1;
+                if (lg < MLX4_ICM_PAGE_SHIFT) {
+                        mlx4_warn(dev, "Got FW area not aligned to %d (%llx/%lx).\n",
+                                   MLX4_ICM_PAGE_SIZE,
+                                   (unsigned long long) mlx4_icm_addr(&iter),
+                                   mlx4_icm_size(&iter));
+                        err = -EINVAL;
+                        goto out;
+                }
+
+                for (i = 0; i < mlx4_icm_size(&iter) >> lg; ++i) {
+                        if (virt != -1) {
+                                pages[nent * 2] = cpu_to_be64(virt);
+                                virt += 1 << lg;
+                        }
+
+                        pages[nent * 2 + 1] =
+                                cpu_to_be64((mlx4_icm_addr(&iter) + (i << lg)) |
+                                            (lg - MLX4_ICM_PAGE_SHIFT));
+                        ts += 1 << (lg - 10);
+                        ++tc;
+
+                        if (++nent == MLX4_MAILBOX_SIZE / 16) {
+                                err = mlx4_cmd(dev, mailbox->dma, nent, 0, op,
+                                                MLX4_CMD_TIME_CLASS_B);
+                                if (err)
+                                        goto out;
+                                nent = 0;
+                        }
+                }
+        }
+
+        if (nent)
+                err = mlx4_cmd(dev, mailbox->dma, nent, 0, op, MLX4_CMD_TIME_CLASS_B);
+        if (err)
+                goto out;
+
+        switch (op) {
+        case MLX4_CMD_MAP_FA:
+                mlx4_dbg(dev, "Mapped %d chunks/%d KB for FW.\n", tc, ts);
+                break;
+        case MLX4_CMD_MAP_ICM_AUX:
+                mlx4_dbg(dev, "Mapped %d chunks/%d KB for ICM aux.\n", tc, ts);
+                break;
+        case MLX4_CMD_MAP_ICM:
+                mlx4_dbg(dev, "Mapped %d chunks/%d KB at %llx for ICM.\n",
+                          tc, ts, (unsigned long long) virt - (ts << 10));
+                break;
+        }
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+
+int mlx4_MAP_FA(struct mlx4_dev *dev, struct mlx4_icm *icm)
+{
+        return mlx4_map_cmd(dev, MLX4_CMD_MAP_FA, icm, -1);
+}
+
+int mlx4_UNMAP_FA(struct mlx4_dev *dev)
+{
+        return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_UNMAP_FA, MLX4_CMD_TIME_CLASS_B);
+}
+
+
+int mlx4_RUN_FW(struct mlx4_dev *dev)
+{
+        return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_RUN_FW, MLX4_CMD_TIME_CLASS_A);
+}
+
+int mlx4_QUERY_FW(struct mlx4_dev *dev)
+{
+        struct mlx4_fw  *fw  = &mlx4_priv(dev)->fw;
+        struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd;
+        struct mlx4_cmd_mailbox *mailbox;
+        u32 *outbox;
+        int err = 0;
+        u64 fw_ver;
+        u8 lg;
+
+#define QUERY_FW_OUT_SIZE             0x100
+#define QUERY_FW_VER_OFFSET            0x00
+#define QUERY_FW_MAX_CMD_OFFSET        0x0f
+#define QUERY_FW_ERR_START_OFFSET      0x30
+#define QUERY_FW_ERR_SIZE_OFFSET       0x38
+#define QUERY_FW_ERR_BAR_OFFSET        0x3c
+
+#define QUERY_FW_SIZE_OFFSET           0x00
+#define QUERY_FW_CLR_INT_BASE_OFFSET   0x20
+#define QUERY_FW_CLR_INT_BAR_OFFSET    0x28
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        outbox = mailbox->buf;
+
+        err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_FW,
+                            MLX4_CMD_TIME_CLASS_A);
+        if (err)
+                goto out;
+
+        MLX4_GET(fw_ver, outbox, QUERY_FW_VER_OFFSET);
+        /*
+         * FW subminor version is at more signifant bits than minor
+         * version, so swap here.
+         */
+        dev->caps.fw_ver = (fw_ver & 0xffff00000000ull) |
+                ((fw_ver & 0xffff0000ull) >> 16) |
+                ((fw_ver & 0x0000ffffull) << 16);
+
+        MLX4_GET(lg, outbox, QUERY_FW_MAX_CMD_OFFSET);
+        cmd->max_cmds = 1 << lg;
+
+        mlx4_dbg(dev, "FW version %d.%d.%03d, max commands %d\n",
+                 (int) (dev->caps.fw_ver >> 32),
+                 (int) (dev->caps.fw_ver >> 16) & 0xffff,
+                 (int) dev->caps.fw_ver & 0xffff,
+                 cmd->max_cmds);
+
+        MLX4_GET(fw->catas_offset, outbox, QUERY_FW_ERR_START_OFFSET);
+        MLX4_GET(fw->catas_size,   outbox, QUERY_FW_ERR_SIZE_OFFSET);
+        MLX4_GET(fw->catas_bar,    outbox, QUERY_FW_ERR_BAR_OFFSET);
+        fw->catas_bar = (fw->catas_bar >> 6) * 2;
+
+        mlx4_dbg(dev, "Catastrophic error buffer at 0x%llx, size 0x%x, BAR %d\n",
+                 (unsigned long long) fw->catas_offset, fw->catas_size, fw->catas_bar);
+
+        MLX4_GET(fw->fw_pages,     outbox, QUERY_FW_SIZE_OFFSET);
+        MLX4_GET(fw->clr_int_base, outbox, QUERY_FW_CLR_INT_BASE_OFFSET);
+        MLX4_GET(fw->clr_int_bar,  outbox, QUERY_FW_CLR_INT_BAR_OFFSET);
+        fw->clr_int_bar = (fw->clr_int_bar >> 6) * 2;
+
+        mlx4_dbg(dev, "FW size %d KB\n", fw->fw_pages >> 2);
+
+        /*
+         * Round up number of system pages needed in case
+         * MLX4_ICM_PAGE_SIZE < PAGE_SIZE.
+         */
+        fw->fw_pages =
+                ALIGN(fw->fw_pages, PAGE_SIZE / MLX4_ICM_PAGE_SIZE) >>
+                (PAGE_SHIFT - MLX4_ICM_PAGE_SHIFT);
+
+        mlx4_dbg(dev, "Clear int @ %llx, BAR %d\n",
+                 (unsigned long long) fw->clr_int_base, fw->clr_int_bar);
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+
+static void get_board_id(void *vsd, char *board_id)
+{
+        int i;
+
+#define VSD_OFFSET_SIG1         0x00
+#define VSD_OFFSET_SIG2         0xde
+#define VSD_OFFSET_MLX_BOARD_ID 0xd0
+#define VSD_OFFSET_TS_BOARD_ID  0x20
+
+#define VSD_SIGNATURE_TOPSPIN   0x5ad
+
+        memset(board_id, 0, MLX4_BOARD_ID_LEN);
+
+        if (be16_to_cpup(vsd + VSD_OFFSET_SIG1) == VSD_SIGNATURE_TOPSPIN &&
+            be16_to_cpup(vsd + VSD_OFFSET_SIG2) == VSD_SIGNATURE_TOPSPIN) {
+                strlcpy(board_id, vsd + VSD_OFFSET_TS_BOARD_ID, MLX4_BOARD_ID_LEN);
+        } else {
+                /*
+                 * The board ID is a string but the firmware byte
+                 * swaps each 4-byte word before passing it back to
+                 * us.  Therefore we need to swab it before printing.
+                 */
+                for (i = 0; i < 4; ++i)
+                        ((u32 *) board_id)[i] =
+                                swab32(*(u32 *) (vsd + VSD_OFFSET_MLX_BOARD_ID + i * 4));
+        }
+}
+
+int mlx4_QUERY_ADAPTER(struct mlx4_dev *dev, struct mlx4_adapter *adapter)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        u32 *outbox;
+        int err;
+
+#define QUERY_ADAPTER_OUT_SIZE             0x100
+#define QUERY_ADAPTER_VENDOR_ID_OFFSET     0x00
+#define QUERY_ADAPTER_DEVICE_ID_OFFSET     0x04
+#define QUERY_ADAPTER_REVISION_ID_OFFSET   0x08
+#define QUERY_ADAPTER_INTA_PIN_OFFSET      0x10
+#define QUERY_ADAPTER_VSD_OFFSET           0x20
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        outbox = mailbox->buf;
+
+        err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_ADAPTER,
+                           MLX4_CMD_TIME_CLASS_A);
+        if (err)
+                goto out;
+
+        MLX4_GET(adapter->vendor_id, outbox,   QUERY_ADAPTER_VENDOR_ID_OFFSET);
+        MLX4_GET(adapter->device_id, outbox,   QUERY_ADAPTER_DEVICE_ID_OFFSET);
+        MLX4_GET(adapter->revision_id, outbox, QUERY_ADAPTER_REVISION_ID_OFFSET);
+        MLX4_GET(adapter->inta_pin, outbox,    QUERY_ADAPTER_INTA_PIN_OFFSET);
+
+        get_board_id(outbox + QUERY_ADAPTER_VSD_OFFSET / 4,
+                     adapter->board_id);
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+
+int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        __be32 *inbox;
+        int err;
+
+#define INIT_HCA_IN_SIZE                 0x200
+#define INIT_HCA_VERSION_OFFSET          0x000
+#define  INIT_HCA_VERSION                2
+#define INIT_HCA_FLAGS_OFFSET            0x014
+#define INIT_HCA_QPC_OFFSET              0x020
+#define  INIT_HCA_QPC_BASE_OFFSET        (INIT_HCA_QPC_OFFSET + 0x10)
+#define  INIT_HCA_LOG_QP_OFFSET          (INIT_HCA_QPC_OFFSET + 0x17)
+#define  INIT_HCA_SRQC_BASE_OFFSET       (INIT_HCA_QPC_OFFSET + 0x28)
+#define  INIT_HCA_LOG_SRQ_OFFSET         (INIT_HCA_QPC_OFFSET + 0x2f)
+#define  INIT_HCA_CQC_BASE_OFFSET        (INIT_HCA_QPC_OFFSET + 0x30)
+#define  INIT_HCA_LOG_CQ_OFFSET          (INIT_HCA_QPC_OFFSET + 0x37)
+#define  INIT_HCA_ALTC_BASE_OFFSET       (INIT_HCA_QPC_OFFSET + 0x40)
+#define  INIT_HCA_AUXC_BASE_OFFSET       (INIT_HCA_QPC_OFFSET + 0x50)
+#define  INIT_HCA_EQC_BASE_OFFSET        (INIT_HCA_QPC_OFFSET + 0x60)
+#define  INIT_HCA_LOG_EQ_OFFSET          (INIT_HCA_QPC_OFFSET + 0x67)
+#define  INIT_HCA_RDMARC_BASE_OFFSET     (INIT_HCA_QPC_OFFSET + 0x70)
+#define  INIT_HCA_LOG_RD_OFFSET          (INIT_HCA_QPC_OFFSET + 0x77)
+#define INIT_HCA_MCAST_OFFSET            0x0c0
+#define  INIT_HCA_MC_BASE_OFFSET         (INIT_HCA_MCAST_OFFSET + 0x00)
+#define  INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x12)
+#define  INIT_HCA_LOG_MC_HASH_SZ_OFFSET  (INIT_HCA_MCAST_OFFSET + 0x16)
+#define  INIT_HCA_LOG_MC_TABLE_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x1b)
+#define INIT_HCA_TPT_OFFSET              0x0f0
+#define  INIT_HCA_DMPT_BASE_OFFSET       (INIT_HCA_TPT_OFFSET + 0x00)
+#define  INIT_HCA_LOG_MPT_SZ_OFFSET      (INIT_HCA_TPT_OFFSET + 0x0b)
+#define  INIT_HCA_MTT_BASE_OFFSET        (INIT_HCA_TPT_OFFSET + 0x10)
+#define  INIT_HCA_CMPT_BASE_OFFSET       (INIT_HCA_TPT_OFFSET + 0x18)
+#define INIT_HCA_UAR_OFFSET              0x120
+#define  INIT_HCA_LOG_UAR_SZ_OFFSET      (INIT_HCA_UAR_OFFSET + 0x0a)
+#define  INIT_HCA_UAR_PAGE_SZ_OFFSET     (INIT_HCA_UAR_OFFSET + 0x0b)
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        inbox = mailbox->buf;
+
+        memset(inbox, 0, INIT_HCA_IN_SIZE);
+
+        *((u8 *) mailbox->buf + INIT_HCA_VERSION_OFFSET) = INIT_HCA_VERSION;
+
+#if defined(__LITTLE_ENDIAN)
+        *(inbox + INIT_HCA_FLAGS_OFFSET / 4) &= ~cpu_to_be32(1 << 1);
+#elif defined(__BIG_ENDIAN)
+        *(inbox + INIT_HCA_FLAGS_OFFSET / 4) |= cpu_to_be32(1 << 1);
+#else
+#error Host endianness not defined
+#endif
+        /* Check port for UD address vector: */
+        *(inbox + INIT_HCA_FLAGS_OFFSET / 4) |= cpu_to_be32(1);
+
+        /* QPC/EEC/CQC/EQC/RDMARC attributes */
+
+        MLX4_PUT(inbox, param->qpc_base,      INIT_HCA_QPC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_num_qps,   INIT_HCA_LOG_QP_OFFSET);
+        MLX4_PUT(inbox, param->srqc_base,     INIT_HCA_SRQC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_num_srqs,  INIT_HCA_LOG_SRQ_OFFSET);
+        MLX4_PUT(inbox, param->cqc_base,      INIT_HCA_CQC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_num_cqs,   INIT_HCA_LOG_CQ_OFFSET);
+        MLX4_PUT(inbox, param->altc_base,     INIT_HCA_ALTC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->auxc_base,     INIT_HCA_AUXC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->eqc_base,      INIT_HCA_EQC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_num_eqs,   INIT_HCA_LOG_EQ_OFFSET);
+        MLX4_PUT(inbox, param->rdmarc_base,   INIT_HCA_RDMARC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_rd_per_qp, INIT_HCA_LOG_RD_OFFSET);
+
+        /* multicast attributes */
+
+        MLX4_PUT(inbox, param->mc_base,         INIT_HCA_MC_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_mc_entry_sz, INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
+        MLX4_PUT(inbox, param->log_mc_hash_sz,  INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
+        MLX4_PUT(inbox, param->log_mc_table_sz, INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
+
+        /* TPT attributes */
+
+        MLX4_PUT(inbox, param->dmpt_base,  INIT_HCA_DMPT_BASE_OFFSET);
+        MLX4_PUT(inbox, param->log_mpt_sz, INIT_HCA_LOG_MPT_SZ_OFFSET);
+        MLX4_PUT(inbox, param->mtt_base,   INIT_HCA_MTT_BASE_OFFSET);
+        MLX4_PUT(inbox, param->cmpt_base,  INIT_HCA_CMPT_BASE_OFFSET);
+
+        /* UAR attributes */
+
+        MLX4_PUT(inbox, (u8) (PAGE_SHIFT - 12), INIT_HCA_UAR_PAGE_SZ_OFFSET);
+        MLX4_PUT(inbox, param->log_uar_sz,      INIT_HCA_LOG_UAR_SZ_OFFSET);
+
+        err = mlx4_cmd(dev, mailbox->dma, 0, 0, MLX4_CMD_INIT_HCA, 1000);
+
+        if (err)
+                mlx4_err(dev, "INIT_HCA returns %d\n", err);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+
+int mlx4_INIT_PORT(struct mlx4_dev *dev, struct mlx4_init_port_param *param, int port)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        u32 *inbox;
+        int err;
+        u32 flags;
+
+#define INIT_PORT_IN_SIZE          256
+#define INIT_PORT_FLAGS_OFFSET     0x00
+#define INIT_PORT_FLAG_SIG         (1 << 18)
+#define INIT_PORT_FLAG_NG          (1 << 17)
+#define INIT_PORT_FLAG_G0          (1 << 16)
+#define INIT_PORT_VL_SHIFT         4
+#define INIT_PORT_PORT_WIDTH_SHIFT 8
+#define INIT_PORT_MTU_OFFSET       0x04
+#define INIT_PORT_MAX_GID_OFFSET   0x06
+#define INIT_PORT_MAX_PKEY_OFFSET  0x0a
+#define INIT_PORT_GUID0_OFFSET     0x10
+#define INIT_PORT_NODE_GUID_OFFSET 0x18
+#define INIT_PORT_SI_GUID_OFFSET   0x20
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        inbox = mailbox->buf;
+
+        memset(inbox, 0, INIT_PORT_IN_SIZE);
+
+        flags = 0;
+        flags |= param->set_guid0     ? INIT_PORT_FLAG_G0  : 0;
+        flags |= param->set_node_guid ? INIT_PORT_FLAG_NG  : 0;
+        flags |= param->set_si_guid   ? INIT_PORT_FLAG_SIG : 0;
+        flags |= (param->vl_cap & 0xf) << INIT_PORT_VL_SHIFT;
+        flags |= (param->port_width_cap & 0xf) << INIT_PORT_PORT_WIDTH_SHIFT;
+        MLX4_PUT(inbox, flags,            INIT_PORT_FLAGS_OFFSET);
+
+        MLX4_PUT(inbox, param->mtu,       INIT_PORT_MTU_OFFSET);
+        MLX4_PUT(inbox, param->max_gid,   INIT_PORT_MAX_GID_OFFSET);
+        MLX4_PUT(inbox, param->max_pkey,  INIT_PORT_MAX_PKEY_OFFSET);
+        MLX4_PUT(inbox, param->guid0,     INIT_PORT_GUID0_OFFSET);
+        MLX4_PUT(inbox, param->node_guid, INIT_PORT_NODE_GUID_OFFSET);
+        MLX4_PUT(inbox, param->si_guid,   INIT_PORT_SI_GUID_OFFSET);
+
+        err = mlx4_cmd(dev, mailbox->dma, port, 0, MLX4_CMD_INIT_PORT,
+                       MLX4_CMD_TIME_CLASS_A);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_INIT_PORT);
+
+int mlx4_CLOSE_PORT(struct mlx4_dev *dev, int port)
+{
+        return mlx4_cmd(dev, 0, port, 0, MLX4_CMD_CLOSE_PORT, 1000);
+}
+EXPORT_SYMBOL_GPL(mlx4_CLOSE_PORT);
+
+int mlx4_CLOSE_HCA(struct mlx4_dev *dev, int panic)
+{
+        return mlx4_cmd(dev, 0, 0, panic, MLX4_CMD_CLOSE_HCA, 1000);
+}
+
+int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages)
+{
+        int ret = mlx4_cmd_imm(dev, icm_size, aux_pages, 0, 0,
+                               MLX4_CMD_SET_ICM_SIZE,
+                               MLX4_CMD_TIME_CLASS_A);
+        if (ret)
+                return ret;
+
+        /*
+         * Round up number of system pages needed in case
+         * MLX4_ICM_PAGE_SIZE < PAGE_SIZE.
+         */
+        *aux_pages = ALIGN(*aux_pages, PAGE_SIZE / MLX4_ICM_PAGE_SIZE) >>
+                (PAGE_SHIFT - MLX4_ICM_PAGE_SHIFT);
+
+        return 0;
+}
+
+int mlx4_NOP(struct mlx4_dev *dev)
+{
+        /* Input modifier of 0x1f means "finish as soon as possible." */
+        return mlx4_cmd(dev, 0, 0x1f, 0, MLX4_CMD_NOP, 100);
+}
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h
new file mode 100644
index 000000000000..2616fa53d4d0
--- /dev/null
+++ b/drivers/net/mlx4/fw.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006, 2007 Cisco Systems.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX4_FW_H
+#define MLX4_FW_H
+
+#include "mlx4.h"
+#include "icm.h"
+
+struct mlx4_dev_cap {
+        int max_srq_sz;
+        int max_qp_sz;
+        int reserved_qps;
+        int max_qps;
+        int reserved_srqs;
+        int max_srqs;
+        int max_cq_sz;
+        int reserved_cqs;
+        int max_cqs;
+        int max_mpts;
+        int reserved_eqs;
+        int max_eqs;
+        int reserved_mtts;
+        int max_mrw_sz;
+        int reserved_mrws;
+        int max_mtt_seg;
+        int max_requester_per_qp;
+        int max_responder_per_qp;
+        int max_rdma_global;
+        int local_ca_ack_delay;
+        int max_mtu;
+        int max_port_width;
+        int max_vl;
+        int num_ports;
+        int max_gids;
+        u16 stat_rate_support;
+        int max_pkeys;
+        u32 flags;
+        int reserved_uars;
+        int uar_size;
+        int min_page_sz;
+        int bf_reg_size;
+        int bf_regs_per_page;
+        int max_sq_sg;
+        int max_sq_desc_sz;
+        int max_rq_sg;
+        int max_rq_desc_sz;
+        int max_qp_per_mcg;
+        int reserved_mgms;
+        int max_mcgs;
+        int reserved_pds;
+        int max_pds;
+        int qpc_entry_sz;
+        int rdmarc_entry_sz;
+        int altc_entry_sz;
+        int aux_entry_sz;
+        int srq_entry_sz;
+        int cqc_entry_sz;
+        int eqc_entry_sz;
+        int dmpt_entry_sz;
+        int cmpt_entry_sz;
+        int mtt_entry_sz;
+        int resize_srq;
+        u8  bmme_flags;
+        u32 reserved_lkey;
+        u64 max_icm_sz;
+};
+
+struct mlx4_adapter {
+        u32  vendor_id;
+        u32  device_id;
+        u32  revision_id;
+        char board_id[MLX4_BOARD_ID_LEN];
+        u8   inta_pin;
+};
+
+struct mlx4_init_hca_param {
+        u64 qpc_base;
+        u64 rdmarc_base;
+        u64 auxc_base;
+        u64 altc_base;
+        u64 srqc_base;
+        u64 cqc_base;
+        u64 eqc_base;
+        u64 mc_base;
+        u64 dmpt_base;
+        u64 cmpt_base;
+        u64 mtt_base;
+        u16 log_mc_entry_sz;
+        u16 log_mc_hash_sz;
+        u8  log_num_qps;
+        u8  log_num_srqs;
+        u8  log_num_cqs;
+        u8  log_num_eqs;
+        u8  log_rd_per_qp;
+        u8  log_mc_table_sz;
+        u8  log_mpt_sz;
+        u8  log_uar_sz;
+};
+
+struct mlx4_init_ib_param {
+        int port_width;
+        int vl_cap;
+        int mtu_cap;
+        u16 gid_cap;
+        u16 pkey_cap;
+        int set_guid0;
+        u64 guid0;
+        int set_node_guid;
+        u64 node_guid;
+        int set_si_guid;
+        u64 si_guid;
+};
+
+struct mlx4_set_ib_param {
+        int set_si_guid;
+        int reset_qkey_viol;
+        u64 si_guid;
+        u32 cap_mask;
+};
+
+int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap);
+int mlx4_MAP_FA(struct mlx4_dev *dev, struct mlx4_icm *icm);
+int mlx4_UNMAP_FA(struct mlx4_dev *dev);
+int mlx4_RUN_FW(struct mlx4_dev *dev);
+int mlx4_QUERY_FW(struct mlx4_dev *dev);
+int mlx4_QUERY_ADAPTER(struct mlx4_dev *dev, struct mlx4_adapter *adapter);
+int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param);
+int mlx4_CLOSE_HCA(struct mlx4_dev *dev, int panic);
+int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt);
+int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages);
+int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm);
+int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev);
+int mlx4_NOP(struct mlx4_dev *dev);
+
+#endif /* MLX4_FW_H */
diff --git a/drivers/net/mlx4/icm.c b/drivers/net/mlx4/icm.c
new file mode 100644
index 000000000000..b7a4aa8476fb
--- /dev/null
+++ b/drivers/net/mlx4/icm.c
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/mm.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4.h"
+#include "icm.h"
+#include "fw.h"
+
+/*
+ * We allocate in as big chunks as we can, up to a maximum of 256 KB
+ * per chunk.
+ */
+enum {
+        MLX4_ICM_ALLOC_SIZE     = 1 << 18,
+        MLX4_TABLE_CHUNK_SIZE   = 1 << 18
+};
+
+void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm)
+{
+        struct mlx4_icm_chunk *chunk, *tmp;
+        int i;
+
+        list_for_each_entry_safe(chunk, tmp, &icm->chunk_list, list) {
+                if (chunk->nsg > 0)
+                        pci_unmap_sg(dev->pdev, chunk->mem, chunk->npages,
+                                     PCI_DMA_BIDIRECTIONAL);
+
+                for (i = 0; i < chunk->npages; ++i)
+                        __free_pages(chunk->mem[i].page,
+                                     get_order(chunk->mem[i].length));
+
+                kfree(chunk);
+        }
+
+        kfree(icm);
+}
+
+struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
+                                gfp_t gfp_mask)
+{
+        struct mlx4_icm *icm;
+        struct mlx4_icm_chunk *chunk = NULL;
+        int cur_order;
+
+        icm = kmalloc(sizeof *icm, gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
+        if (!icm)
+                return icm;
+
+        icm->refcount = 0;
+        INIT_LIST_HEAD(&icm->chunk_list);
+
+        cur_order = get_order(MLX4_ICM_ALLOC_SIZE);
+
+        while (npages > 0) {
+                if (!chunk) {
+                        chunk = kmalloc(sizeof *chunk,
+                                        gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
+                        if (!chunk)
+                                goto fail;
+
+                        chunk->npages = 0;
+                        chunk->nsg    = 0;
+                        list_add_tail(&chunk->list, &icm->chunk_list);
+                }
+
+                while (1 << cur_order > npages)
+                        --cur_order;
+
+                chunk->mem[chunk->npages].page = alloc_pages(gfp_mask, cur_order);
+                if (chunk->mem[chunk->npages].page) {
+                        chunk->mem[chunk->npages].length = PAGE_SIZE << cur_order;
+                        chunk->mem[chunk->npages].offset = 0;
+
+                        if (++chunk->npages == MLX4_ICM_CHUNK_LEN) {
+                                chunk->nsg = pci_map_sg(dev->pdev, chunk->mem,
+                                                        chunk->npages,
+                                                        PCI_DMA_BIDIRECTIONAL);
+
+                                if (chunk->nsg <= 0)
+                                        goto fail;
+
+                                chunk = NULL;
+                        }
+
+                        npages -= 1 << cur_order;
+                } else {
+                        --cur_order;
+                        if (cur_order < 0)
+                                goto fail;
+                }
+        }
+
+        if (chunk) {
+                chunk->nsg = pci_map_sg(dev->pdev, chunk->mem,
+                                        chunk->npages,
+                                        PCI_DMA_BIDIRECTIONAL);
+
+                if (chunk->nsg <= 0)
+                        goto fail;
+        }
+
+        return icm;
+
+fail:
+        mlx4_free_icm(dev, icm);
+        return NULL;
+}
+
+static int mlx4_MAP_ICM(struct mlx4_dev *dev, struct mlx4_icm *icm, u64 virt)
+{
+        return mlx4_map_cmd(dev, MLX4_CMD_MAP_ICM, icm, virt);
+}
+
+int mlx4_UNMAP_ICM(struct mlx4_dev *dev, u64 virt, u32 page_count)
+{
+        return mlx4_cmd(dev, virt, page_count, 0, MLX4_CMD_UNMAP_ICM,
+                        MLX4_CMD_TIME_CLASS_B);
+}
+
+int mlx4_MAP_ICM_page(struct mlx4_dev *dev, u64 dma_addr, u64 virt)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        __be64 *inbox;
+        int err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        inbox = mailbox->buf;
+
+        inbox[0] = cpu_to_be64(virt);
+        inbox[1] = cpu_to_be64(dma_addr);
+
+        err = mlx4_cmd(dev, mailbox->dma, 1, 0, MLX4_CMD_MAP_ICM,
+                       MLX4_CMD_TIME_CLASS_B);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+        if (!err)
+                mlx4_dbg(dev, "Mapped page at %llx to %llx for ICM.\n",
+                          (unsigned long long) dma_addr, (unsigned long long) virt);
+
+        return err;
+}
+
+int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm)
+{
+        return mlx4_map_cmd(dev, MLX4_CMD_MAP_ICM_AUX, icm, -1);
+}
+
+int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev)
+{
+        return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_UNMAP_ICM_AUX, MLX4_CMD_TIME_CLASS_B);
+}
+
+int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj)
+{
+        int i = (obj & (table->num_obj - 1)) / (MLX4_TABLE_CHUNK_SIZE / table->obj_size);
+        int ret = 0;
+
+        mutex_lock(&table->mutex);
+
+        if (table->icm[i]) {
+                ++table->icm[i]->refcount;
+                goto out;
+        }
+
+        table->icm[i] = mlx4_alloc_icm(dev, MLX4_TABLE_CHUNK_SIZE >> PAGE_SHIFT,
+                                       (table->lowmem ? GFP_KERNEL : GFP_HIGHUSER) |
+                                       __GFP_NOWARN);
+        if (!table->icm[i]) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        if (mlx4_MAP_ICM(dev, table->icm[i], table->virt +
+                         (u64) i * MLX4_TABLE_CHUNK_SIZE)) {
+                mlx4_free_icm(dev, table->icm[i]);
+                table->icm[i] = NULL;
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        ++table->icm[i]->refcount;
+
+out:
+        mutex_unlock(&table->mutex);
+        return ret;
+}
+
+void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj)
+{
+        int i;
+
+        i = (obj & (table->num_obj - 1)) / (MLX4_TABLE_CHUNK_SIZE / table->obj_size);
+
+        mutex_lock(&table->mutex);
+
+        if (--table->icm[i]->refcount == 0) {
+                mlx4_UNMAP_ICM(dev, table->virt + i * MLX4_TABLE_CHUNK_SIZE,
+                               MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
+                mlx4_free_icm(dev, table->icm[i]);
+                table->icm[i] = NULL;
+        }
+
+        mutex_unlock(&table->mutex);
+}
+
+void *mlx4_table_find(struct mlx4_icm_table *table, int obj)
+{
+        int idx, offset, i;
+        struct mlx4_icm_chunk *chunk;
+        struct mlx4_icm *icm;
+        struct page *page = NULL;
+
+        if (!table->lowmem)
+                return NULL;
+
+        mutex_lock(&table->mutex);
+
+        idx = obj & (table->num_obj - 1);
+        icm = table->icm[idx / (MLX4_TABLE_CHUNK_SIZE / table->obj_size)];
+        offset = idx % (MLX4_TABLE_CHUNK_SIZE / table->obj_size);
+
+        if (!icm)
+                goto out;
+
+        list_for_each_entry(chunk, &icm->chunk_list, list) {
+                for (i = 0; i < chunk->npages; ++i) {
+                        if (chunk->mem[i].length > offset) {
+                                page = chunk->mem[i].page;
+                                goto out;
+                        }
+                        offset -= chunk->mem[i].length;
+                }
+        }
+
+out:
+        mutex_unlock(&table->mutex);
+        return page ? lowmem_page_address(page) + offset : NULL;
+}
+
+int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                         int start, int end)
+{
+        int inc = MLX4_TABLE_CHUNK_SIZE / table->obj_size;
+        int i, err;
+
+        for (i = start; i <= end; i += inc) {
+                err = mlx4_table_get(dev, table, i);
+                if (err)
+                        goto fail;
+        }
+
+        return 0;
+
+fail:
+        while (i > start) {
+                i -= inc;
+                mlx4_table_put(dev, table, i);
+        }
+
+        return err;
+}
+
+void mlx4_table_put_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                          int start, int end)
+{
+        int i;
+
+        for (i = start; i <= end; i += MLX4_TABLE_CHUNK_SIZE / table->obj_size)
+                mlx4_table_put(dev, table, i);
+}
+
+int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                        u64 virt, int obj_size, int nobj, int reserved,
+                        int use_lowmem)
+{
+        int obj_per_chunk;
+        int num_icm;
+        unsigned chunk_size;
+        int i;
+
+        obj_per_chunk = MLX4_TABLE_CHUNK_SIZE / obj_size;
+        num_icm = (nobj + obj_per_chunk - 1) / obj_per_chunk;
+
+        table->icm      = kcalloc(num_icm, sizeof *table->icm, GFP_KERNEL);
+        if (!table->icm)
+                return -ENOMEM;
+        table->virt     = virt;
+        table->num_icm  = num_icm;
+        table->num_obj  = nobj;
+        table->obj_size = obj_size;
+        table->lowmem   = use_lowmem;
+        mutex_init(&table->mutex);
+
+        for (i = 0; i * MLX4_TABLE_CHUNK_SIZE < reserved * obj_size; ++i) {
+                chunk_size = MLX4_TABLE_CHUNK_SIZE;
+                if ((i + 1) * MLX4_TABLE_CHUNK_SIZE > nobj * obj_size)
+                        chunk_size = PAGE_ALIGN(nobj * obj_size - i * MLX4_TABLE_CHUNK_SIZE);
+
+                table->icm[i] = mlx4_alloc_icm(dev, chunk_size >> PAGE_SHIFT,
+                                               (use_lowmem ? GFP_KERNEL : GFP_HIGHUSER) |
+                                               __GFP_NOWARN);
+                if (!table->icm[i])
+                        goto err;
+                if (mlx4_MAP_ICM(dev, table->icm[i], virt + i * MLX4_TABLE_CHUNK_SIZE)) {
+                        mlx4_free_icm(dev, table->icm[i]);
+                        table->icm[i] = NULL;
+                        goto err;
+                }
+
+                /*
+                 * Add a reference to this ICM chunk so that it never
+                 * gets freed (since it contains reserved firmware objects).
+                 */
+                ++table->icm[i]->refcount;
+        }
+
+        return 0;
+
+err:
+        for (i = 0; i < num_icm; ++i)
+                if (table->icm[i]) {
+                        mlx4_UNMAP_ICM(dev, virt + i * MLX4_TABLE_CHUNK_SIZE,
+                                       MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
+                        mlx4_free_icm(dev, table->icm[i]);
+                }
+
+        return -ENOMEM;
+}
+
+void mlx4_cleanup_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table)
+{
+        int i;
+
+        for (i = 0; i < table->num_icm; ++i)
+                if (table->icm[i]) {
+                        mlx4_UNMAP_ICM(dev, table->virt + i * MLX4_TABLE_CHUNK_SIZE,
+                                       MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
+                        mlx4_free_icm(dev, table->icm[i]);
+                }
+
+        kfree(table->icm);
+}
diff --git a/drivers/net/mlx4/icm.h b/drivers/net/mlx4/icm.h
new file mode 100644
index 000000000000..bea223d879a5
--- /dev/null
+++ b/drivers/net/mlx4/icm.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX4_ICM_H
+#define MLX4_ICM_H
+
+#include <linux/list.h>
+#include <linux/pci.h>
+#include <linux/mutex.h>
+
+#define MLX4_ICM_CHUNK_LEN                                              \
+        ((256 - sizeof (struct list_head) - 2 * sizeof (int)) /         \
+         (sizeof (struct scatterlist)))
+
+enum {
+        MLX4_ICM_PAGE_SHIFT     = 12,
+        MLX4_ICM_PAGE_SIZE      = 1 << MLX4_ICM_PAGE_SHIFT,
+};
+
+struct mlx4_icm_chunk {
+        struct list_head        list;
+        int                     npages;
+        int                     nsg;
+        struct scatterlist      mem[MLX4_ICM_CHUNK_LEN];
+};
+
+struct mlx4_icm {
+        struct list_head        chunk_list;
+        int                     refcount;
+};
+
+struct mlx4_icm_iter {
+        struct mlx4_icm        *icm;
+        struct mlx4_icm_chunk  *chunk;
+        int                     page_idx;
+};
+
+struct mlx4_dev;
+
+struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages, gfp_t gfp_mask);
+void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm);
+
+int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj);
+void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj);
+int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                         int start, int end);
+void mlx4_table_put_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                          int start, int end);
+int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                        u64 virt, int obj_size, int nobj, int reserved,
+                        int use_lowmem);
+void mlx4_cleanup_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table);
+int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj);
+void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj);
+void *mlx4_table_find(struct mlx4_icm_table *table, int obj);
+int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                         int start, int end);
+void mlx4_table_put_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
+                          int start, int end);
+
+static inline void mlx4_icm_first(struct mlx4_icm *icm,
+                                  struct mlx4_icm_iter *iter)
+{
+        iter->icm      = icm;
+        iter->chunk    = list_empty(&icm->chunk_list) ?
+                NULL : list_entry(icm->chunk_list.next,
+                                  struct mlx4_icm_chunk, list);
+        iter->page_idx = 0;
+}
+
+static inline int mlx4_icm_last(struct mlx4_icm_iter *iter)
+{
+        return !iter->chunk;
+}
+
+static inline void mlx4_icm_next(struct mlx4_icm_iter *iter)
+{
+        if (++iter->page_idx >= iter->chunk->nsg) {
+                if (iter->chunk->list.next == &iter->icm->chunk_list) {
+                        iter->chunk = NULL;
+                        return;
+                }
+
+                iter->chunk = list_entry(iter->chunk->list.next,
+                                         struct mlx4_icm_chunk, list);
+                iter->page_idx = 0;
+        }
+}
+
+static inline dma_addr_t mlx4_icm_addr(struct mlx4_icm_iter *iter)
+{
+        return sg_dma_address(&iter->chunk->mem[iter->page_idx]);
+}
+
+static inline unsigned long mlx4_icm_size(struct mlx4_icm_iter *iter)
+{
+        return sg_dma_len(&iter->chunk->mem[iter->page_idx]);
+}
+
+int mlx4_UNMAP_ICM(struct mlx4_dev *dev, u64 virt, u32 page_count);
+int mlx4_MAP_ICM_page(struct mlx4_dev *dev, u64 dma_addr, u64 virt);
+int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm);
+int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev);
+
+#endif /* MLX4_ICM_H */
diff --git a/drivers/net/mlx4/intf.c b/drivers/net/mlx4/intf.c
new file mode 100644
index 000000000000..65854f9e9c76
--- /dev/null
+++ b/drivers/net/mlx4/intf.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/mlx4/driver.h>
+
+#include "mlx4.h"
+
+struct mlx4_device_context {
+        struct list_head        list;
+        struct mlx4_interface  *intf;
+        void                   *context;
+};
+
+static LIST_HEAD(intf_list);
+static LIST_HEAD(dev_list);
+static DEFINE_MUTEX(intf_mutex);
+
+static void mlx4_add_device(struct mlx4_interface *intf, struct mlx4_priv *priv)
+{
+        struct mlx4_device_context *dev_ctx;
+
+        dev_ctx = kmalloc(sizeof *dev_ctx, GFP_KERNEL);
+        if (!dev_ctx)
+                return;
+
+        dev_ctx->intf    = intf;
+        dev_ctx->context = intf->add(&priv->dev);
+
+        if (dev_ctx->context) {
+                spin_lock_irq(&priv->ctx_lock);
+                list_add_tail(&dev_ctx->list, &priv->ctx_list);
+                spin_unlock_irq(&priv->ctx_lock);
+        } else
+                kfree(dev_ctx);
+}
+
+static void mlx4_remove_device(struct mlx4_interface *intf, struct mlx4_priv *priv)
+{
+        struct mlx4_device_context *dev_ctx;
+
+        list_for_each_entry(dev_ctx, &priv->ctx_list, list)
+                if (dev_ctx->intf == intf) {
+                        spin_lock_irq(&priv->ctx_lock);
+                        list_del(&dev_ctx->list);
+                        spin_unlock_irq(&priv->ctx_lock);
+
+                        intf->remove(&priv->dev, dev_ctx->context);
+                        kfree(dev_ctx);
+                        return;
+                }
+}
+
+int mlx4_register_interface(struct mlx4_interface *intf)
+{
+        struct mlx4_priv *priv;
+
+        if (!intf->add || !intf->remove)
+                return -EINVAL;
+
+        mutex_lock(&intf_mutex);
+
+        list_add_tail(&intf->list, &intf_list);
+        list_for_each_entry(priv, &dev_list, dev_list)
+                mlx4_add_device(intf, priv);
+
+        mutex_unlock(&intf_mutex);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_register_interface);
+
+void mlx4_unregister_interface(struct mlx4_interface *intf)
+{
+        struct mlx4_priv *priv;
+
+        mutex_lock(&intf_mutex);
+
+        list_for_each_entry(priv, &dev_list, dev_list)
+                mlx4_remove_device(intf, priv);
+
+        list_del(&intf->list);
+
+        mutex_unlock(&intf_mutex);
+}
+EXPORT_SYMBOL_GPL(mlx4_unregister_interface);
+
+void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_event type,
+                         int subtype, int port)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_device_context *dev_ctx;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->ctx_lock, flags);
+
+        list_for_each_entry(dev_ctx, &priv->ctx_list, list)
+                if (dev_ctx->intf->event)
+                        dev_ctx->intf->event(dev, dev_ctx->context, type,
+                                             subtype, port);
+
+        spin_unlock_irqrestore(&priv->ctx_lock, flags);
+}
+
+int mlx4_register_device(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_interface *intf;
+
+        INIT_LIST_HEAD(&priv->ctx_list);
+        spin_lock_init(&priv->ctx_lock);
+
+        mutex_lock(&intf_mutex);
+
+        list_add_tail(&priv->dev_list, &dev_list);
+        list_for_each_entry(intf, &intf_list, list)
+                mlx4_add_device(intf, priv);
+
+        mutex_unlock(&intf_mutex);
+
+        return 0;
+}
+
+void mlx4_unregister_device(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_interface *intf;
+
+        mutex_lock(&intf_mutex);
+
+        list_for_each_entry(intf, &intf_list, list)
+                mlx4_remove_device(intf, priv);
+
+        list_del(&priv->dev_list);
+
+        mutex_unlock(&intf_mutex);
+}
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
new file mode 100644
index 000000000000..20b8c0d3ced4
--- /dev/null
+++ b/drivers/net/mlx4/main.c
@@ -0,0 +1,934 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+
+#include <linux/mlx4/device.h>
+#include <linux/mlx4/doorbell.h>
+
+#include "mlx4.h"
+#include "fw.h"
+#include "icm.h"
+
+MODULE_AUTHOR("Roland Dreier");
+MODULE_DESCRIPTION("Mellanox ConnectX HCA low-level driver");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(DRV_VERSION);
+
+#ifdef CONFIG_MLX4_DEBUG
+
+int mlx4_debug_level = 0;
+module_param_named(debug_level, mlx4_debug_level, int, 0644);
+MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");
+
+#endif /* CONFIG_MLX4_DEBUG */
+
+#ifdef CONFIG_PCI_MSI
+
+static int msi_x;
+module_param(msi_x, int, 0444);
+MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero");
+
+#else /* CONFIG_PCI_MSI */
+
+#define msi_x (0)
+
+#endif /* CONFIG_PCI_MSI */
+
+static const char mlx4_version[] __devinitdata =
+        DRV_NAME ": Mellanox ConnectX core driver v"
+        DRV_VERSION " (" DRV_RELDATE ")\n";
+
+static struct mlx4_profile default_profile = {
+        .num_qp         = 1 << 16,
+        .num_srq        = 1 << 16,
+        .rdmarc_per_qp  = 4,
+        .num_cq         = 1 << 16,
+        .num_mcg        = 1 << 13,
+        .num_mpt        = 1 << 17,
+        .num_mtt        = 1 << 20,
+};
+
+static int __devinit mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
+{
+        int err;
+
+        err = mlx4_QUERY_DEV_CAP(dev, dev_cap);
+        if (err) {
+                mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");
+                return err;
+        }
+
+        if (dev_cap->min_page_sz > PAGE_SIZE) {
+                mlx4_err(dev, "HCA minimum page size of %d bigger than "
+                         "kernel PAGE_SIZE of %ld, aborting.\n",
+                         dev_cap->min_page_sz, PAGE_SIZE);
+                return -ENODEV;
+        }
+        if (dev_cap->num_ports > MLX4_MAX_PORTS) {
+                mlx4_err(dev, "HCA has %d ports, but we only support %d, "
+                         "aborting.\n",
+                         dev_cap->num_ports, MLX4_MAX_PORTS);
+                return -ENODEV;
+        }
+
+        if (dev_cap->uar_size > pci_resource_len(dev->pdev, 2)) {
+                mlx4_err(dev, "HCA reported UAR size of 0x%x bigger than "
+                         "PCI resource 2 size of 0x%llx, aborting.\n",
+                         dev_cap->uar_size,
+                         (unsigned long long) pci_resource_len(dev->pdev, 2));
+                return -ENODEV;
+        }
+
+        dev->caps.num_ports          = dev_cap->num_ports;
+        dev->caps.num_uars           = dev_cap->uar_size / PAGE_SIZE;
+        dev->caps.vl_cap             = dev_cap->max_vl;
+        dev->caps.mtu_cap            = dev_cap->max_mtu;
+        dev->caps.gid_table_len      = dev_cap->max_gids;
+        dev->caps.pkey_table_len     = dev_cap->max_pkeys;
+        dev->caps.local_ca_ack_delay = dev_cap->local_ca_ack_delay;
+        dev->caps.bf_reg_size        = dev_cap->bf_reg_size;
+        dev->caps.bf_regs_per_page   = dev_cap->bf_regs_per_page;
+        dev->caps.max_sq_sg          = dev_cap->max_sq_sg;
+        dev->caps.max_rq_sg          = dev_cap->max_rq_sg;
+        dev->caps.max_wqes           = dev_cap->max_qp_sz;
+        dev->caps.max_qp_init_rdma   = dev_cap->max_requester_per_qp;
+        dev->caps.reserved_qps       = dev_cap->reserved_qps;
+        dev->caps.max_srq_wqes       = dev_cap->max_srq_sz;
+        dev->caps.max_srq_sge        = dev_cap->max_rq_sg - 1;
+        dev->caps.reserved_srqs      = dev_cap->reserved_srqs;
+        dev->caps.max_sq_desc_sz     = dev_cap->max_sq_desc_sz;
+        dev->caps.max_rq_desc_sz     = dev_cap->max_rq_desc_sz;
+        dev->caps.num_qp_per_mgm     = MLX4_QP_PER_MGM;
+        /*
+         * Subtract 1 from the limit because we need to allocate a
+         * spare CQE so the HCA HW can tell the difference between an
+         * empty CQ and a full CQ.
+         */
+        dev->caps.max_cqes           = dev_cap->max_cq_sz - 1;
+        dev->caps.reserved_cqs       = dev_cap->reserved_cqs;
+        dev->caps.reserved_eqs       = dev_cap->reserved_eqs;
+        dev->caps.reserved_mtts      = dev_cap->reserved_mtts;
+        dev->caps.reserved_mrws      = dev_cap->reserved_mrws;
+        dev->caps.reserved_uars      = dev_cap->reserved_uars;
+        dev->caps.reserved_pds       = dev_cap->reserved_pds;
+        dev->caps.port_width_cap     = dev_cap->max_port_width;
+        dev->caps.mtt_entry_sz       = MLX4_MTT_ENTRY_PER_SEG * dev_cap->mtt_entry_sz;
+        dev->caps.page_size_cap      = ~(u32) (dev_cap->min_page_sz - 1);
+        dev->caps.flags              = dev_cap->flags;
+        dev->caps.stat_rate_support  = dev_cap->stat_rate_support;
+
+        return 0;
+}
+
+static int __devinit mlx4_load_fw(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+
+        priv->fw.fw_icm = mlx4_alloc_icm(dev, priv->fw.fw_pages,
+                                         GFP_HIGHUSER | __GFP_NOWARN);
+        if (!priv->fw.fw_icm) {
+                mlx4_err(dev, "Couldn't allocate FW area, aborting.\n");
+                return -ENOMEM;
+        }
+
+        err = mlx4_MAP_FA(dev, priv->fw.fw_icm);
+        if (err) {
+                mlx4_err(dev, "MAP_FA command failed, aborting.\n");
+                goto err_free;
+        }
+
+        err = mlx4_RUN_FW(dev);
+        if (err) {
+                mlx4_err(dev, "RUN_FW command failed, aborting.\n");
+                goto err_unmap_fa;
+        }
+
+        return 0;
+
+err_unmap_fa:
+        mlx4_UNMAP_FA(dev);
+
+err_free:
+        mlx4_free_icm(dev, priv->fw.fw_icm);
+        return err;
+}
+
+static int __devinit mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base,
+                                          int cmpt_entry_sz)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+
+        err = mlx4_init_icm_table(dev, &priv->qp_table.cmpt_table,
+                                  cmpt_base +
+                                  ((u64) (MLX4_CMPT_TYPE_QP *
+                                          cmpt_entry_sz) << MLX4_CMPT_SHIFT),
+                                  cmpt_entry_sz, dev->caps.num_qps,
+                                  dev->caps.reserved_qps, 0);
+        if (err)
+                goto err;
+
+        err = mlx4_init_icm_table(dev, &priv->srq_table.cmpt_table,
+                                  cmpt_base +
+                                  ((u64) (MLX4_CMPT_TYPE_SRQ *
+                                          cmpt_entry_sz) << MLX4_CMPT_SHIFT),
+                                  cmpt_entry_sz, dev->caps.num_srqs,
+                                  dev->caps.reserved_srqs, 0);
+        if (err)
+                goto err_qp;
+
+        err = mlx4_init_icm_table(dev, &priv->cq_table.cmpt_table,
+                                  cmpt_base +
+                                  ((u64) (MLX4_CMPT_TYPE_CQ *
+                                          cmpt_entry_sz) << MLX4_CMPT_SHIFT),
+                                  cmpt_entry_sz, dev->caps.num_cqs,
+                                  dev->caps.reserved_cqs, 0);
+        if (err)
+                goto err_srq;
+
+        err = mlx4_init_icm_table(dev, &priv->eq_table.cmpt_table,
+                                  cmpt_base +
+                                  ((u64) (MLX4_CMPT_TYPE_EQ *
+                                          cmpt_entry_sz) << MLX4_CMPT_SHIFT),
+                                  cmpt_entry_sz,
+                                  roundup_pow_of_two(MLX4_NUM_EQ +
+                                                     dev->caps.reserved_eqs),
+                                  MLX4_NUM_EQ + dev->caps.reserved_eqs, 0);
+        if (err)
+                goto err_cq;
+
+        return 0;
+
+err_cq:
+        mlx4_cleanup_icm_table(dev, &priv->cq_table.cmpt_table);
+
+err_srq:
+        mlx4_cleanup_icm_table(dev, &priv->srq_table.cmpt_table);
+
+err_qp:
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.cmpt_table);
+
+err:
+        return err;
+}
+
+static int __devinit mlx4_init_icm(struct mlx4_dev *dev,
+                                   struct mlx4_dev_cap *dev_cap,
+                                   struct mlx4_init_hca_param *init_hca,
+                                   u64 icm_size)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        u64 aux_pages;
+        int err;
+
+        err = mlx4_SET_ICM_SIZE(dev, icm_size, &aux_pages);
+        if (err) {
+                mlx4_err(dev, "SET_ICM_SIZE command failed, aborting.\n");
+                return err;
+        }
+
+        mlx4_dbg(dev, "%lld KB of HCA context requires %lld KB aux memory.\n",
+                 (unsigned long long) icm_size >> 10,
+                 (unsigned long long) aux_pages << 2);
+
+        priv->fw.aux_icm = mlx4_alloc_icm(dev, aux_pages,
+                                          GFP_HIGHUSER | __GFP_NOWARN);
+        if (!priv->fw.aux_icm) {
+                mlx4_err(dev, "Couldn't allocate aux memory, aborting.\n");
+                return -ENOMEM;
+        }
+
+        err = mlx4_MAP_ICM_AUX(dev, priv->fw.aux_icm);
+        if (err) {
+                mlx4_err(dev, "MAP_ICM_AUX command failed, aborting.\n");
+                goto err_free_aux;
+        }
+
+        err = mlx4_init_cmpt_table(dev, init_hca->cmpt_base, dev_cap->cmpt_entry_sz);
+        if (err) {
+                mlx4_err(dev, "Failed to map cMPT context memory, aborting.\n");
+                goto err_unmap_aux;
+        }
+
+        err = mlx4_map_eq_icm(dev, init_hca->eqc_base);
+        if (err) {
+                mlx4_err(dev, "Failed to map EQ context memory, aborting.\n");
+                goto err_unmap_cmpt;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->mr_table.mtt_table,
+                                  init_hca->mtt_base,
+                                  dev->caps.mtt_entry_sz,
+                                  dev->caps.num_mtt_segs,
+                                  dev->caps.reserved_mtts, 1);
+        if (err) {
+                mlx4_err(dev, "Failed to map MTT context memory, aborting.\n");
+                goto err_unmap_eq;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->mr_table.dmpt_table,
+                                  init_hca->dmpt_base,
+                                  dev_cap->dmpt_entry_sz,
+                                  dev->caps.num_mpts,
+                                  dev->caps.reserved_mrws, 1);
+        if (err) {
+                mlx4_err(dev, "Failed to map dMPT context memory, aborting.\n");
+                goto err_unmap_mtt;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->qp_table.qp_table,
+                                  init_hca->qpc_base,
+                                  dev_cap->qpc_entry_sz,
+                                  dev->caps.num_qps,
+                                  dev->caps.reserved_qps, 0);
+        if (err) {
+                mlx4_err(dev, "Failed to map QP context memory, aborting.\n");
+                goto err_unmap_dmpt;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->qp_table.auxc_table,
+                                  init_hca->auxc_base,
+                                  dev_cap->aux_entry_sz,
+                                  dev->caps.num_qps,
+                                  dev->caps.reserved_qps, 0);
+        if (err) {
+                mlx4_err(dev, "Failed to map AUXC context memory, aborting.\n");
+                goto err_unmap_qp;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->qp_table.altc_table,
+                                  init_hca->altc_base,
+                                  dev_cap->altc_entry_sz,
+                                  dev->caps.num_qps,
+                                  dev->caps.reserved_qps, 0);
+        if (err) {
+                mlx4_err(dev, "Failed to map ALTC context memory, aborting.\n");
+                goto err_unmap_auxc;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->qp_table.rdmarc_table,
+                                  init_hca->rdmarc_base,
+                                  dev_cap->rdmarc_entry_sz << priv->qp_table.rdmarc_shift,
+                                  dev->caps.num_qps,
+                                  dev->caps.reserved_qps, 0);
+        if (err) {
+                mlx4_err(dev, "Failed to map RDMARC context memory, aborting\n");
+                goto err_unmap_altc;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->cq_table.table,
+                                  init_hca->cqc_base,
+                                  dev_cap->cqc_entry_sz,
+                                  dev->caps.num_cqs,
+                                  dev->caps.reserved_cqs, 0);
+        if (err) {
+                mlx4_err(dev, "Failed to map CQ context memory, aborting.\n");
+                goto err_unmap_rdmarc;
+        }
+
+        err = mlx4_init_icm_table(dev, &priv->srq_table.table,
+                                  init_hca->srqc_base,
+                                  dev_cap->srq_entry_sz,
+                                  dev->caps.num_srqs,
+                                  dev->caps.reserved_srqs, 0);
+        if (err) {
+                mlx4_err(dev, "Failed to map SRQ context memory, aborting.\n");
+                goto err_unmap_cq;
+        }
+
+        /*
+         * It's not strictly required, but for simplicity just map the
+         * whole multicast group table now.  The table isn't very big
+         * and it's a lot easier than trying to track ref counts.
+         */
+        err = mlx4_init_icm_table(dev, &priv->mcg_table.table,
+                                  init_hca->mc_base, MLX4_MGM_ENTRY_SIZE,
+                                  dev->caps.num_mgms + dev->caps.num_amgms,
+                                  dev->caps.num_mgms + dev->caps.num_amgms,
+                                  0);
+        if (err) {
+                mlx4_err(dev, "Failed to map MCG context memory, aborting.\n");
+                goto err_unmap_srq;
+        }
+
+        return 0;
+
+err_unmap_srq:
+        mlx4_cleanup_icm_table(dev, &priv->srq_table.table);
+
+err_unmap_cq:
+        mlx4_cleanup_icm_table(dev, &priv->cq_table.table);
+
+err_unmap_rdmarc:
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.rdmarc_table);
+
+err_unmap_altc:
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.altc_table);
+
+err_unmap_auxc:
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.auxc_table);
+
+err_unmap_qp:
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.qp_table);
+
+err_unmap_dmpt:
+        mlx4_cleanup_icm_table(dev, &priv->mr_table.dmpt_table);
+
+err_unmap_mtt:
+        mlx4_cleanup_icm_table(dev, &priv->mr_table.mtt_table);
+
+err_unmap_eq:
+        mlx4_unmap_eq_icm(dev);
+
+err_unmap_cmpt:
+        mlx4_cleanup_icm_table(dev, &priv->eq_table.cmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->cq_table.cmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->srq_table.cmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.cmpt_table);
+
+err_unmap_aux:
+        mlx4_UNMAP_ICM_AUX(dev);
+
+err_free_aux:
+        mlx4_free_icm(dev, priv->fw.aux_icm);
+
+        return err;
+}
+
+static void mlx4_free_icms(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        mlx4_cleanup_icm_table(dev, &priv->mcg_table.table);
+        mlx4_cleanup_icm_table(dev, &priv->srq_table.table);
+        mlx4_cleanup_icm_table(dev, &priv->cq_table.table);
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.rdmarc_table);
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.altc_table);
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.auxc_table);
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.qp_table);
+        mlx4_cleanup_icm_table(dev, &priv->mr_table.dmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->mr_table.mtt_table);
+        mlx4_cleanup_icm_table(dev, &priv->eq_table.cmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->cq_table.cmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->srq_table.cmpt_table);
+        mlx4_cleanup_icm_table(dev, &priv->qp_table.cmpt_table);
+        mlx4_unmap_eq_icm(dev);
+
+        mlx4_UNMAP_ICM_AUX(dev);
+        mlx4_free_icm(dev, priv->fw.aux_icm);
+}
+
+static void mlx4_close_hca(struct mlx4_dev *dev)
+{
+        mlx4_CLOSE_HCA(dev, 0);
+        mlx4_free_icms(dev);
+        mlx4_UNMAP_FA(dev);
+        mlx4_free_icm(dev, mlx4_priv(dev)->fw.fw_icm);
+}
+
+static int __devinit mlx4_init_hca(struct mlx4_dev *dev)
+{
+        struct mlx4_priv          *priv = mlx4_priv(dev);
+        struct mlx4_adapter        adapter;
+        struct mlx4_dev_cap        dev_cap;
+        struct mlx4_profile        profile;
+        struct mlx4_init_hca_param init_hca;
+        u64 icm_size;
+        int err;
+
+        err = mlx4_QUERY_FW(dev);
+        if (err) {
+                mlx4_err(dev, "QUERY_FW command failed, aborting.\n");
+                return err;
+        }
+
+        err = mlx4_load_fw(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to start FW, aborting.\n");
+                return err;
+        }
+
+        err = mlx4_dev_cap(dev, &dev_cap);
+        if (err) {
+                mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");
+                goto err_stop_fw;
+        }
+
+        profile = default_profile;
+
+        icm_size = mlx4_make_profile(dev, &profile, &dev_cap, &init_hca);
+        if ((long long) icm_size < 0) {
+                err = icm_size;
+                goto err_stop_fw;
+        }
+
+        init_hca.log_uar_sz = ilog2(dev->caps.num_uars);
+
+        err = mlx4_init_icm(dev, &dev_cap, &init_hca, icm_size);
+        if (err)
+                goto err_stop_fw;
+
+        err = mlx4_INIT_HCA(dev, &init_hca);
+        if (err) {
+                mlx4_err(dev, "INIT_HCA command failed, aborting.\n");
+                goto err_free_icm;
+        }
+
+        err = mlx4_QUERY_ADAPTER(dev, &adapter);
+        if (err) {
+                mlx4_err(dev, "QUERY_ADAPTER command failed, aborting.\n");
+                goto err_close;
+        }
+
+        priv->eq_table.inta_pin = adapter.inta_pin;
+        priv->rev_id            = adapter.revision_id;
+        memcpy(priv->board_id, adapter.board_id, sizeof priv->board_id);
+
+        return 0;
+
+err_close:
+        mlx4_close_hca(dev);
+
+err_free_icm:
+        mlx4_free_icms(dev);
+
+err_stop_fw:
+        mlx4_UNMAP_FA(dev);
+        mlx4_free_icm(dev, priv->fw.fw_icm);
+
+        return err;
+}
+
+static int __devinit mlx4_setup_hca(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+
+        err = mlx4_init_uar_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "user access region table, aborting.\n");
+                return err;
+        }
+
+        err = mlx4_uar_alloc(dev, &priv->driver_uar);
+        if (err) {
+                mlx4_err(dev, "Failed to allocate driver access region, "
+                         "aborting.\n");
+                goto err_uar_table_free;
+        }
+
+        priv->kar = ioremap(priv->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        if (!priv->kar) {
+                mlx4_err(dev, "Couldn't map kernel access region, "
+                         "aborting.\n");
+                err = -ENOMEM;
+                goto err_uar_free;
+        }
+
+        err = mlx4_init_pd_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "protection domain table, aborting.\n");
+                goto err_kar_unmap;
+        }
+
+        err = mlx4_init_mr_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "memory region table, aborting.\n");
+                goto err_pd_table_free;
+        }
+
+        mlx4_map_catas_buf(dev);
+
+        err = mlx4_init_eq_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "event queue table, aborting.\n");
+                goto err_catas_buf;
+        }
+
+        err = mlx4_cmd_use_events(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to switch to event-driven "
+                         "firmware commands, aborting.\n");
+                goto err_eq_table_free;
+        }
+
+        err = mlx4_NOP(dev);
+        if (err) {
+                mlx4_err(dev, "NOP command failed to generate interrupt "
+                         "(IRQ %d), aborting.\n",
+                         priv->eq_table.eq[MLX4_EQ_ASYNC].irq);
+                if (dev->flags & MLX4_FLAG_MSI_X)
+                        mlx4_err(dev, "Try again with MSI-X disabled.\n");
+                else
+                        mlx4_err(dev, "BIOS or ACPI interrupt routing problem?\n");
+
+                goto err_cmd_poll;
+        }
+
+        mlx4_dbg(dev, "NOP command IRQ test passed\n");
+
+        err = mlx4_init_cq_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "completion queue table, aborting.\n");
+                goto err_cmd_poll;
+        }
+
+        err = mlx4_init_srq_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "shared receive queue table, aborting.\n");
+                goto err_cq_table_free;
+        }
+
+        err = mlx4_init_qp_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "queue pair table, aborting.\n");
+                goto err_srq_table_free;
+        }
+
+        err = mlx4_init_mcg_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "multicast group table, aborting.\n");
+                goto err_qp_table_free;
+        }
+
+        return 0;
+
+err_qp_table_free:
+        mlx4_cleanup_qp_table(dev);
+
+err_srq_table_free:
+        mlx4_cleanup_srq_table(dev);
+
+err_cq_table_free:
+        mlx4_cleanup_cq_table(dev);
+
+err_cmd_poll:
+        mlx4_cmd_use_polling(dev);
+
+err_eq_table_free:
+        mlx4_cleanup_eq_table(dev);
+
+err_catas_buf:
+        mlx4_unmap_catas_buf(dev);
+        mlx4_cleanup_mr_table(dev);
+
+err_pd_table_free:
+        mlx4_cleanup_pd_table(dev);
+
+err_kar_unmap:
+        iounmap(priv->kar);
+
+err_uar_free:
+        mlx4_uar_free(dev, &priv->driver_uar);
+
+err_uar_table_free:
+        mlx4_cleanup_uar_table(dev);
+        return err;
+}
+
+static void __devinit mlx4_enable_msi_x(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct msix_entry entries[MLX4_NUM_EQ];
+        int err;
+        int i;
+
+        if (msi_x) {
+                for (i = 0; i < MLX4_NUM_EQ; ++i)
+                        entries[i].entry = i;
+
+                err = pci_enable_msix(dev->pdev, entries, ARRAY_SIZE(entries));
+                if (err) {
+                        if (err > 0)
+                                mlx4_info(dev, "Only %d MSI-X vectors available, "
+                                          "not using MSI-X\n", err);
+                        goto no_msi;
+                }
+
+                for (i = 0; i < MLX4_NUM_EQ; ++i)
+                        priv->eq_table.eq[i].irq = entries[i].vector;
+
+                dev->flags |= MLX4_FLAG_MSI_X;
+                return;
+        }
+
+no_msi:
+        for (i = 0; i < MLX4_NUM_EQ; ++i)
+                priv->eq_table.eq[i].irq = dev->pdev->irq;
+}
+
+static int __devinit mlx4_init_one(struct pci_dev *pdev,
+                                   const struct pci_device_id *id)
+{
+        static int mlx4_version_printed;
+        struct mlx4_priv *priv;
+        struct mlx4_dev *dev;
+        int err;
+
+        if (!mlx4_version_printed) {
+                printk(KERN_INFO "%s", mlx4_version);
+                ++mlx4_version_printed;
+        }
+
+        printk(KERN_INFO PFX "Initializing %s\n",
+               pci_name(pdev));
+
+        err = pci_enable_device(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "Cannot enable PCI device, "
+                        "aborting.\n");
+                return err;
+        }
+
+        /*
+         * Check for BARs.  We expect 0: 1MB, 2: 8MB, 4: DDR (may not
+         * be present)
+         */
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM) ||
+            pci_resource_len(pdev, 0) != 1 << 20) {
+                dev_err(&pdev->dev, "Missing DCS, aborting.\n");
+                err = -ENODEV;
+                goto err_disable_pdev;
+        }
+        if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM)) {
+                dev_err(&pdev->dev, "Missing UAR, aborting.\n");
+                err = -ENODEV;
+                goto err_disable_pdev;
+        }
+
+        err = pci_request_region(pdev, 0, DRV_NAME);
+        if (err) {
+                dev_err(&pdev->dev, "Cannot request control region, aborting.\n");
+                goto err_disable_pdev;
+        }
+
+        err = pci_request_region(pdev, 2, DRV_NAME);
+        if (err) {
+                dev_err(&pdev->dev, "Cannot request UAR region, aborting.\n");
+                goto err_release_bar0;
+        }
+
+        pci_set_master(pdev);
+
+        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        if (err) {
+                dev_warn(&pdev->dev, "Warning: couldn't set 64-bit PCI DMA mask.\n");
+                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                if (err) {
+                        dev_err(&pdev->dev, "Can't set PCI DMA mask, aborting.\n");
+                        goto err_release_bar2;
+                }
+        }
+        err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+        if (err) {
+                dev_warn(&pdev->dev, "Warning: couldn't set 64-bit "
+                         "consistent PCI DMA mask.\n");
+                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                if (err) {
+                        dev_err(&pdev->dev, "Can't set consistent PCI DMA mask, "
+                                "aborting.\n");
+                        goto err_release_bar2;
+                }
+        }
+
+        priv = kzalloc(sizeof *priv, GFP_KERNEL);
+        if (!priv) {
+                dev_err(&pdev->dev, "Device struct alloc failed, "
+                        "aborting.\n");
+                err = -ENOMEM;
+                goto err_release_bar2;
+        }
+
+        dev       = &priv->dev;
+        dev->pdev = pdev;
+
+        /*
+         * Now reset the HCA before we touch the PCI capabilities or
+         * attempt a firmware command, since a boot ROM may have left
+         * the HCA in an undefined state.
+         */
+        err = mlx4_reset(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to reset HCA, aborting.\n");
+                goto err_free_dev;
+        }
+
+        mlx4_enable_msi_x(dev);
+
+        if (mlx4_cmd_init(dev)) {
+                mlx4_err(dev, "Failed to init command interface, aborting.\n");
+                goto err_free_dev;
+        }
+
+        err = mlx4_init_hca(dev);
+        if (err)
+                goto err_cmd;
+
+        err = mlx4_setup_hca(dev);
+        if (err)
+                goto err_close;
+
+        err = mlx4_register_device(dev);
+        if (err)
+                goto err_cleanup;
+
+        pci_set_drvdata(pdev, dev);
+
+        return 0;
+
+err_cleanup:
+        mlx4_cleanup_mcg_table(dev);
+        mlx4_cleanup_qp_table(dev);
+        mlx4_cleanup_srq_table(dev);
+        mlx4_cleanup_cq_table(dev);
+        mlx4_cmd_use_polling(dev);
+        mlx4_cleanup_eq_table(dev);
+
+        mlx4_unmap_catas_buf(dev);
+
+        mlx4_cleanup_mr_table(dev);
+        mlx4_cleanup_pd_table(dev);
+        mlx4_cleanup_uar_table(dev);
+
+err_close:
+        mlx4_close_hca(dev);
+
+err_cmd:
+        mlx4_cmd_cleanup(dev);
+
+err_free_dev:
+        if (dev->flags & MLX4_FLAG_MSI_X)
+                pci_disable_msix(pdev);
+
+        kfree(priv);
+
+err_release_bar2:
+        pci_release_region(pdev, 2);
+
+err_release_bar0:
+        pci_release_region(pdev, 0);
+
+err_disable_pdev:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        return err;
+}
+
+static void __devexit mlx4_remove_one(struct pci_dev *pdev)
+{
+        struct mlx4_dev  *dev  = pci_get_drvdata(pdev);
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int p;
+
+        if (dev) {
+                mlx4_unregister_device(dev);
+
+                for (p = 1; p <= dev->caps.num_ports; ++p)
+                        mlx4_CLOSE_PORT(dev, p);
+
+                mlx4_cleanup_mcg_table(dev);
+                mlx4_cleanup_qp_table(dev);
+                mlx4_cleanup_srq_table(dev);
+                mlx4_cleanup_cq_table(dev);
+                mlx4_cmd_use_polling(dev);
+                mlx4_cleanup_eq_table(dev);
+
+                mlx4_unmap_catas_buf(dev);
+
+                mlx4_cleanup_mr_table(dev);
+                mlx4_cleanup_pd_table(dev);
+
+                iounmap(priv->kar);
+                mlx4_uar_free(dev, &priv->driver_uar);
+                mlx4_cleanup_uar_table(dev);
+                mlx4_close_hca(dev);
+                mlx4_cmd_cleanup(dev);
+
+                if (dev->flags & MLX4_FLAG_MSI_X)
+                        pci_disable_msix(pdev);
+
+                kfree(priv);
+                pci_release_region(pdev, 2);
+                pci_release_region(pdev, 0);
+                pci_disable_device(pdev);
+                pci_set_drvdata(pdev, NULL);
+        }
+}
+
+static struct pci_device_id mlx4_pci_table[] = {
+        { PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */
+        { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */
+        { PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, mlx4_pci_table);
+
+static struct pci_driver mlx4_driver = {
+        .name           = DRV_NAME,
+        .id_table       = mlx4_pci_table,
+        .probe          = mlx4_init_one,
+        .remove         = __devexit_p(mlx4_remove_one)
+};
+
+static int __init mlx4_init(void)
+{
+        int ret;
+
+        ret = pci_register_driver(&mlx4_driver);
+        return ret < 0 ? ret : 0;
+}
+
+static void __exit mlx4_cleanup(void)
+{
+        pci_unregister_driver(&mlx4_driver);
+}
+
+module_init(mlx4_init);
+module_exit(mlx4_cleanup);
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
new file mode 100644
index 000000000000..672024a0ee71
--- /dev/null
+++ b/drivers/net/mlx4/mcg.c
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4.h"
+
+struct mlx4_mgm {
+        __be32                  next_gid_index;
+        __be32                  members_count;
+        u32                     reserved[2];
+        u8                      gid[16];
+        __be32                  qp[MLX4_QP_PER_MGM];
+};
+
+static const u8 zero_gid[16];   /* automatically initialized to 0 */
+
+static int mlx4_READ_MCG(struct mlx4_dev *dev, int index,
+                         struct mlx4_cmd_mailbox *mailbox)
+{
+        return mlx4_cmd_box(dev, 0, mailbox->dma, index, 0, MLX4_CMD_READ_MCG,
+                            MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_WRITE_MCG(struct mlx4_dev *dev, int index,
+                          struct mlx4_cmd_mailbox *mailbox)
+{
+        return mlx4_cmd(dev, mailbox->dma, index, 0, MLX4_CMD_WRITE_MCG,
+                        MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_MGID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                          u16 *hash)
+{
+        u64 imm;
+        int err;
+
+        err = mlx4_cmd_imm(dev, mailbox->dma, &imm, 0, 0, MLX4_CMD_MGID_HASH,
+                           MLX4_CMD_TIME_CLASS_A);
+
+        if (!err)
+                *hash = imm;
+
+        return err;
+}
+
+/*
+ * Caller must hold MCG table semaphore.  gid and mgm parameters must
+ * be properly aligned for command interface.
+ *
+ *  Returns 0 unless a firmware command error occurs.
+ *
+ * If GID is found in MGM or MGM is empty, *index = *hash, *prev = -1
+ * and *mgm holds MGM entry.
+ *
+ * if GID is found in AMGM, *index = index in AMGM, *prev = index of
+ * previous entry in hash chain and *mgm holds AMGM entry.
+ *
+ * If no AMGM exists for given gid, *index = -1, *prev = index of last
+ * entry in hash chain and *mgm holds end of hash chain.
+ */
+static int find_mgm(struct mlx4_dev *dev,
+                    u8 *gid, struct mlx4_cmd_mailbox *mgm_mailbox,
+                    u16 *hash, int *prev, int *index)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm = mgm_mailbox->buf;
+        u8 *mgid;
+        int err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return -ENOMEM;
+        mgid = mailbox->buf;
+
+        memcpy(mgid, gid, 16);
+
+        err = mlx4_MGID_HASH(dev, mailbox, hash);
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        if (err)
+                return err;
+
+        if (0)
+                mlx4_dbg(dev, "Hash for %04x:%04x:%04x:%04x:"
+                          "%04x:%04x:%04x:%04x is %04x\n",
+                          be16_to_cpu(((__be16 *) gid)[0]),
+                          be16_to_cpu(((__be16 *) gid)[1]),
+                          be16_to_cpu(((__be16 *) gid)[2]),
+                          be16_to_cpu(((__be16 *) gid)[3]),
+                          be16_to_cpu(((__be16 *) gid)[4]),
+                          be16_to_cpu(((__be16 *) gid)[5]),
+                          be16_to_cpu(((__be16 *) gid)[6]),
+                          be16_to_cpu(((__be16 *) gid)[7]),
+                          *hash);
+
+        *index = *hash;
+        *prev  = -1;
+
+        do {
+                err = mlx4_READ_MCG(dev, *index, mgm_mailbox);
+                if (err)
+                        return err;
+
+                if (!memcmp(mgm->gid, zero_gid, 16)) {
+                        if (*index != *hash) {
+                                mlx4_err(dev, "Found zero MGID in AMGM.\n");
+                                err = -EINVAL;
+                        }
+                        return err;
+                }
+
+                if (!memcmp(mgm->gid, gid, 16))
+                        return err;
+
+                *prev = *index;
+                *index = be32_to_cpu(mgm->next_gid_index) >> 6;
+        } while (*index);
+
+        *index = -1;
+        return err;
+}
+
+int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm;
+        u32 members_count;
+        u16 hash;
+        int index, prev;
+        int link = 0;
+        int i;
+        int err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        mgm = mailbox->buf;
+
+        mutex_lock(&priv->mcg_table.mutex);
+
+        err = find_mgm(dev, gid, mailbox, &hash, &prev, &index);
+        if (err)
+                goto out;
+
+        if (index != -1) {
+                if (!memcmp(mgm->gid, zero_gid, 16))
+                        memcpy(mgm->gid, gid, 16);
+        } else {
+                link = 1;
+
+                index = mlx4_bitmap_alloc(&priv->mcg_table.bitmap);
+                if (index == -1) {
+                        mlx4_err(dev, "No AMGM entries left\n");
+                        err = -ENOMEM;
+                        goto out;
+                }
+                index += dev->caps.num_mgms;
+
+                err = mlx4_READ_MCG(dev, index, mailbox);
+                if (err)
+                        goto out;
+
+                memset(mgm, 0, sizeof *mgm);
+                memcpy(mgm->gid, gid, 16);
+        }
+
+        members_count = be32_to_cpu(mgm->members_count);
+        if (members_count == MLX4_QP_PER_MGM) {
+                mlx4_err(dev, "MGM at index %x is full.\n", index);
+                err = -ENOMEM;
+                goto out;
+        }
+
+        for (i = 0; i < members_count; ++i)
+                if (mgm->qp[i] == cpu_to_be32(qp->qpn)) {
+                        mlx4_dbg(dev, "QP %06x already a member of MGM\n", qp->qpn);
+                        err = 0;
+                        goto out;
+                }
+
+        mgm->qp[members_count++] = cpu_to_be32(qp->qpn);
+        mgm->members_count       = cpu_to_be32(members_count);
+
+        err = mlx4_WRITE_MCG(dev, index, mailbox);
+        if (err)
+                goto out;
+
+        if (!link)
+                goto out;
+
+        err = mlx4_READ_MCG(dev, prev, mailbox);
+        if (err)
+                goto out;
+
+        mgm->next_gid_index = cpu_to_be32(index << 6);
+
+        err = mlx4_WRITE_MCG(dev, prev, mailbox);
+        if (err)
+                goto out;
+
+out:
+        if (err && link && index != -1) {
+                if (index < dev->caps.num_mgms)
+                        mlx4_warn(dev, "Got AMGM index %d < %d",
+                                  index, dev->caps.num_mgms);
+                else
+                        mlx4_bitmap_free(&priv->mcg_table.bitmap,
+                                         index - dev->caps.num_mgms);
+        }
+        mutex_unlock(&priv->mcg_table.mutex);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
+
+int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm;
+        u32 members_count;
+        u16 hash;
+        int prev, index;
+        int i, loc;
+        int err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        mgm = mailbox->buf;
+
+        mutex_lock(&priv->mcg_table.mutex);
+
+        err = find_mgm(dev, gid, mailbox, &hash, &prev, &index);
+        if (err)
+                goto out;
+
+        if (index == -1) {
+                mlx4_err(dev, "MGID %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
+                          "not found\n",
+                          be16_to_cpu(((__be16 *) gid)[0]),
+                          be16_to_cpu(((__be16 *) gid)[1]),
+                          be16_to_cpu(((__be16 *) gid)[2]),
+                          be16_to_cpu(((__be16 *) gid)[3]),
+                          be16_to_cpu(((__be16 *) gid)[4]),
+                          be16_to_cpu(((__be16 *) gid)[5]),
+                          be16_to_cpu(((__be16 *) gid)[6]),
+                          be16_to_cpu(((__be16 *) gid)[7]));
+                err = -EINVAL;
+                goto out;
+        }
+
+        members_count = be32_to_cpu(mgm->members_count);
+        for (loc = -1, i = 0; i < members_count; ++i)
+                if (mgm->qp[i] == cpu_to_be32(qp->qpn))
+                        loc = i;
+
+        if (loc == -1) {
+                mlx4_err(dev, "QP %06x not found in MGM\n", qp->qpn);
+                err = -EINVAL;
+                goto out;
+        }
+
+
+        mgm->members_count = cpu_to_be32(--members_count);
+        mgm->qp[loc]       = mgm->qp[i - 1];
+        mgm->qp[i - 1]     = 0;
+
+        err = mlx4_WRITE_MCG(dev, index, mailbox);
+        if (err)
+                goto out;
+
+        if (i != 1)
+                goto out;
+
+        if (prev == -1) {
+                /* Remove entry from MGM */
+                int amgm_index = be32_to_cpu(mgm->next_gid_index) >> 6;
+                if (amgm_index) {
+                        err = mlx4_READ_MCG(dev, amgm_index, mailbox);
+                        if (err)
+                                goto out;
+                } else
+                        memset(mgm->gid, 0, 16);
+
+                err = mlx4_WRITE_MCG(dev, index, mailbox);
+                if (err)
+                        goto out;
+
+                if (amgm_index) {
+                        if (amgm_index < dev->caps.num_mgms)
+                                mlx4_warn(dev, "MGM entry %d had AMGM index %d < %d",
+                                          index, amgm_index, dev->caps.num_mgms);
+                        else
+                                mlx4_bitmap_free(&priv->mcg_table.bitmap,
+                                                 amgm_index - dev->caps.num_mgms);
+                }
+        } else {
+                /* Remove entry from AMGM */
+                int cur_next_index = be32_to_cpu(mgm->next_gid_index) >> 6;
+                err = mlx4_READ_MCG(dev, prev, mailbox);
+                if (err)
+                        goto out;
+
+                mgm->next_gid_index = cpu_to_be32(cur_next_index << 6);
+
+                err = mlx4_WRITE_MCG(dev, prev, mailbox);
+                if (err)
+                        goto out;
+
+                if (index < dev->caps.num_mgms)
+                        mlx4_warn(dev, "entry %d had next AMGM index %d < %d",
+                                  prev, index, dev->caps.num_mgms);
+                else
+                        mlx4_bitmap_free(&priv->mcg_table.bitmap,
+                                         index - dev->caps.num_mgms);
+        }
+
+out:
+        mutex_unlock(&priv->mcg_table.mutex);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_multicast_detach);
+
+int __devinit mlx4_init_mcg_table(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+
+        err = mlx4_bitmap_init(&priv->mcg_table.bitmap,
+                               dev->caps.num_amgms, dev->caps.num_amgms - 1, 0);
+        if (err)
+                return err;
+
+        mutex_init(&priv->mcg_table.mutex);
+
+        return 0;
+}
+
+void mlx4_cleanup_mcg_table(struct mlx4_dev *dev)
+{
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->mcg_table.bitmap);
+}
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
new file mode 100644
index 000000000000..3d3b6d24d8d3
--- /dev/null
+++ b/drivers/net/mlx4/mlx4.h
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef MLX4_H
+#define MLX4_H
+
+#include <linux/radix-tree.h>
+
+#include <linux/mlx4/device.h>
+#include <linux/mlx4/doorbell.h>
+
+#define DRV_NAME        "mlx4_core"
+#define PFX             DRV_NAME ": "
+#define DRV_VERSION     "0.01"
+#define DRV_RELDATE     "May 1, 2007"
+
+enum {
+        MLX4_HCR_BASE           = 0x80680,
+        MLX4_HCR_SIZE           = 0x0001c,
+        MLX4_CLR_INT_SIZE       = 0x00008
+};
+
+enum {
+        MLX4_BOARD_ID_LEN       = 64
+};
+
+enum {
+        MLX4_MGM_ENTRY_SIZE     =  0x40,
+        MLX4_QP_PER_MGM         = 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),
+        MLX4_MTT_ENTRY_PER_SEG  = 8
+};
+
+enum {
+        MLX4_EQ_ASYNC,
+        MLX4_EQ_COMP,
+        MLX4_EQ_CATAS,
+        MLX4_NUM_EQ
+};
+
+enum {
+        MLX4_NUM_PDS            = 1 << 15
+};
+
+enum {
+        MLX4_CMPT_TYPE_QP       = 0,
+        MLX4_CMPT_TYPE_SRQ      = 1,
+        MLX4_CMPT_TYPE_CQ       = 2,
+        MLX4_CMPT_TYPE_EQ       = 3,
+        MLX4_CMPT_NUM_TYPE
+};
+
+enum {
+        MLX4_CMPT_SHIFT         = 24,
+        MLX4_NUM_CMPTS          = MLX4_CMPT_NUM_TYPE << MLX4_CMPT_SHIFT
+};
+
+#ifdef CONFIG_MLX4_DEBUG
+extern int mlx4_debug_level;
+
+#define mlx4_dbg(mdev, format, arg...)                                  \
+        do {                                                            \
+                if (mlx4_debug_level)                                   \
+                        dev_printk(KERN_DEBUG, &mdev->pdev->dev, format, ## arg); \
+        } while (0)
+
+#else /* CONFIG_MLX4_DEBUG */
+
+#define mlx4_dbg(mdev, format, arg...) do { (void) mdev; } while (0)
+
+#endif /* CONFIG_MLX4_DEBUG */
+
+#define mlx4_err(mdev, format, arg...) \
+        dev_err(&mdev->pdev->dev, format, ## arg)
+#define mlx4_info(mdev, format, arg...) \
+        dev_info(&mdev->pdev->dev, format, ## arg)
+#define mlx4_warn(mdev, format, arg...) \
+        dev_warn(&mdev->pdev->dev, format, ## arg)
+
+struct mlx4_bitmap {
+        u32                     last;
+        u32                     top;
+        u32                     max;
+        u32                     mask;
+        spinlock_t              lock;
+        unsigned long          *table;
+};
+
+struct mlx4_buddy {
+        unsigned long         **bits;
+        int                     max_order;
+        spinlock_t              lock;
+};
+
+struct mlx4_icm;
+
+struct mlx4_icm_table {
+        u64                     virt;
+        int                     num_icm;
+        int                     num_obj;
+        int                     obj_size;
+        int                     lowmem;
+        struct mutex            mutex;
+        struct mlx4_icm       **icm;
+};
+
+struct mlx4_eq {
+        struct mlx4_dev        *dev;
+        void __iomem           *doorbell;
+        int                     eqn;
+        u32                     cons_index;
+        u16                     irq;
+        u16                     have_irq;
+        int                     nent;
+        struct mlx4_buf_list   *page_list;
+        struct mlx4_mtt         mtt;
+};
+
+struct mlx4_profile {
+        int                     num_qp;
+        int                     rdmarc_per_qp;
+        int                     num_srq;
+        int                     num_cq;
+        int                     num_mcg;
+        int                     num_mpt;
+        int                     num_mtt;
+};
+
+struct mlx4_fw {
+        u64                     clr_int_base;
+        u64                     catas_offset;
+        struct mlx4_icm        *fw_icm;
+        struct mlx4_icm        *aux_icm;
+        u32                     catas_size;
+        u16                     fw_pages;
+        u8                      clr_int_bar;
+        u8                      catas_bar;
+};
+
+struct mlx4_cmd {
+        struct pci_pool        *pool;
+        void __iomem           *hcr;
+        struct mutex            hcr_mutex;
+        struct semaphore        poll_sem;
+        struct semaphore        event_sem;
+        int                     max_cmds;
+        spinlock_t              context_lock;
+        int                     free_head;
+        struct mlx4_cmd_context *context;
+        u16                     token_mask;
+        u8                      use_events;
+        u8                      toggle;
+};
+
+struct mlx4_uar_table {
+        struct mlx4_bitmap      bitmap;
+};
+
+struct mlx4_mr_table {
+        struct mlx4_bitmap      mpt_bitmap;
+        struct mlx4_buddy       mtt_buddy;
+        u64                     mtt_base;
+        u64                     mpt_base;
+        struct mlx4_icm_table   mtt_table;
+        struct mlx4_icm_table   dmpt_table;
+};
+
+struct mlx4_cq_table {
+        struct mlx4_bitmap      bitmap;
+        spinlock_t              lock;
+        struct radix_tree_root  tree;
+        struct mlx4_icm_table   table;
+        struct mlx4_icm_table   cmpt_table;
+};
+
+struct mlx4_eq_table {
+        struct mlx4_bitmap      bitmap;
+        void __iomem           *clr_int;
+        void __iomem           *uar_map[(MLX4_NUM_EQ + 6) / 4];
+        u32                     clr_mask;
+        struct mlx4_eq          eq[MLX4_NUM_EQ];
+        u64                     icm_virt;
+        struct page            *icm_page;
+        dma_addr_t              icm_dma;
+        struct mlx4_icm_table   cmpt_table;
+        int                     have_irq;
+        u8                      inta_pin;
+};
+
+struct mlx4_srq_table {
+        struct mlx4_bitmap      bitmap;
+        spinlock_t              lock;
+        struct radix_tree_root  tree;
+        struct mlx4_icm_table   table;
+        struct mlx4_icm_table   cmpt_table;
+};
+
+struct mlx4_qp_table {
+        struct mlx4_bitmap      bitmap;
+        u32                     rdmarc_base;
+        int                     rdmarc_shift;
+        spinlock_t              lock;
+        struct mlx4_icm_table   qp_table;
+        struct mlx4_icm_table   auxc_table;
+        struct mlx4_icm_table   altc_table;
+        struct mlx4_icm_table   rdmarc_table;
+        struct mlx4_icm_table   cmpt_table;
+};
+
+struct mlx4_mcg_table {
+        struct mutex            mutex;
+        struct mlx4_bitmap      bitmap;
+        struct mlx4_icm_table   table;
+};
+
+struct mlx4_catas_err {
+        u32 __iomem            *map;
+        int                     size;
+};
+
+struct mlx4_priv {
+        struct mlx4_dev         dev;
+
+        struct list_head        dev_list;
+        struct list_head        ctx_list;
+        spinlock_t              ctx_lock;
+
+        struct mlx4_fw          fw;
+        struct mlx4_cmd         cmd;
+
+        struct mlx4_bitmap      pd_bitmap;
+        struct mlx4_uar_table   uar_table;
+        struct mlx4_mr_table    mr_table;
+        struct mlx4_cq_table    cq_table;
+        struct mlx4_eq_table    eq_table;
+        struct mlx4_srq_table   srq_table;
+        struct mlx4_qp_table    qp_table;
+        struct mlx4_mcg_table   mcg_table;
+
+        struct mlx4_catas_err   catas_err;
+
+        void __iomem           *clr_base;
+
+        struct mlx4_uar         driver_uar;
+        void __iomem           *kar;
+
+        u32                     rev_id;
+        char                    board_id[MLX4_BOARD_ID_LEN];
+};
+
+static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
+{
+        return container_of(dev, struct mlx4_priv, dev);
+}
+
+u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap);
+void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj);
+int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask, u32 reserved);
+void mlx4_bitmap_cleanup(struct mlx4_bitmap *bitmap);
+
+int mlx4_reset(struct mlx4_dev *dev);
+
+int mlx4_init_pd_table(struct mlx4_dev *dev);
+int mlx4_init_uar_table(struct mlx4_dev *dev);
+int mlx4_init_mr_table(struct mlx4_dev *dev);
+int mlx4_init_eq_table(struct mlx4_dev *dev);
+int mlx4_init_cq_table(struct mlx4_dev *dev);
+int mlx4_init_qp_table(struct mlx4_dev *dev);
+int mlx4_init_srq_table(struct mlx4_dev *dev);
+int mlx4_init_mcg_table(struct mlx4_dev *dev);
+
+void mlx4_cleanup_pd_table(struct mlx4_dev *dev);
+void mlx4_cleanup_uar_table(struct mlx4_dev *dev);
+void mlx4_cleanup_mr_table(struct mlx4_dev *dev);
+void mlx4_cleanup_eq_table(struct mlx4_dev *dev);
+void mlx4_cleanup_cq_table(struct mlx4_dev *dev);
+void mlx4_cleanup_qp_table(struct mlx4_dev *dev);
+void mlx4_cleanup_srq_table(struct mlx4_dev *dev);
+void mlx4_cleanup_mcg_table(struct mlx4_dev *dev);
+
+void mlx4_map_catas_buf(struct mlx4_dev *dev);
+void mlx4_unmap_catas_buf(struct mlx4_dev *dev);
+
+int mlx4_register_device(struct mlx4_dev *dev);
+void mlx4_unregister_device(struct mlx4_dev *dev);
+void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_event type,
+                         int subtype, int port);
+
+struct mlx4_dev_cap;
+struct mlx4_init_hca_param;
+
+u64 mlx4_make_profile(struct mlx4_dev *dev,
+                      struct mlx4_profile *request,
+                      struct mlx4_dev_cap *dev_cap,
+                      struct mlx4_init_hca_param *init_hca);
+
+int mlx4_map_eq_icm(struct mlx4_dev *dev, u64 icm_virt);
+void mlx4_unmap_eq_icm(struct mlx4_dev *dev);
+
+int mlx4_cmd_init(struct mlx4_dev *dev);
+void mlx4_cmd_cleanup(struct mlx4_dev *dev);
+void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 status, u64 out_param);
+int mlx4_cmd_use_events(struct mlx4_dev *dev);
+void mlx4_cmd_use_polling(struct mlx4_dev *dev);
+
+void mlx4_cq_completion(struct mlx4_dev *dev, u32 cqn);
+void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type);
+
+void mlx4_qp_event(struct mlx4_dev *dev, u32 qpn, int event_type);
+
+void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type);
+
+void mlx4_handle_catas_err(struct mlx4_dev *dev);
+
+#endif /* MLX4_H */
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
new file mode 100644
index 000000000000..b33864dab179
--- /dev/null
+++ b/drivers/net/mlx4/mr.c
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2004 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/errno.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4.h"
+#include "icm.h"
+
+/*
+ * Must be packed because mtt_seg is 64 bits but only aligned to 32 bits.
+ */
+struct mlx4_mpt_entry {
+        __be32 flags;
+        __be32 qpn;
+        __be32 key;
+        __be32 pd;
+        __be64 start;
+        __be64 length;
+        __be32 lkey;
+        __be32 win_cnt;
+        u8      reserved1[3];
+        u8      mtt_rep;
+        __be64 mtt_seg;
+        __be32 mtt_sz;
+        __be32 entity_size;
+        __be32 first_byte_offset;
+} __attribute__((packed));
+
+#define MLX4_MPT_FLAG_SW_OWNS       (0xfUL << 28)
+#define MLX4_MPT_FLAG_MIO           (1 << 17)
+#define MLX4_MPT_FLAG_BIND_ENABLE   (1 << 15)
+#define MLX4_MPT_FLAG_PHYSICAL      (1 <<  9)
+#define MLX4_MPT_FLAG_REGION        (1 <<  8)
+
+#define MLX4_MTT_FLAG_PRESENT           1
+
+static u32 mlx4_buddy_alloc(struct mlx4_buddy *buddy, int order)
+{
+        int o;
+        int m;
+        u32 seg;
+
+        spin_lock(&buddy->lock);
+
+        for (o = order; o <= buddy->max_order; ++o) {
+                m = 1 << (buddy->max_order - o);
+                seg = find_first_bit(buddy->bits[o], m);
+                if (seg < m)
+                        goto found;
+        }
+
+        spin_unlock(&buddy->lock);
+        return -1;
+
+ found:
+        clear_bit(seg, buddy->bits[o]);
+
+        while (o > order) {
+                --o;
+                seg <<= 1;
+                set_bit(seg ^ 1, buddy->bits[o]);
+        }
+
+        spin_unlock(&buddy->lock);
+
+        seg <<= order;
+
+        return seg;
+}
+
+static void mlx4_buddy_free(struct mlx4_buddy *buddy, u32 seg, int order)
+{
+        seg >>= order;
+
+        spin_lock(&buddy->lock);
+
+        while (test_bit(seg ^ 1, buddy->bits[order])) {
+                clear_bit(seg ^ 1, buddy->bits[order]);
+                seg >>= 1;
+                ++order;
+        }
+
+        set_bit(seg, buddy->bits[order]);
+
+        spin_unlock(&buddy->lock);
+}
+
+static int __devinit mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
+{
+        int i, s;
+
+        buddy->max_order = max_order;
+        spin_lock_init(&buddy->lock);
+
+        buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
+                              GFP_KERNEL);
+        if (!buddy->bits)
+                goto err_out;
+
+        for (i = 0; i <= buddy->max_order; ++i) {
+                s = BITS_TO_LONGS(1 << (buddy->max_order - i));
+                buddy->bits[i] = kmalloc(s * sizeof (long), GFP_KERNEL);
+                if (!buddy->bits[i])
+                        goto err_out_free;
+                bitmap_zero(buddy->bits[i], 1 << (buddy->max_order - i));
+        }
+
+        set_bit(0, buddy->bits[buddy->max_order]);
+
+        return 0;
+
+err_out_free:
+        for (i = 0; i <= buddy->max_order; ++i)
+                kfree(buddy->bits[i]);
+
+        kfree(buddy->bits);
+
+err_out:
+        return -ENOMEM;
+}
+
+static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)
+{
+        int i;
+
+        for (i = 0; i <= buddy->max_order; ++i)
+                kfree(buddy->bits[i]);
+
+        kfree(buddy->bits);
+}
+
+static u32 mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)
+{
+        struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
+        u32 seg;
+
+        seg = mlx4_buddy_alloc(&mr_table->mtt_buddy, order);
+        if (seg == -1)
+                return -1;
+
+        if (mlx4_table_get_range(dev, &mr_table->mtt_table, seg,
+                                 seg + (1 << order) - 1)) {
+                mlx4_buddy_free(&mr_table->mtt_buddy, seg, order);
+                return -1;
+        }
+
+        return seg;
+}
+
+int mlx4_mtt_init(struct mlx4_dev *dev, int npages, int page_shift,
+                  struct mlx4_mtt *mtt)
+{
+        int i;
+
+        if (!npages) {
+                mtt->order      = -1;
+                mtt->page_shift = MLX4_ICM_PAGE_SHIFT;
+                return 0;
+        } else
+                mtt->page_shift = page_shift;
+
+        for (mtt->order = 0, i = MLX4_MTT_ENTRY_PER_SEG; i < npages; i <<= 1)
+                ++mtt->order;
+
+        mtt->first_seg = mlx4_alloc_mtt_range(dev, mtt->order);
+        if (mtt->first_seg == -1)
+                return -ENOMEM;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_mtt_init);
+
+void mlx4_mtt_cleanup(struct mlx4_dev *dev, struct mlx4_mtt *mtt)
+{
+        struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
+
+        if (mtt->order < 0)
+                return;
+
+        mlx4_buddy_free(&mr_table->mtt_buddy, mtt->first_seg, mtt->order);
+        mlx4_table_put_range(dev, &mr_table->mtt_table, mtt->first_seg,
+                             mtt->first_seg + (1 << mtt->order) - 1);
+}
+EXPORT_SYMBOL_GPL(mlx4_mtt_cleanup);
+
+u64 mlx4_mtt_addr(struct mlx4_dev *dev, struct mlx4_mtt *mtt)
+{
+        return (u64) mtt->first_seg * dev->caps.mtt_entry_sz;
+}
+EXPORT_SYMBOL_GPL(mlx4_mtt_addr);
+
+static u32 hw_index_to_key(u32 ind)
+{
+        return (ind >> 24) | (ind << 8);
+}
+
+static u32 key_to_hw_index(u32 key)
+{
+        return (key << 24) | (key >> 8);
+}
+
+static int mlx4_SW2HW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                          int mpt_index)
+{
+        return mlx4_cmd(dev, mailbox->dma, mpt_index, 0, MLX4_CMD_SW2HW_MPT,
+                        MLX4_CMD_TIME_CLASS_B);
+}
+
+static int mlx4_HW2SW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                          int mpt_index)
+{
+        return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0, mpt_index,
+                            !mailbox, MLX4_CMD_HW2SW_MPT, MLX4_CMD_TIME_CLASS_B);
+}
+
+int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
+                  int npages, int page_shift, struct mlx4_mr *mr)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        u32 index;
+        int err;
+
+        index = mlx4_bitmap_alloc(&priv->mr_table.mpt_bitmap);
+        if (index == -1) {
+                err = -ENOMEM;
+                goto err;
+        }
+
+        mr->iova       = iova;
+        mr->size       = size;
+        mr->pd         = pd;
+        mr->access     = access;
+        mr->enabled    = 0;
+        mr->key        = hw_index_to_key(index);
+
+        err = mlx4_mtt_init(dev, npages, page_shift, &mr->mtt);
+        if (err)
+                goto err_index;
+
+        return 0;
+
+err_index:
+        mlx4_bitmap_free(&priv->mr_table.mpt_bitmap, index);
+
+err:
+        kfree(mr);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_mr_alloc);
+
+void mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+
+        if (mr->enabled) {
+                err = mlx4_HW2SW_MPT(dev, NULL,
+                                     key_to_hw_index(mr->key) &
+                                     (dev->caps.num_mpts - 1));
+                if (err)
+                        mlx4_warn(dev, "HW2SW_MPT failed (%d)\n", err);
+        }
+
+        mlx4_mtt_cleanup(dev, &mr->mtt);
+        mlx4_bitmap_free(&priv->mr_table.mpt_bitmap, key_to_hw_index(mr->key));
+}
+EXPORT_SYMBOL_GPL(mlx4_mr_free);
+
+int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
+{
+        struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mpt_entry *mpt_entry;
+        int err;
+
+        err = mlx4_table_get(dev, &mr_table->dmpt_table, key_to_hw_index(mr->key));
+        if (err)
+                return err;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                err = PTR_ERR(mailbox);
+                goto err_table;
+        }
+        mpt_entry = mailbox->buf;
+
+        memset(mpt_entry, 0, sizeof *mpt_entry);
+
+        mpt_entry->flags = cpu_to_be32(MLX4_MPT_FLAG_SW_OWNS     |
+                                       MLX4_MPT_FLAG_MIO         |
+                                       MLX4_MPT_FLAG_REGION      |
+                                       mr->access);
+        if (mr->mtt.order < 0)
+                mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_PHYSICAL);
+
+        mpt_entry->key         = cpu_to_be32(key_to_hw_index(mr->key));
+        mpt_entry->pd          = cpu_to_be32(mr->pd);
+        mpt_entry->start       = cpu_to_be64(mr->iova);
+        mpt_entry->length      = cpu_to_be64(mr->size);
+        mpt_entry->entity_size = cpu_to_be32(mr->mtt.page_shift);
+        mpt_entry->mtt_seg     = cpu_to_be64(mlx4_mtt_addr(dev, &mr->mtt));
+
+        err = mlx4_SW2HW_MPT(dev, mailbox,
+                             key_to_hw_index(mr->key) & (dev->caps.num_mpts - 1));
+        if (err) {
+                mlx4_warn(dev, "SW2HW_MPT failed (%d)\n", err);
+                goto err_cmd;
+        }
+
+        mr->enabled = 1;
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+        return 0;
+
+err_cmd:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+err_table:
+        mlx4_table_put(dev, &mr_table->dmpt_table, key_to_hw_index(mr->key));
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_mr_enable);
+
+static int mlx4_WRITE_MTT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                          int num_mtt)
+{
+        return mlx4_cmd(dev, mailbox->dma, num_mtt, 0, MLX4_CMD_WRITE_MTT,
+                        MLX4_CMD_TIME_CLASS_B);
+}
+
+int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
+                   int start_index, int npages, u64 *page_list)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        __be64 *mtt_entry;
+        int i;
+        int err = 0;
+
+        if (mtt->order < 0)
+                return -EINVAL;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+
+        mtt_entry = mailbox->buf;
+
+        while (npages > 0) {
+                mtt_entry[0] = cpu_to_be64(mlx4_mtt_addr(dev, mtt) + start_index * 8);
+                mtt_entry[1] = 0;
+
+                for (i = 0; i < npages && i < MLX4_MAILBOX_SIZE / 8 - 2; ++i)
+                        mtt_entry[i + 2] = cpu_to_be64(page_list[i] |
+                                                       MLX4_MTT_FLAG_PRESENT);
+
+                /*
+                 * If we have an odd number of entries to write, add
+                 * one more dummy entry for firmware efficiency.
+                 */
+                if (i & 1)
+                        mtt_entry[i + 2] = 0;
+
+                err = mlx4_WRITE_MTT(dev, mailbox, (i + 1) & ~1);
+                if (err)
+                        goto out;
+
+                npages      -= i;
+                start_index += i;
+                page_list   += i;
+        }
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_write_mtt);
+
+int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
+                       struct mlx4_buf *buf)
+{
+        u64 *page_list;
+        int err;
+        int i;
+
+        page_list = kmalloc(buf->npages * sizeof *page_list, GFP_KERNEL);
+        if (!page_list)
+                return -ENOMEM;
+
+        for (i = 0; i < buf->npages; ++i)
+                if (buf->nbufs == 1)
+                        page_list[i] = buf->u.direct.map + (i << buf->page_shift);
+                else
+                        page_list[i] = buf->u.page_list[i].map;
+
+        err = mlx4_write_mtt(dev, mtt, 0, buf->npages, page_list);
+
+        kfree(page_list);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_buf_write_mtt);
+
+int __devinit mlx4_init_mr_table(struct mlx4_dev *dev)
+{
+        struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
+        int err;
+
+        err = mlx4_bitmap_init(&mr_table->mpt_bitmap, dev->caps.num_mpts,
+                               ~0, dev->caps.reserved_mrws);
+        if (err)
+                return err;
+
+        err = mlx4_buddy_init(&mr_table->mtt_buddy,
+                              ilog2(dev->caps.num_mtt_segs));
+        if (err)
+                goto err_buddy;
+
+        if (dev->caps.reserved_mtts) {
+                if (mlx4_alloc_mtt_range(dev, ilog2(dev->caps.reserved_mtts)) == -1) {
+                        mlx4_warn(dev, "MTT table of order %d is too small.\n",
+                                  mr_table->mtt_buddy.max_order);
+                        err = -ENOMEM;
+                        goto err_reserve_mtts;
+                }
+        }
+
+        return 0;
+
+err_reserve_mtts:
+        mlx4_buddy_cleanup(&mr_table->mtt_buddy);
+
+err_buddy:
+        mlx4_bitmap_cleanup(&mr_table->mpt_bitmap);
+
+        return err;
+}
+
+void mlx4_cleanup_mr_table(struct mlx4_dev *dev)
+{
+        struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
+
+        mlx4_buddy_cleanup(&mr_table->mtt_buddy);
+        mlx4_bitmap_cleanup(&mr_table->mpt_bitmap);
+}
diff --git a/drivers/net/mlx4/pd.c b/drivers/net/mlx4/pd.c
new file mode 100644
index 000000000000..23dea1ee7750
--- /dev/null
+++ b/drivers/net/mlx4/pd.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/errno.h>
+
+#include <asm/page.h>
+
+#include "mlx4.h"
+#include "icm.h"
+
+int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        *pdn = mlx4_bitmap_alloc(&priv->pd_bitmap);
+        if (*pdn == -1)
+                return -ENOMEM;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_pd_alloc);
+
+void mlx4_pd_free(struct mlx4_dev *dev, u32 pdn)
+{
+        mlx4_bitmap_free(&mlx4_priv(dev)->pd_bitmap, pdn);
+}
+EXPORT_SYMBOL_GPL(mlx4_pd_free);
+
+int __devinit mlx4_init_pd_table(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        return mlx4_bitmap_init(&priv->pd_bitmap, dev->caps.num_pds,
+                                (1 << 24) - 1, dev->caps.reserved_pds);
+}
+
+void mlx4_cleanup_pd_table(struct mlx4_dev *dev)
+{
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->pd_bitmap);
+}
+
+
+int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar)
+{
+        uar->index = mlx4_bitmap_alloc(&mlx4_priv(dev)->uar_table.bitmap);
+        if (uar->index == -1)
+                return -ENOMEM;
+
+        uar->pfn = (pci_resource_start(dev->pdev, 2) >> PAGE_SHIFT) + uar->index;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_uar_alloc);
+
+void mlx4_uar_free(struct mlx4_dev *dev, struct mlx4_uar *uar)
+{
+        mlx4_bitmap_free(&mlx4_priv(dev)->uar_table.bitmap, uar->index);
+}
+EXPORT_SYMBOL_GPL(mlx4_uar_free);
+
+int mlx4_init_uar_table(struct mlx4_dev *dev)
+{
+        return mlx4_bitmap_init(&mlx4_priv(dev)->uar_table.bitmap,
+                                dev->caps.num_uars, dev->caps.num_uars - 1,
+                                max(128, dev->caps.reserved_uars));
+}
+
+void mlx4_cleanup_uar_table(struct mlx4_dev *dev)
+{
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->uar_table.bitmap);
+}
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c
new file mode 100644
index 000000000000..9ca42b213d54
--- /dev/null
+++ b/drivers/net/mlx4/profile.c
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+
+#include "mlx4.h"
+#include "fw.h"
+
+enum {
+        MLX4_RES_QP,
+        MLX4_RES_RDMARC,
+        MLX4_RES_ALTC,
+        MLX4_RES_AUXC,
+        MLX4_RES_SRQ,
+        MLX4_RES_CQ,
+        MLX4_RES_EQ,
+        MLX4_RES_DMPT,
+        MLX4_RES_CMPT,
+        MLX4_RES_MTT,
+        MLX4_RES_MCG,
+        MLX4_RES_NUM
+};
+
+static const char *res_name[] = {
+        [MLX4_RES_QP]           = "QP",
+        [MLX4_RES_RDMARC]       = "RDMARC",
+        [MLX4_RES_ALTC]         = "ALTC",
+        [MLX4_RES_AUXC]         = "AUXC",
+        [MLX4_RES_SRQ]          = "SRQ",
+        [MLX4_RES_CQ]           = "CQ",
+        [MLX4_RES_EQ]           = "EQ",
+        [MLX4_RES_DMPT]         = "DMPT",
+        [MLX4_RES_CMPT]         = "CMPT",
+        [MLX4_RES_MTT]          = "MTT",
+        [MLX4_RES_MCG]          = "MCG",
+};
+
+u64 mlx4_make_profile(struct mlx4_dev *dev,
+                      struct mlx4_profile *request,
+                      struct mlx4_dev_cap *dev_cap,
+                      struct mlx4_init_hca_param *init_hca)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_resource {
+                u64 size;
+                u64 start;
+                int type;
+                int num;
+                int log_num;
+        };
+
+        u64 total_size = 0;
+        struct mlx4_resource *profile;
+        struct mlx4_resource tmp;
+        int i, j;
+
+        profile = kzalloc(MLX4_RES_NUM * sizeof *profile, GFP_KERNEL);
+        if (!profile)
+                return -ENOMEM;
+
+        profile[MLX4_RES_QP].size     = dev_cap->qpc_entry_sz;
+        profile[MLX4_RES_RDMARC].size = dev_cap->rdmarc_entry_sz;
+        profile[MLX4_RES_ALTC].size   = dev_cap->altc_entry_sz;
+        profile[MLX4_RES_AUXC].size   = dev_cap->aux_entry_sz;
+        profile[MLX4_RES_SRQ].size    = dev_cap->srq_entry_sz;
+        profile[MLX4_RES_CQ].size     = dev_cap->cqc_entry_sz;
+        profile[MLX4_RES_EQ].size     = dev_cap->eqc_entry_sz;
+        profile[MLX4_RES_DMPT].size   = dev_cap->dmpt_entry_sz;
+        profile[MLX4_RES_CMPT].size   = dev_cap->cmpt_entry_sz;
+        profile[MLX4_RES_MTT].size    = MLX4_MTT_ENTRY_PER_SEG * dev_cap->mtt_entry_sz;
+        profile[MLX4_RES_MCG].size    = MLX4_MGM_ENTRY_SIZE;
+
+        profile[MLX4_RES_QP].num      = request->num_qp;
+        profile[MLX4_RES_RDMARC].num  = request->num_qp * request->rdmarc_per_qp;
+        profile[MLX4_RES_ALTC].num    = request->num_qp;
+        profile[MLX4_RES_AUXC].num    = request->num_qp;
+        profile[MLX4_RES_SRQ].num     = request->num_srq;
+        profile[MLX4_RES_CQ].num      = request->num_cq;
+        profile[MLX4_RES_EQ].num      = MLX4_NUM_EQ + dev_cap->reserved_eqs;
+        profile[MLX4_RES_DMPT].num    = request->num_mpt;
+        profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
+        profile[MLX4_RES_MTT].num     = request->num_mtt;
+        profile[MLX4_RES_MCG].num     = request->num_mcg;
+
+        for (i = 0; i < MLX4_RES_NUM; ++i) {
+                profile[i].type     = i;
+                profile[i].num      = roundup_pow_of_two(profile[i].num);
+                profile[i].log_num  = ilog2(profile[i].num);
+                profile[i].size    *= profile[i].num;
+                profile[i].size     = max(profile[i].size, (u64) PAGE_SIZE);
+        }
+
+        /*
+         * Sort the resources in decreasing order of size.  Since they
+         * all have sizes that are powers of 2, we'll be able to keep
+         * resources aligned to their size and pack them without gaps
+         * using the sorted order.
+         */
+        for (i = MLX4_RES_NUM; i > 0; --i)
+                for (j = 1; j < i; ++j) {
+                        if (profile[j].size > profile[j - 1].size) {
+                                tmp            = profile[j];
+                                profile[j]     = profile[j - 1];
+                                profile[j - 1] = tmp;
+                        }
+                }
+
+        for (i = 0; i < MLX4_RES_NUM; ++i) {
+                if (profile[i].size) {
+                        profile[i].start = total_size;
+                        total_size      += profile[i].size;
+                }
+
+                if (total_size > dev_cap->max_icm_sz) {
+                        mlx4_err(dev, "Profile requires 0x%llx bytes; "
+                                  "won't fit in 0x%llx bytes of context memory.\n",
+                                  (unsigned long long) total_size,
+                                  (unsigned long long) dev_cap->max_icm_sz);
+                        kfree(profile);
+                        return -ENOMEM;
+                }
+
+                if (profile[i].size)
+                        mlx4_dbg(dev, "  profile[%2d] (%6s): 2^%02d entries @ 0x%10llx, "
+                                  "size 0x%10llx\n",
+                                 i, res_name[profile[i].type], profile[i].log_num,
+                                 (unsigned long long) profile[i].start,
+                                 (unsigned long long) profile[i].size);
+        }
+
+        mlx4_dbg(dev, "HCA context memory: reserving %d KB\n",
+                 (int) (total_size >> 10));
+
+        for (i = 0; i < MLX4_RES_NUM; ++i) {
+                switch (profile[i].type) {
+                case MLX4_RES_QP:
+                        dev->caps.num_qps     = profile[i].num;
+                        init_hca->qpc_base    = profile[i].start;
+                        init_hca->log_num_qps = profile[i].log_num;
+                        break;
+                case MLX4_RES_RDMARC:
+                        for (priv->qp_table.rdmarc_shift = 0;
+                             request->num_qp << priv->qp_table.rdmarc_shift < profile[i].num;
+                             ++priv->qp_table.rdmarc_shift)
+                                ; /* nothing */
+                        dev->caps.max_qp_dest_rdma = 1 << priv->qp_table.rdmarc_shift;
+                        priv->qp_table.rdmarc_base   = (u32) profile[i].start;
+                        init_hca->rdmarc_base        = profile[i].start;
+                        init_hca->log_rd_per_qp      = priv->qp_table.rdmarc_shift;
+                        break;
+                case MLX4_RES_ALTC:
+                        init_hca->altc_base = profile[i].start;
+                        break;
+                case MLX4_RES_AUXC:
+                        init_hca->auxc_base = profile[i].start;
+                        break;
+                case MLX4_RES_SRQ:
+                        dev->caps.num_srqs     = profile[i].num;
+                        init_hca->srqc_base    = profile[i].start;
+                        init_hca->log_num_srqs = profile[i].log_num;
+                        break;
+                case MLX4_RES_CQ:
+                        dev->caps.num_cqs     = profile[i].num;
+                        init_hca->cqc_base    = profile[i].start;
+                        init_hca->log_num_cqs = profile[i].log_num;
+                        break;
+                case MLX4_RES_EQ:
+                        dev->caps.num_eqs     = profile[i].num;
+                        init_hca->eqc_base    = profile[i].start;
+                        init_hca->log_num_eqs = profile[i].log_num;
+                        break;
+                case MLX4_RES_DMPT:
+                        dev->caps.num_mpts      = profile[i].num;
+                        priv->mr_table.mpt_base = profile[i].start;
+                        init_hca->dmpt_base     = profile[i].start;
+                        init_hca->log_mpt_sz    = profile[i].log_num;
+                        break;
+                case MLX4_RES_CMPT:
+                        init_hca->cmpt_base      = profile[i].start;
+                        break;
+                case MLX4_RES_MTT:
+                        dev->caps.num_mtt_segs   = profile[i].num;
+                        priv->mr_table.mtt_base  = profile[i].start;
+                        init_hca->mtt_base       = profile[i].start;
+                        break;
+                case MLX4_RES_MCG:
+                        dev->caps.num_mgms        = profile[i].num >> 1;
+                        dev->caps.num_amgms       = profile[i].num >> 1;
+                        init_hca->mc_base         = profile[i].start;
+                        init_hca->log_mc_entry_sz = ilog2(MLX4_MGM_ENTRY_SIZE);
+                        init_hca->log_mc_table_sz = profile[i].log_num;
+                        init_hca->log_mc_hash_sz  = profile[i].log_num - 1;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        /*
+         * PDs don't take any HCA memory, but we assign them as part
+         * of the HCA profile anyway.
+         */
+        dev->caps.num_pds = MLX4_NUM_PDS;
+
+        kfree(profile);
+        return total_size;
+}
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/mlx4/qp.c
new file mode 100644
index 000000000000..7f8b7d55b6e1
--- /dev/null
+++ b/drivers/net/mlx4/qp.c
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2004 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+
+#include <linux/mlx4/cmd.h>
+#include <linux/mlx4/qp.h>
+
+#include "mlx4.h"
+#include "icm.h"
+
+void mlx4_qp_event(struct mlx4_dev *dev, u32 qpn, int event_type)
+{
+        struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
+        struct mlx4_qp *qp;
+
+        spin_lock(&qp_table->lock);
+
+        qp = __mlx4_qp_lookup(dev, qpn);
+        if (qp)
+                atomic_inc(&qp->refcount);
+
+        spin_unlock(&qp_table->lock);
+
+        if (!qp) {
+                mlx4_warn(dev, "Async event for bogus QP %08x\n", qpn);
+                return;
+        }
+
+        qp->event(qp, event_type);
+
+        if (atomic_dec_and_test(&qp->refcount))
+                complete(&qp->free);
+}
+
+int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
+                   enum mlx4_qp_state cur_state, enum mlx4_qp_state new_state,
+                   struct mlx4_qp_context *context, enum mlx4_qp_optpar optpar,
+                   int sqd_event, struct mlx4_qp *qp)
+{
+        static const u16 op[MLX4_QP_NUM_STATE][MLX4_QP_NUM_STATE] = {
+                [MLX4_QP_STATE_RST] = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                        [MLX4_QP_STATE_INIT]    = MLX4_CMD_RST2INIT_QP,
+                },
+                [MLX4_QP_STATE_INIT]  = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                        [MLX4_QP_STATE_INIT]    = MLX4_CMD_INIT2INIT_QP,
+                        [MLX4_QP_STATE_RTR]     = MLX4_CMD_INIT2RTR_QP,
+                },
+                [MLX4_QP_STATE_RTR]   = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                        [MLX4_QP_STATE_RTS]     = MLX4_CMD_RTR2RTS_QP,
+                },
+                [MLX4_QP_STATE_RTS]   = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                        [MLX4_QP_STATE_RTS]     = MLX4_CMD_RTS2RTS_QP,
+                        [MLX4_QP_STATE_SQD]     = MLX4_CMD_RTS2SQD_QP,
+                },
+                [MLX4_QP_STATE_SQD] = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                        [MLX4_QP_STATE_RTS]     = MLX4_CMD_SQD2RTS_QP,
+                        [MLX4_QP_STATE_SQD]     = MLX4_CMD_SQD2SQD_QP,
+                },
+                [MLX4_QP_STATE_SQER] = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                        [MLX4_QP_STATE_RTS]     = MLX4_CMD_SQERR2RTS_QP,
+                },
+                [MLX4_QP_STATE_ERR] = {
+                        [MLX4_QP_STATE_RST]     = MLX4_CMD_2RST_QP,
+                        [MLX4_QP_STATE_ERR]     = MLX4_CMD_2ERR_QP,
+                }
+        };
+
+        struct mlx4_cmd_mailbox *mailbox;
+        int ret = 0;
+
+        if (cur_state < 0 || cur_state >= MLX4_QP_NUM_STATE ||
+            new_state < 0 || cur_state >= MLX4_QP_NUM_STATE ||
+            !op[cur_state][new_state])
+                return -EINVAL;
+
+        if (op[cur_state][new_state] == MLX4_CMD_2RST_QP)
+                return mlx4_cmd(dev, 0, qp->qpn, 2,
+                                MLX4_CMD_2RST_QP, MLX4_CMD_TIME_CLASS_A);
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+
+        if (cur_state == MLX4_QP_STATE_RST && new_state == MLX4_QP_STATE_INIT) {
+                u64 mtt_addr = mlx4_mtt_addr(dev, mtt);
+                context->mtt_base_addr_h = mtt_addr >> 32;
+                context->mtt_base_addr_l = cpu_to_be32(mtt_addr & 0xffffffff);
+                context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
+        }
+
+        *(__be32 *) mailbox->buf = cpu_to_be32(optpar);
+        memcpy(mailbox->buf + 8, context, sizeof *context);
+
+        ((struct mlx4_qp_context *) (mailbox->buf + 8))->local_qpn =
+                cpu_to_be32(qp->qpn);
+
+        ret = mlx4_cmd(dev, mailbox->dma, qp->qpn | (!!sqd_event << 31),
+                       new_state == MLX4_QP_STATE_RST ? 2 : 0,
+                       op[cur_state][new_state], MLX4_CMD_TIME_CLASS_C);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(mlx4_qp_modify);
+
+int mlx4_qp_alloc(struct mlx4_dev *dev, int sqpn, struct mlx4_qp *qp)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_qp_table *qp_table = &priv->qp_table;
+        int err;
+
+        if (sqpn)
+                qp->qpn = sqpn;
+        else {
+                qp->qpn = mlx4_bitmap_alloc(&qp_table->bitmap);
+                if (qp->qpn == -1)
+                        return -ENOMEM;
+        }
+
+        err = mlx4_table_get(dev, &qp_table->qp_table, qp->qpn);
+        if (err)
+                goto err_out;
+
+        err = mlx4_table_get(dev, &qp_table->auxc_table, qp->qpn);
+        if (err)
+                goto err_put_qp;
+
+        err = mlx4_table_get(dev, &qp_table->altc_table, qp->qpn);
+        if (err)
+                goto err_put_auxc;
+
+        err = mlx4_table_get(dev, &qp_table->rdmarc_table, qp->qpn);
+        if (err)
+                goto err_put_altc;
+
+        err = mlx4_table_get(dev, &qp_table->cmpt_table, qp->qpn);
+        if (err)
+                goto err_put_rdmarc;
+
+        spin_lock_irq(&qp_table->lock);
+        err = radix_tree_insert(&dev->qp_table_tree, qp->qpn & (dev->caps.num_qps - 1), qp);
+        spin_unlock_irq(&qp_table->lock);
+        if (err)
+                goto err_put_cmpt;
+
+        atomic_set(&qp->refcount, 1);
+        init_completion(&qp->free);
+
+        return 0;
+
+err_put_cmpt:
+        mlx4_table_put(dev, &qp_table->cmpt_table, qp->qpn);
+
+err_put_rdmarc:
+        mlx4_table_put(dev, &qp_table->rdmarc_table, qp->qpn);
+
+err_put_altc:
+        mlx4_table_put(dev, &qp_table->altc_table, qp->qpn);
+
+err_put_auxc:
+        mlx4_table_put(dev, &qp_table->auxc_table, qp->qpn);
+
+err_put_qp:
+        mlx4_table_put(dev, &qp_table->qp_table, qp->qpn);
+
+err_out:
+        if (!sqpn)
+                mlx4_bitmap_free(&qp_table->bitmap, qp->qpn);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_qp_alloc);
+
+void mlx4_qp_remove(struct mlx4_dev *dev, struct mlx4_qp *qp)
+{
+        struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
+        unsigned long flags;
+
+        spin_lock_irqsave(&qp_table->lock, flags);
+        radix_tree_delete(&dev->qp_table_tree, qp->qpn & (dev->caps.num_qps - 1));
+        spin_unlock_irqrestore(&qp_table->lock, flags);
+}
+EXPORT_SYMBOL_GPL(mlx4_qp_remove);
+
+void mlx4_qp_free(struct mlx4_dev *dev, struct mlx4_qp *qp)
+{
+        struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
+
+        if (atomic_dec_and_test(&qp->refcount))
+                complete(&qp->free);
+        wait_for_completion(&qp->free);
+
+        mlx4_table_put(dev, &qp_table->cmpt_table, qp->qpn);
+        mlx4_table_put(dev, &qp_table->rdmarc_table, qp->qpn);
+        mlx4_table_put(dev, &qp_table->altc_table, qp->qpn);
+        mlx4_table_put(dev, &qp_table->auxc_table, qp->qpn);
+        mlx4_table_put(dev, &qp_table->qp_table, qp->qpn);
+
+        mlx4_bitmap_free(&qp_table->bitmap, qp->qpn);
+}
+EXPORT_SYMBOL_GPL(mlx4_qp_free);
+
+static int mlx4_CONF_SPECIAL_QP(struct mlx4_dev *dev, u32 base_qpn)
+{
+        return mlx4_cmd(dev, 0, base_qpn, 0, MLX4_CMD_CONF_SPECIAL_QP,
+                        MLX4_CMD_TIME_CLASS_B);
+}
+
+int __devinit mlx4_init_qp_table(struct mlx4_dev *dev)
+{
+        struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
+        int err;
+
+        spin_lock_init(&qp_table->lock);
+        INIT_RADIX_TREE(&dev->qp_table_tree, GFP_ATOMIC);
+
+        /*
+         * We reserve 2 extra QPs per port for the special QPs.  The
+         * block of special QPs must be aligned to a multiple of 8, so
+         * round up.
+         */
+        dev->caps.sqp_start = ALIGN(dev->caps.reserved_qps, 8);
+        err = mlx4_bitmap_init(&qp_table->bitmap, dev->caps.num_qps,
+                               (1 << 24) - 1, dev->caps.sqp_start + 8);
+        if (err)
+                return err;
+
+        return mlx4_CONF_SPECIAL_QP(dev, dev->caps.sqp_start);
+}
+
+void mlx4_cleanup_qp_table(struct mlx4_dev *dev)
+{
+        mlx4_CONF_SPECIAL_QP(dev, 0);
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->qp_table.bitmap);
+}
diff --git a/drivers/net/mlx4/reset.c b/drivers/net/mlx4/reset.c
new file mode 100644
index 000000000000..e4dfd4b11a4a
--- /dev/null
+++ b/drivers/net/mlx4/reset.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+
+#include "mlx4.h"
+
+int mlx4_reset(struct mlx4_dev *dev)
+{
+        void __iomem *reset;
+        u32 *hca_header = NULL;
+        int pcie_cap;
+        u16 devctl;
+        u16 linkctl;
+        u16 vendor;
+        unsigned long end;
+        u32 sem;
+        int i;
+        int err = 0;
+
+#define MLX4_RESET_BASE         0xf0000
+#define MLX4_RESET_SIZE           0x400
+#define MLX4_SEM_OFFSET           0x3fc
+#define MLX4_RESET_OFFSET          0x10
+#define MLX4_RESET_VALUE        swab32(1)
+
+#define MLX4_SEM_TIMEOUT_JIFFIES        (10 * HZ)
+#define MLX4_RESET_TIMEOUT_JIFFIES      (2 * HZ)
+
+        /*
+         * Reset the chip.  This is somewhat ugly because we have to
+         * save off the PCI header before reset and then restore it
+         * after the chip reboots.  We skip config space offsets 22
+         * and 23 since those have a special meaning.
+         */
+
+        /* Do we need to save off the full 4K PCI Express header?? */
+        hca_header = kmalloc(256, GFP_KERNEL);
+        if (!hca_header) {
+                err = -ENOMEM;
+                mlx4_err(dev, "Couldn't allocate memory to save HCA "
+                          "PCI header, aborting.\n");
+                goto out;
+        }
+
+        pcie_cap = pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
+
+        for (i = 0; i < 64; ++i) {
+                if (i == 22 || i == 23)
+                        continue;
+                if (pci_read_config_dword(dev->pdev, i * 4, hca_header + i)) {
+                        err = -ENODEV;
+                        mlx4_err(dev, "Couldn't save HCA "
+                                  "PCI header, aborting.\n");
+                        goto out;
+                }
+        }
+
+        reset = ioremap(pci_resource_start(dev->pdev, 0) + MLX4_RESET_BASE,
+                        MLX4_RESET_SIZE);
+        if (!reset) {
+                err = -ENOMEM;
+                mlx4_err(dev, "Couldn't map HCA reset register, aborting.\n");
+                goto out;
+        }
+
+        /* grab HW semaphore to lock out flash updates */
+        end = jiffies + MLX4_SEM_TIMEOUT_JIFFIES;
+        do {
+                sem = readl(reset + MLX4_SEM_OFFSET);
+                if (!sem)
+                        break;
+
+                msleep(1);
+        } while (time_before(jiffies, end));
+
+        if (sem) {
+                mlx4_err(dev, "Failed to obtain HW semaphore, aborting\n");
+                err = -EAGAIN;
+                iounmap(reset);
+                goto out;
+        }
+
+        /* actually hit reset */
+        writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
+        iounmap(reset);
+
+        end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
+        do {
+                if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&
+                    vendor != 0xffff)
+                        break;
+
+                msleep(1);
+        } while (time_before(jiffies, end));
+
+        if (vendor == 0xffff) {
+                err = -ENODEV;
+                mlx4_err(dev, "PCI device did not come back after reset, "
+                          "aborting.\n");
+                goto out;
+        }
+
+        /* Now restore the PCI headers */
+        if (pcie_cap) {
+                devctl = hca_header[(pcie_cap + PCI_EXP_DEVCTL) / 4];
+                if (pci_write_config_word(dev->pdev, pcie_cap + PCI_EXP_DEVCTL,
+                                           devctl)) {
+                        err = -ENODEV;
+                        mlx4_err(dev, "Couldn't restore HCA PCI Express "
+                                 "Device Control register, aborting.\n");
+                        goto out;
+                }
+                linkctl = hca_header[(pcie_cap + PCI_EXP_LNKCTL) / 4];
+                if (pci_write_config_word(dev->pdev, pcie_cap + PCI_EXP_LNKCTL,
+                                           linkctl)) {
+                        err = -ENODEV;
+                        mlx4_err(dev, "Couldn't restore HCA PCI Express "
+                                 "Link control register, aborting.\n");
+                        goto out;
+                }
+        }
+
+        for (i = 0; i < 16; ++i) {
+                if (i * 4 == PCI_COMMAND)
+                        continue;
+
+                if (pci_write_config_dword(dev->pdev, i * 4, hca_header[i])) {
+                        err = -ENODEV;
+                        mlx4_err(dev, "Couldn't restore HCA reg %x, "
+                                  "aborting.\n", i);
+                        goto out;
+                }
+        }
+
+        if (pci_write_config_dword(dev->pdev, PCI_COMMAND,
+                                   hca_header[PCI_COMMAND / 4])) {
+                err = -ENODEV;
+                mlx4_err(dev, "Couldn't restore HCA COMMAND, "
+                          "aborting.\n");
+                goto out;
+        }
+
+out:
+        kfree(hca_header);
+
+        return err;
+}
diff --git a/drivers/net/mlx4/srq.c b/drivers/net/mlx4/srq.c
new file mode 100644
index 000000000000..2134f83aed87
--- /dev/null
+++ b/drivers/net/mlx4/srq.c
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/init.h>
+
+#include <linux/mlx4/cmd.h>
+
+#include "mlx4.h"
+#include "icm.h"
+
+struct mlx4_srq_context {
+        __be32                  state_logsize_srqn;
+        u8                      logstride;
+        u8                      reserved1[3];
+        u8                      pg_offset;
+        u8                      reserved2[3];
+        u32                     reserved3;
+        u8                      log_page_size;
+        u8                      reserved4[2];
+        u8                      mtt_base_addr_h;
+        __be32                  mtt_base_addr_l;
+        __be32                  pd;
+        __be16                  limit_watermark;
+        __be16                  wqe_cnt;
+        u16                     reserved5;
+        __be16                  wqe_counter;
+        u32                     reserved6;
+        __be64                  db_rec_addr;
+};
+
+void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type)
+{
+        struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
+        struct mlx4_srq *srq;
+
+        spin_lock(&srq_table->lock);
+
+        srq = radix_tree_lookup(&srq_table->tree, srqn & (dev->caps.num_srqs - 1));
+        if (srq)
+                atomic_inc(&srq->refcount);
+
+        spin_unlock(&srq_table->lock);
+
+        if (!srq) {
+                mlx4_warn(dev, "Async event for bogus SRQ %08x\n", srqn);
+                return;
+        }
+
+        srq->event(srq, event_type);
+
+        if (atomic_dec_and_test(&srq->refcount))
+                complete(&srq->free);
+}
+
+static int mlx4_SW2HW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                          int srq_num)
+{
+        return mlx4_cmd(dev, mailbox->dma, srq_num, 0, MLX4_CMD_SW2HW_SRQ,
+                        MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_HW2SW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                          int srq_num)
+{
+        return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0, srq_num,
+                            mailbox ? 0 : 1, MLX4_CMD_HW2SW_SRQ,
+                            MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_ARM_SRQ(struct mlx4_dev *dev, int srq_num, int limit_watermark)
+{
+        return mlx4_cmd(dev, limit_watermark, srq_num, 0, MLX4_CMD_ARM_SRQ,
+                        MLX4_CMD_TIME_CLASS_B);
+}
+
+int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, struct mlx4_mtt *mtt,
+                   u64 db_rec, struct mlx4_srq *srq)
+{
+        struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_srq_context *srq_context;
+        u64 mtt_addr;
+        int err;
+
+        srq->srqn = mlx4_bitmap_alloc(&srq_table->bitmap);
+        if (srq->srqn == -1)
+                return -ENOMEM;
+
+        err = mlx4_table_get(dev, &srq_table->table, srq->srqn);
+        if (err)
+                goto err_out;
+
+        err = mlx4_table_get(dev, &srq_table->cmpt_table, srq->srqn);
+        if (err)
+                goto err_put;
+
+        spin_lock_irq(&srq_table->lock);
+        err = radix_tree_insert(&srq_table->tree, srq->srqn, srq);
+        spin_unlock_irq(&srq_table->lock);
+        if (err)
+                goto err_cmpt_put;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                err = PTR_ERR(mailbox);
+                goto err_radix;
+        }
+
+        srq_context = mailbox->buf;
+        memset(srq_context, 0, sizeof *srq_context);
+
+        srq_context->state_logsize_srqn = cpu_to_be32((ilog2(srq->max) << 24) |
+                                                      srq->srqn);
+        srq_context->logstride          = srq->wqe_shift - 4;
+        srq_context->log_page_size      = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
+
+        mtt_addr = mlx4_mtt_addr(dev, mtt);
+        srq_context->mtt_base_addr_h    = mtt_addr >> 32;
+        srq_context->mtt_base_addr_l    = cpu_to_be32(mtt_addr & 0xffffffff);
+        srq_context->pd                 = cpu_to_be32(pdn);
+        srq_context->db_rec_addr        = cpu_to_be64(db_rec);
+
+        err = mlx4_SW2HW_SRQ(dev, mailbox, srq->srqn);
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        if (err)
+                goto err_radix;
+
+        atomic_set(&srq->refcount, 1);
+        init_completion(&srq->free);
+
+        return 0;
+
+err_radix:
+        spin_lock_irq(&srq_table->lock);
+        radix_tree_delete(&srq_table->tree, srq->srqn);
+        spin_unlock_irq(&srq_table->lock);
+
+err_cmpt_put:
+        mlx4_table_put(dev, &srq_table->cmpt_table, srq->srqn);
+
+err_put:
+        mlx4_table_put(dev, &srq_table->table, srq->srqn);
+
+err_out:
+        mlx4_bitmap_free(&srq_table->bitmap, srq->srqn);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_srq_alloc);
+
+void mlx4_srq_free(struct mlx4_dev *dev, struct mlx4_srq *srq)
+{
+        struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
+        int err;
+
+        err = mlx4_HW2SW_SRQ(dev, NULL, srq->srqn);
+        if (err)
+                mlx4_warn(dev, "HW2SW_SRQ failed (%d) for SRQN %06x\n", err, srq->srqn);
+
+        spin_lock_irq(&srq_table->lock);
+        radix_tree_delete(&srq_table->tree, srq->srqn);
+        spin_unlock_irq(&srq_table->lock);
+
+        if (atomic_dec_and_test(&srq->refcount))
+                complete(&srq->free);
+        wait_for_completion(&srq->free);
+
+        mlx4_table_put(dev, &srq_table->table, srq->srqn);
+        mlx4_bitmap_free(&srq_table->bitmap, srq->srqn);
+}
+EXPORT_SYMBOL_GPL(mlx4_srq_free);
+
+int mlx4_srq_arm(struct mlx4_dev *dev, struct mlx4_srq *srq, int limit_watermark)
+{
+        return mlx4_ARM_SRQ(dev, srq->srqn, limit_watermark);
+}
+EXPORT_SYMBOL_GPL(mlx4_srq_arm);
+
+int __devinit mlx4_init_srq_table(struct mlx4_dev *dev)
+{
+        struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
+        int err;
+
+        spin_lock_init(&srq_table->lock);
+        INIT_RADIX_TREE(&srq_table->tree, GFP_ATOMIC);
+
+        err = mlx4_bitmap_init(&srq_table->bitmap, dev->caps.num_srqs,
+                               dev->caps.num_srqs - 1, dev->caps.reserved_srqs);
+        if (err)
+                return err;
+
+        return 0;
+}
+
+void mlx4_cleanup_srq_table(struct mlx4_dev *dev)
+{
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->srq_table.bitmap);
+}
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 16e3c4315e82..5d14be7405a3 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -290,6 +290,8 @@ MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n");
 
 #define myri10ge_pio_copy(to,from,size) __iowrite64_copy(to,from,size/8)
 
+static void myri10ge_set_multicast_list(struct net_device *dev);
+
 static inline void put_be32(__be32 val, __be32 __iomem * p)
 {
         __raw_writel((__force __u32) val, (__force void __iomem *)p);
@@ -353,6 +355,8 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
                         return 0;
                 } else if (result == MXGEFW_CMD_UNKNOWN) {
                         return -ENOSYS;
+                } else if (result == MXGEFW_CMD_ERROR_UNALIGNED) {
+                        return -E2BIG;
                 } else {
                         dev_err(&mgp->pdev->dev,
                                 "command %d failed, result = %d\n",
@@ -712,14 +716,78 @@ myri10ge_change_promisc(struct myri10ge_priv *mgp, int promisc, int atomic)
                        mgp->dev->name);
 }
 
-static int myri10ge_reset(struct myri10ge_priv *mgp)
+static int myri10ge_dma_test(struct myri10ge_priv *mgp, int test_type)
 {
         struct myri10ge_cmd cmd;
         int status;
-        size_t bytes;
         u32 len;
         struct page *dmatest_page;
         dma_addr_t dmatest_bus;
+        char *test = " ";
+
+        dmatest_page = alloc_page(GFP_KERNEL);
+        if (!dmatest_page)
+                return -ENOMEM;
+        dmatest_bus = pci_map_page(mgp->pdev, dmatest_page, 0, PAGE_SIZE,
+                                   DMA_BIDIRECTIONAL);
+
+        /* Run a small DMA test.
+         * The magic multipliers to the length tell the firmware
+         * to do DMA read, write, or read+write tests.  The
+         * results are returned in cmd.data0.  The upper 16
+         * bits or the return is the number of transfers completed.
+         * The lower 16 bits is the time in 0.5us ticks that the
+         * transfers took to complete.
+         */
+
+        len = mgp->tx.boundary;
+
+        cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
+        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
+        cmd.data2 = len * 0x10000;
+        status = myri10ge_send_cmd(mgp, test_type, &cmd, 0);
+        if (status != 0) {
+                test = "read";
+                goto abort;
+        }
+        mgp->read_dma = ((cmd.data0 >> 16) * len * 2) / (cmd.data0 & 0xffff);
+        cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
+        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
+        cmd.data2 = len * 0x1;
+        status = myri10ge_send_cmd(mgp, test_type, &cmd, 0);
+        if (status != 0) {
+                test = "write";
+                goto abort;
+        }
+        mgp->write_dma = ((cmd.data0 >> 16) * len * 2) / (cmd.data0 & 0xffff);
+
+        cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
+        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
+        cmd.data2 = len * 0x10001;
+        status = myri10ge_send_cmd(mgp, test_type, &cmd, 0);
+        if (status != 0) {
+                test = "read/write";
+                goto abort;
+        }
+        mgp->read_write_dma = ((cmd.data0 >> 16) * len * 2 * 2) /
+            (cmd.data0 & 0xffff);
+
+abort:
+        pci_unmap_page(mgp->pdev, dmatest_bus, PAGE_SIZE, DMA_BIDIRECTIONAL);
+        put_page(dmatest_page);
+
+        if (status != 0 && test_type != MXGEFW_CMD_UNALIGNED_TEST)
+                dev_warn(&mgp->pdev->dev, "DMA %s benchmark failed: %d\n",
+                         test, status);
+
+        return status;
+}
+
+static int myri10ge_reset(struct myri10ge_priv *mgp)
+{
+        struct myri10ge_cmd cmd;
+        int status;
+        size_t bytes;
 
         /* try to send a reset command to the card to see if it
          * is alive */
@@ -729,11 +797,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
                 dev_err(&mgp->pdev->dev, "failed reset\n");
                 return -ENXIO;
         }
-        dmatest_page = alloc_page(GFP_KERNEL);
-        if (!dmatest_page)
-                return -ENOMEM;
-        dmatest_bus = pci_map_page(mgp->pdev, dmatest_page, 0, PAGE_SIZE,
-                                   DMA_BIDIRECTIONAL);
+
+        (void)myri10ge_dma_test(mgp, MXGEFW_DMA_TEST);
 
         /* Now exchange information about interrupts  */
 
@@ -761,52 +826,6 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         }
         put_be32(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
 
-        /* Run a small DMA test.
-         * The magic multipliers to the length tell the firmware
-         * to do DMA read, write, or read+write tests.  The
-         * results are returned in cmd.data0.  The upper 16
-         * bits or the return is the number of transfers completed.
-         * The lower 16 bits is the time in 0.5us ticks that the
-         * transfers took to complete.
-         */
-
-        len = mgp->tx.boundary;
-
-        cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
-        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
-        cmd.data2 = len * 0x10000;
-        status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);
-        if (status == 0)
-                mgp->read_dma = ((cmd.data0 >> 16) * len * 2) /
-                    (cmd.data0 & 0xffff);
-        else
-                dev_warn(&mgp->pdev->dev, "DMA read benchmark failed: %d\n",
-                         status);
-        cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
-        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
-        cmd.data2 = len * 0x1;
-        status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);
-        if (status == 0)
-                mgp->write_dma = ((cmd.data0 >> 16) * len * 2) /
-                    (cmd.data0 & 0xffff);
-        else
-                dev_warn(&mgp->pdev->dev, "DMA write benchmark failed: %d\n",
-                         status);
-
-        cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
-        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
-        cmd.data2 = len * 0x10001;
-        status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);
-        if (status == 0)
-                mgp->read_write_dma = ((cmd.data0 >> 16) * len * 2 * 2) /
-                    (cmd.data0 & 0xffff);
-        else
-                dev_warn(&mgp->pdev->dev,
-                         "DMA read/write benchmark failed: %d\n", status);
-
-        pci_unmap_page(mgp->pdev, dmatest_bus, PAGE_SIZE, DMA_BIDIRECTIONAL);
-        put_page(dmatest_page);
-
         memset(mgp->rx_done.entry, 0, bytes);
 
         /* reset mcp/driver shared state back to 0 */
@@ -820,10 +839,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         mgp->rx_done.cnt = 0;
         mgp->link_changes = 0;
         status = myri10ge_update_mac_address(mgp, mgp->dev->dev_addr);
-        myri10ge_change_promisc(mgp, 0, 0);
         myri10ge_change_pause(mgp, mgp->pause);
-        if (mgp->adopted_rx_filter_bug)
-                (void)myri10ge_send_cmd(mgp, MXGEFW_ENABLE_ALLMULTI, &cmd, 1);
+        myri10ge_set_multicast_list(mgp->dev);
         return status;
 }
 
@@ -1355,7 +1372,9 @@ static const char myri10ge_gstrings_stats[][ETH_GSTRING_LEN] = {
         "tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",
         "wake_queue", "stop_queue", "watchdog_resets", "tx_linearized",
         "link_changes", "link_up", "dropped_link_overflow",
-        "dropped_link_error_or_filtered", "dropped_multicast_filtered",
+        "dropped_link_error_or_filtered",
+        "dropped_pause", "dropped_bad_phy", "dropped_bad_crc32",
+        "dropped_unicast_filtered", "dropped_multicast_filtered",
         "dropped_runt", "dropped_overrun", "dropped_no_small_buffer",
         "dropped_no_big_buffer"
 };
@@ -1412,6 +1431,11 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
         data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_link_overflow);
         data[i++] =
             (unsigned int)ntohl(mgp->fw_stats->dropped_link_error_or_filtered);
+        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_pause);
+        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_bad_phy);
+        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_bad_crc32);
+        data[i++] =
+            (unsigned int)ntohl(mgp->fw_stats->dropped_unicast_filtered);
         data[i++] =
             (unsigned int)ntohl(mgp->fw_stats->dropped_multicast_filtered);
         data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_runt);
@@ -2276,7 +2300,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
         myri10ge_change_promisc(mgp, dev->flags & IFF_PROMISC, 1);
 
         /* This firmware is known to not support multicast */
-        if (!mgp->fw_multicast_support || mgp->adopted_rx_filter_bug)
+        if (!mgp->fw_multicast_support)
                 return;
 
         /* Disable multicast filtering */
@@ -2288,7 +2312,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
                 goto abort;
         }
 
-        if (dev->flags & IFF_ALLMULTI) {
+        if ((dev->flags & IFF_ALLMULTI) || mgp->adopted_rx_filter_bug) {
                 /* request to disable multicast filtering, so quit here */
                 return;
         }
@@ -2461,8 +2485,6 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
         err_cap |= PCI_ERR_CAP_ECRC_GENE;
         pci_write_config_dword(bridge, cap + PCI_ERR_CAP, err_cap);
         dev_info(dev, "Enabled ECRC on upstream bridge %s\n", pci_name(bridge));
-        mgp->tx.boundary = 4096;
-        mgp->fw_name = myri10ge_fw_aligned;
 }
 
 /*
@@ -2484,22 +2506,70 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
  * firmware image, and set tx.boundary to 4KB.
  */
 
-#define PCI_DEVICE_ID_INTEL_E5000_PCIE23 0x25f7
-#define PCI_DEVICE_ID_INTEL_E5000_PCIE47 0x25fa
-#define PCI_DEVICE_ID_INTEL_6300ESB_PCIEE1 0x3510
-#define PCI_DEVICE_ID_INTEL_6300ESB_PCIEE4 0x351b
-#define PCI_DEVICE_ID_INTEL_E3000_PCIE  0x2779
-#define PCI_DEVICE_ID_INTEL_E3010_PCIE  0x277a
-#define PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_FIRST 0x140
-#define PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_LAST 0x142
-
-static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
+static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
 {
-        struct pci_dev *bridge = mgp->pdev->bus->self;
+        struct pci_dev *pdev = mgp->pdev;
+        struct device *dev = &pdev->dev;
+        int cap, status;
+        u16 val;
+
+        mgp->tx.boundary = 4096;
+        /*
+         * Verify the max read request size was set to 4KB
+         * before trying the test with 4KB.
+         */
+        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+        if (cap < 64) {
+                dev_err(dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
+                goto abort;
+        }
+        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
+        if (status != 0) {
+                dev_err(dev, "Couldn't read max read req size: %d\n", status);
+                goto abort;
+        }
+        if ((val & (5 << 12)) != (5 << 12)) {
+                dev_warn(dev, "Max Read Request size != 4096 (0x%x)\n", val);
+                mgp->tx.boundary = 2048;
+        }
+        /*
+         * load the optimized firmware (which assumes aligned PCIe
+         * completions) in order to see if it works on this host.
+         */
+        mgp->fw_name = myri10ge_fw_aligned;
+        status = myri10ge_load_firmware(mgp);
+        if (status != 0) {
+                goto abort;
+        }
+
+        /*
+         * Enable ECRC if possible
+         */
+        myri10ge_enable_ecrc(mgp);
+
+        /*
+         * Run a DMA test which watches for unaligned completions and
+         * aborts on the first one seen.
+         */
 
+        status = myri10ge_dma_test(mgp, MXGEFW_CMD_UNALIGNED_TEST);
+        if (status == 0)
+                return;         /* keep the aligned firmware */
+
+        if (status != -E2BIG)
+                dev_warn(dev, "DMA test failed: %d\n", status);
+        if (status == -ENOSYS)
+                dev_warn(dev, "Falling back to ethp! "
+                         "Please install up to date fw\n");
+abort:
+        /* fall back to using the unaligned firmware */
         mgp->tx.boundary = 2048;
         mgp->fw_name = myri10ge_fw_unaligned;
 
+}
+
+static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
+{
         if (myri10ge_force_firmware == 0) {
                 int link_width, exp_cap;
                 u16 lnk;
@@ -2508,8 +2578,6 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
                 pci_read_config_word(mgp->pdev, exp_cap + PCI_EXP_LNKSTA, &lnk);
                 link_width = (lnk >> 4) & 0x3f;
 
-                myri10ge_enable_ecrc(mgp);
-
                 /* Check to see if Link is less than 8 or if the
                  * upstream bridge is known to provide aligned
                  * completions */
@@ -2518,46 +2586,8 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
                                  link_width);
                         mgp->tx.boundary = 4096;
                         mgp->fw_name = myri10ge_fw_aligned;
-                } else if (bridge &&
-                           /* ServerWorks HT2000/HT1000 */
-                           ((bridge->vendor == PCI_VENDOR_ID_SERVERWORKS
-                             && bridge->device ==
-                             PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE)
-                            /* ServerWorks HT2100 */
-                            || (bridge->vendor == PCI_VENDOR_ID_SERVERWORKS
-                                && bridge->device >=
-                                PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_FIRST
-                                && bridge->device <=
-                                PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_LAST)
-                            /* All Intel E3000/E3010 PCIE ports */
-                            || (bridge->vendor == PCI_VENDOR_ID_INTEL
-                                && (bridge->device ==
-                                    PCI_DEVICE_ID_INTEL_E3000_PCIE
-                                    || bridge->device ==
-                                    PCI_DEVICE_ID_INTEL_E3010_PCIE))
-                            /* All Intel 6310/6311/6321ESB PCIE ports */
-                            || (bridge->vendor == PCI_VENDOR_ID_INTEL
-                                && bridge->device >=
-                                PCI_DEVICE_ID_INTEL_6300ESB_PCIEE1
-                                && bridge->device <=
-                                PCI_DEVICE_ID_INTEL_6300ESB_PCIEE4)
-                            /* All Intel E5000 PCIE ports */
-                            || (bridge->vendor == PCI_VENDOR_ID_INTEL
-                                && bridge->device >=
-                                PCI_DEVICE_ID_INTEL_E5000_PCIE23
-                                && bridge->device <=
-                                PCI_DEVICE_ID_INTEL_E5000_PCIE47))) {
-                        dev_info(&mgp->pdev->dev,
-                                 "Assuming aligned completions (0x%x:0x%x)\n",
-                                 bridge->vendor, bridge->device);
-                        mgp->tx.boundary = 4096;
-                        mgp->fw_name = myri10ge_fw_aligned;
-                } else if (bridge &&
-                           bridge->vendor == PCI_VENDOR_ID_SGI &&
-                           bridge->device == 0x4002 /* TIOCE pcie-port */ ) {
-                        /* this pcie bridge does not support 4K rdma request */
-                        mgp->tx.boundary = 2048;
-                        mgp->fw_name = myri10ge_fw_aligned;
+                } else {
+                        myri10ge_firmware_probe(mgp);
                 }
         } else {
                 if (myri10ge_force_firmware == 1) {
@@ -2825,7 +2855,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 status = -ENODEV;
                 goto abort_with_netdev;
         }
-        myri10ge_select_firmware(mgp);
 
         /* Find the vendor-specific cap so we can check
          * the reboot register later on */
@@ -2919,6 +2948,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto abort_with_ioremap;
         memset(mgp->rx_done.entry, 0, bytes);
 
+        myri10ge_select_firmware(mgp);
+
         status = myri10ge_load_firmware(mgp);
         if (status != 0) {
                 dev_err(&pdev->dev, "failed to load firmware\n");
diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/myri10ge/myri10ge_mcp.h
index 29463b301a84..a1d2a22296a9 100644
--- a/drivers/net/myri10ge/myri10ge_mcp.h
+++ b/drivers/net/myri10ge/myri10ge_mcp.h
@@ -200,6 +200,13 @@ enum myri10ge_mcp_cmd_type {
         /* data0, data1 = bus addr,
          * data2 = sizeof(struct mcp_irq_data) from driver point of view, allows
          * adding new stuff to mcp_irq_data without changing the ABI */
+
+        MXGEFW_CMD_UNALIGNED_TEST,
+        /* same than DMA_TEST (same args) but abort with UNALIGNED on unaligned
+         * chipset */
+
+        MXGEFW_CMD_UNALIGNED_STATUS
+            /* return data = boolean, true if the chipset is known to be unaligned */
 };
 
 enum myri10ge_mcp_cmd_status {
@@ -212,18 +219,27 @@ enum myri10ge_mcp_cmd_status {
         MXGEFW_CMD_ERROR_HASH_ERROR,
         MXGEFW_CMD_ERROR_BAD_PORT,
         MXGEFW_CMD_ERROR_RESOURCES,
-        MXGEFW_CMD_ERROR_MULTICAST
+        MXGEFW_CMD_ERROR_MULTICAST,
+        MXGEFW_CMD_ERROR_UNALIGNED
 };
 
 #define MXGEFW_OLD_IRQ_DATA_LEN 40
 
 struct mcp_irq_data {
         /* add new counters at the beginning */
-        __be32 future_use[5];
+        __be32 future_use[1];
+        __be32 dropped_pause;
+        __be32 dropped_unicast_filtered;
+        __be32 dropped_bad_crc32;
+        __be32 dropped_bad_phy;
         __be32 dropped_multicast_filtered;
         /* 40 Bytes */
         __be32 send_done_count;
 
+#define MXGEFW_LINK_DOWN 0
+#define MXGEFW_LINK_UP 1
+#define MXGEFW_LINK_MYRINET 2
+#define MXGEFW_LINK_UNKNOWN 3
         __be32 link_up;
         __be32 dropped_link_overflow;
         __be32 dropped_link_error_or_filtered;
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index a8d7ff2c96ac..4cf0d3fcb519 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -81,6 +81,8 @@ static const int multicast_filter_limit = 100;
    Setting to > 1518 effectively disables this feature. */
 static int rx_copybreak;
 
+static int dspcfg_workaround = 1;
+
 /* Used to pass the media type, etc.
    Both 'options[]' and 'full_duplex[]' should exist for driver
    interoperability.
@@ -129,7 +131,6 @@ static const char version[] __devinitdata =
   KERN_INFO DRV_NAME " dp8381x driver, version "
       DRV_VERSION ", " DRV_RELDATE "\n"
   KERN_INFO "  originally by Donald Becker <becker@scyld.com>\n"
-  KERN_INFO "  http://www.scyld.com/network/natsemi.html\n"
   KERN_INFO "  2.4.x kernel port by Jeff Garzik, Tjeerd Mulder\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
@@ -139,12 +140,14 @@ MODULE_LICENSE("GPL");
 module_param(mtu, int, 0);
 module_param(debug, int, 0);
 module_param(rx_copybreak, int, 0);
+module_param(dspcfg_workaround, int, 1);
 module_param_array(options, int, NULL, 0);
 module_param_array(full_duplex, int, NULL, 0);
 MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)");
 MODULE_PARM_DESC(debug, "DP8381x default debug level");
 MODULE_PARM_DESC(rx_copybreak,
         "DP8381x copy breakpoint for copy-only-tiny-frames");
+MODULE_PARM_DESC(dspcfg_workaround, "DP8381x: control DspCfg workaround");
 MODULE_PARM_DESC(options,
         "DP8381x: Bits 0-3: media type, bit 17: full duplex");
 MODULE_PARM_DESC(full_duplex, "DP8381x full duplex setting(s) (1)");
@@ -590,6 +593,7 @@ struct netdev_private {
         u32 srr;
         /* expected DSPCFG value */
         u16 dspcfg;
+        int dspcfg_workaround;
         /* parms saved in ethtool format */
         u16     speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
         u8      duplex;         /* Duplex, half or full */
@@ -656,6 +660,56 @@ static int netdev_get_regs(struct net_device *dev, u8 *buf);
 static int netdev_get_eeprom(struct net_device *dev, u8 *buf);
 static const struct ethtool_ops ethtool_ops;
 
+#define NATSEMI_ATTR(_name) \
+static ssize_t natsemi_show_##_name(struct device *dev, \
+         struct device_attribute *attr, char *buf); \
+         static ssize_t natsemi_set_##_name(struct device *dev, \
+                struct device_attribute *attr, \
+                const char *buf, size_t count); \
+         static DEVICE_ATTR(_name, 0644, natsemi_show_##_name, natsemi_set_##_name)
+
+#define NATSEMI_CREATE_FILE(_dev, _name) \
+         device_create_file(&_dev->dev, &dev_attr_##_name)
+#define NATSEMI_REMOVE_FILE(_dev, _name) \
+         device_create_file(&_dev->dev, &dev_attr_##_name)
+
+NATSEMI_ATTR(dspcfg_workaround);
+
+static ssize_t natsemi_show_dspcfg_workaround(struct device *dev,
+                                              struct device_attribute *attr, 
+                                              char *buf)
+{
+        struct netdev_private *np = netdev_priv(to_net_dev(dev));
+
+        return sprintf(buf, "%s\n", np->dspcfg_workaround ? "on" : "off");
+}
+
+static ssize_t natsemi_set_dspcfg_workaround(struct device *dev,
+                                             struct device_attribute *attr,
+                                             const char *buf, size_t count)
+{
+        struct netdev_private *np = netdev_priv(to_net_dev(dev));
+        int new_setting;
+        u32 flags;
+
+        /* Find out the new setting */
+        if (!strncmp("on", buf, count - 1) || !strncmp("1", buf, count - 1))
+                new_setting = 1;
+        else if (!strncmp("off", buf, count - 1)
+                 || !strncmp("0", buf, count - 1))
+                new_setting = 0;
+        else
+                 return count; 
+
+        spin_lock_irqsave(&np->lock, flags);
+
+        np->dspcfg_workaround = new_setting;
+
+        spin_unlock_irqrestore(&np->lock, flags);
+
+        return count;
+}
+
 static inline void __iomem *ns_ioaddr(struct net_device *dev)
 {
         return (void __iomem *) dev->base_addr;
@@ -820,6 +874,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
                 np->ignore_phy = 1;
         else
                 np->ignore_phy = 0;
+        np->dspcfg_workaround = dspcfg_workaround;
 
         /* Initial port:
          * - If configured to ignore the PHY set up for external.
@@ -899,6 +954,9 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_register_netdev;
 
+        if (NATSEMI_CREATE_FILE(pdev, dspcfg_workaround))
+                goto err_create_file;
+
         if (netif_msg_drv(np)) {
                 printk(KERN_INFO "natsemi %s: %s at %#08lx (%s), ",
                         dev->name, natsemi_pci_info[chip_idx].name, iostart,
@@ -915,6 +973,9 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         }
         return 0;
 
+ err_create_file:
+        unregister_netdev(dev);
+
  err_register_netdev:
         iounmap(ioaddr);
 
@@ -1727,7 +1788,8 @@ static void init_registers(struct net_device *dev)
  *    It seems that a reference set for this chip went out with incorrect info,
  *    and there exist boards that aren't quite right.  An unexpected voltage
  *    drop can cause the PHY to get itself in a weird state (basically reset).
- *    NOTE: this only seems to affect revC chips.
+ *    NOTE: this only seems to affect revC chips.  The user can disable
+ *    this check via dspcfg_workaround sysfs option.
  * 3) check of death of the RX path due to OOM
  */
 static void netdev_timer(unsigned long data)
@@ -1753,10 +1815,10 @@ static void netdev_timer(unsigned long data)
                 writew(1, ioaddr+PGSEL);
                 dspcfg = readw(ioaddr+DSPCFG);
                 writew(0, ioaddr+PGSEL);
-                if (dspcfg != np->dspcfg) {
+                if (np->dspcfg_workaround && dspcfg != np->dspcfg) {
                         if (!netif_queue_stopped(dev)) {
                                 spin_unlock_irq(&np->lock);
-                                if (netif_msg_hw(np))
+                                if (netif_msg_drv(np))
                                         printk(KERN_NOTICE "%s: possible phy reset: "
                                                 "re-initializing\n", dev->name);
                                 disable_irq(dev->irq);
@@ -3157,6 +3219,7 @@ static void __devexit natsemi_remove1 (struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         void __iomem * ioaddr = ns_ioaddr(dev);
 
+        NATSEMI_REMOVE_FILE(pdev, dspcfg_workaround);
         unregister_netdev (dev);
         pci_release_regions (pdev);
         iounmap(ioaddr);
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index a5c4199e2754..c9f74bf5f491 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -51,14 +51,11 @@ static const char version2[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/jiffies.h>
+#include <linux/platform_device.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 
-#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
-#include <asm/tx4938/rbtx4938.h>
-#endif
-
 #include "8390.h"
 
 #define DRV_NAME "ne"
@@ -77,8 +74,13 @@ static const char version2[] =
 /* Do we have a non std. amount of memory? (in units of 256 byte pages) */
 /* #define PACKETBUF_MEMSIZE    0x40 */
 
+#if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R))
+/* Do we need a portlist for the ISA auto-probe ? */
+#define NEEDS_PORTLIST
+#endif
+
 /* A zero-terminated list of I/O addresses to be probed at boot. */
-#ifndef MODULE
+#ifdef NEEDS_PORTLIST
 static unsigned int netcard_portlist[] __initdata = {
         0x300, 0x280, 0x320, 0x340, 0x360, 0x380, 0
 };
@@ -146,7 +148,7 @@ bad_clone_list[] __initdata = {
 #  define DCR_VAL 0x49
 #endif
 
-static int ne_probe1(struct net_device *dev, int ioaddr);
+static int ne_probe1(struct net_device *dev, unsigned long ioaddr);
 static int ne_probe_isapnp(struct net_device *dev);
 
 static int ne_open(struct net_device *dev);
@@ -184,8 +186,8 @@ static void ne_block_output(struct net_device *dev, const int count,
 
 static int __init do_ne_probe(struct net_device *dev)
 {
-        unsigned int base_addr = dev->base_addr;
-#ifndef MODULE
+        unsigned long base_addr = dev->base_addr;
+#ifdef NEEDS_PORTLIST
         int orig_irq = dev->irq;
 #endif
 
@@ -201,7 +203,7 @@ static int __init do_ne_probe(struct net_device *dev)
         if (isapnp_present() && (ne_probe_isapnp(dev) == 0))
                 return 0;
 
-#ifndef MODULE
+#ifdef NEEDS_PORTLIST
         /* Last resort. The semi-risky ISA auto-probe. */
         for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) {
                 int ioaddr = netcard_portlist[base_addr];
@@ -226,10 +228,6 @@ struct net_device * __init ne_probe(int unit)
         sprintf(dev->name, "eth%d", unit);
         netdev_boot_setup_check(dev);
 
-#ifdef CONFIG_TOSHIBA_RBTX4938
-        dev->base_addr = RBTX4938_RTL_8019_BASE;
-        dev->irq = RBTX4938_RTL_8019_IRQ;
-#endif
         err = do_ne_probe(dev);
         if (err)
                 goto out;
@@ -285,7 +283,7 @@ static int __init ne_probe_isapnp(struct net_device *dev)
         return -ENODEV;
 }
 
-static int __init ne_probe1(struct net_device *dev, int ioaddr)
+static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
 {
         int i;
         unsigned char SA_prom[32];
@@ -324,7 +322,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
         if (ei_debug  &&  version_printed++ == 0)
                 printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2);
 
-        printk(KERN_INFO "NE*000 ethercard probe at %#3x:", ioaddr);
+        printk(KERN_INFO "NE*000 ethercard probe at %#3lx:", ioaddr);
 
         /* A user with a poor card that fails to ack the reset, or that
            does not have a valid 0x57,0x57 signature can still use this
@@ -516,8 +514,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
         }
 #endif
 
-        printk("\n%s: %s found at %#x, using IRQ %d.\n",
-                dev->name, name, ioaddr, dev->irq);
+        printk("\n");
 
         ei_status.name = name;
         ei_status.tx_start_page = start_page;
@@ -547,6 +544,8 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
         ret = register_netdev(dev);
         if (ret)
                 goto out_irq;
+        printk(KERN_INFO "%s: %s found at %#lx, using IRQ %d.\n",
+               dev->name, name, ioaddr, dev->irq);
         return 0;
 
 out_irq:
@@ -807,6 +806,87 @@ retry:
         return;
 }
 
+static int __init ne_drv_probe(struct platform_device *pdev)
+{
+        struct net_device *dev;
+        struct resource *res;
+        int err, irq;
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!res || irq < 0)
+                return -ENODEV;
+
+        dev = alloc_ei_netdev();
+        if (!dev)
+                return -ENOMEM;
+        dev->irq = irq;
+        dev->base_addr = res->start;
+        err = do_ne_probe(dev);
+        if (err) {
+                free_netdev(dev);
+                return err;
+        }
+        platform_set_drvdata(pdev, dev);
+        return 0;
+}
+
+static int __exit ne_drv_remove(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+
+        unregister_netdev(dev);
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr, NE_IO_EXTENT);
+        free_netdev(dev);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int ne_drv_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+
+        if (netif_running(dev))
+                netif_device_detach(dev);
+        return 0;
+}
+
+static int ne_drv_resume(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+
+        if (netif_running(dev)) {
+                ne_reset_8390(dev);
+                NS8390_init(dev, 1);
+                netif_device_attach(dev);
+        }
+        return 0;
+}
+#else
+#define ne_drv_suspend NULL
+#define ne_drv_resume NULL
+#endif
+
+static struct platform_driver ne_driver = {
+        .remove         = __exit_p(ne_drv_remove),
+        .suspend        = ne_drv_suspend,
+        .resume         = ne_drv_resume,
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init ne_init(void)
+{
+        return platform_driver_probe(&ne_driver, ne_drv_probe);
+}
+
+static void __exit ne_exit(void)
+{
+        platform_driver_unregister(&ne_driver);
+}
 
 #ifdef MODULE
 #define MAX_NE_CARDS    4       /* Max number of NE cards per module */
@@ -832,6 +912,7 @@ ISA device autoprobes on a running machine are not recommended anyway. */
 int __init init_module(void)
 {
         int this_dev, found = 0;
+        int plat_found = !ne_init();
 
         for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
                 struct net_device *dev = alloc_ei_netdev();
@@ -845,7 +926,7 @@ int __init init_module(void)
                         continue;
                 }
                 free_netdev(dev);
-                if (found)
+                if (found || plat_found)
                         break;
                 if (io[this_dev] != 0)
                         printk(KERN_WARNING "ne.c: No NE*000 card found at i/o = %#x\n", io[this_dev]);
@@ -853,7 +934,7 @@ int __init init_module(void)
                         printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\" value(s) for ISA cards.\n");
                 return -ENXIO;
         }
-        if (found)
+        if (found || plat_found)
                 return 0;
         return -ENODEV;
 }
@@ -871,6 +952,7 @@ void __exit cleanup_module(void)
 {
         int this_dev;
 
+        ne_exit();
         for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
                 struct net_device *dev = dev_ne[this_dev];
                 if (dev) {
@@ -880,4 +962,7 @@ void __exit cleanup_module(void)
                 }
         }
 }
+#else /* MODULE */
+module_init(ne_init);
+module_exit(ne_exit);
 #endif /* MODULE */
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 589785d1e762..995c0a5d4066 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -63,8 +63,7 @@ static int options[MAX_UNITS];
 
 /* These identify the driver base version and may not be removed. */
 static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n"
-KERN_INFO "  http://www.scyld.com/network/ne2k-pci.html\n";
+KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n";
 
 #if defined(__powerpc__)
 #define inl_le(addr)  le32_to_cpu(inl(addr))
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index cf0e96adfe44..a36892457761 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1216,7 +1216,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                 /* Window = 1 */
                 writel(consumer,
                        NETXEN_CRB_NORMALIZE(adapter,
-                                            recv_crb_registers[ctxid].
+                                            recv_crb_registers[adapter->portnum].
                                             crb_rcv_status_consumer));
         }
 
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 4e32bb678ea9..2c5c6d20e6e9 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -735,7 +735,7 @@ static int netxen_nic_open(struct net_device *netdev)
                 }
                 adapter->irq = adapter->ahw.pdev->irq;
                 err = request_irq(adapter->ahw.pdev->irq, netxen_intr,
-                                  SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name,
+                                  IRQF_SHARED|IRQF_SAMPLE_RANDOM, netdev->name,
                                   adapter);
                 if (err) {
                         printk(KERN_ERR "request_irq failed with: %d\n", err);
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 6a32338623f1..3439f8c649f9 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -104,7 +104,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 #include <linux/init.h>
 #include <linux/ip.h>   /* for iph */
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 76fe9dd8e841..8d38425e46c3 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -33,6 +33,8 @@
 #include <linux/tcp.h>
 #include <net/checksum.h>
 
+#include <asm/irq.h>
+
 #include "pasemi_mac.h"
 
 
@@ -51,6 +53,16 @@
 #define RX_RING_SIZE 512
 #define TX_RING_SIZE 512
 
+#define DEFAULT_MSG_ENABLE        \
+        (NETIF_MSG_DRV          | \
+         NETIF_MSG_PROBE        | \
+         NETIF_MSG_LINK         | \
+         NETIF_MSG_TIMER        | \
+         NETIF_MSG_IFDOWN       | \
+         NETIF_MSG_IFUP         | \
+         NETIF_MSG_RX_ERR       | \
+         NETIF_MSG_TX_ERR)
+
 #define TX_DESC(mac, num)       ((mac)->tx->desc[(num) & (TX_RING_SIZE-1)])
 #define TX_DESC_INFO(mac, num)  ((mac)->tx->desc_info[(num) & (TX_RING_SIZE-1)])
 #define RX_DESC(mac, num)       ((mac)->rx->desc[(num) & (RX_RING_SIZE-1)])
@@ -59,11 +71,13 @@
 
 #define BUF_SIZE 1646 /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
 
-/* XXXOJN these should come out of the device tree some day */
-#define PAS_DMA_CAP_BASE   0xe00d0040
-#define PAS_DMA_CAP_SIZE   0x100
-#define PAS_DMA_COM_BASE   0xe00d0100
-#define PAS_DMA_COM_SIZE   0x100
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
+MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
+
+static int debug = -1;  /* -1 == use DEFAULT_MSG_ENABLE as value */
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
 
 static struct pasdma_status *dma_status;
 
@@ -71,6 +85,7 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
 {
         struct pci_dev *pdev = mac->pdev;
         struct device_node *dn = pci_device_to_OF_node(pdev);
+        int len;
         const u8 *maddr;
         u8 addr[6];
 
@@ -80,13 +95,27 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
                 return -ENOENT;
         }
 
-        maddr = get_property(dn, "mac-address", NULL);
+        maddr = of_get_property(dn, "local-mac-address", &len);
+
+        if (maddr && len == 6) {
+                memcpy(mac->mac_addr, maddr, 6);
+                return 0;
+        }
+
+        /* Some old versions of firmware mistakenly uses mac-address
+         * (and as a string) instead of a byte array in local-mac-address.
+         */
+
+        if (maddr == NULL)
+                maddr = of_get_property(dn, "mac-address", NULL);
+
         if (maddr == NULL) {
                 dev_warn(&pdev->dev,
                          "no mac address in device tree, not configuring\n");
                 return -ENOENT;
         }
 
+
         if (sscanf(maddr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &addr[0],
                    &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]) != 6) {
                 dev_warn(&pdev->dev,
@@ -94,7 +123,8 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
                 return -EINVAL;
         }
 
-        memcpy(mac->mac_addr, addr, sizeof(addr));
+        memcpy(mac->mac_addr, addr, 6);
+
         return 0;
 }
 
@@ -277,8 +307,8 @@ static void pasemi_mac_free_rx_resources(struct net_device *dev)
         for (i = 0; i < RX_RING_SIZE; i++) {
                 info = &RX_DESC_INFO(mac, i);
                 dp = &RX_DESC(mac, i);
-                if (info->dma) {
-                        if (info->skb) {
+                if (info->skb) {
+                        if (info->dma) {
                                 pci_unmap_single(mac->dma_pdev,
                                                  info->dma,
                                                  info->skb->len,
@@ -309,82 +339,115 @@ static void pasemi_mac_replenish_rx_ring(struct net_device *dev)
         struct pasemi_mac *mac = netdev_priv(dev);
         unsigned int i;
         int start = mac->rx->next_to_fill;
-        unsigned int count;
+        unsigned int limit, count;
 
-        count = (mac->rx->next_to_clean + RX_RING_SIZE -
+        limit = (mac->rx->next_to_clean + RX_RING_SIZE -
                  mac->rx->next_to_fill) & (RX_RING_SIZE - 1);
 
         /* Check to see if we're doing first-time setup */
         if (unlikely(mac->rx->next_to_clean == 0 && mac->rx->next_to_fill == 0))
-                count = RX_RING_SIZE;
+                limit = RX_RING_SIZE;
 
-        if (count <= 0)
+        if (limit <= 0)
                 return;
 
-        for (i = start; i < start + count; i++) {
+        i = start;
+        for (count = limit; count; count--) {
                 struct pasemi_mac_buffer *info = &RX_DESC_INFO(mac, i);
                 u64 *buff = &RX_BUFF(mac, i);
                 struct sk_buff *skb;
                 dma_addr_t dma;
 
-                skb = dev_alloc_skb(BUF_SIZE);
+                /* skb might still be in there for recycle on short receives */
+                if (info->skb)
+                        skb = info->skb;
+                else
+                        skb = dev_alloc_skb(BUF_SIZE);
 
-                if (!skb) {
-                        count = i - start;
+                if (unlikely(!skb))
                         break;
-                }
 
                 dma = pci_map_single(mac->dma_pdev, skb->data, skb->len,
                                      PCI_DMA_FROMDEVICE);
 
-                if (dma_mapping_error(dma)) {
+                if (unlikely(dma_mapping_error(dma))) {
                         dev_kfree_skb_irq(info->skb);
-                        count = i - start;
                         break;
                 }
 
                 info->skb = skb;
                 info->dma = dma;
                 *buff = XCT_RXB_LEN(BUF_SIZE) | XCT_RXB_ADDR(dma);
+                i++;
         }
 
         wmb();
 
         pci_write_config_dword(mac->dma_pdev,
                                PAS_DMA_RXCHAN_INCR(mac->dma_rxch),
-                               count);
+                               limit - count);
         pci_write_config_dword(mac->dma_pdev,
                                PAS_DMA_RXINT_INCR(mac->dma_if),
-                               count);
+                               limit - count);
+
+        mac->rx->next_to_fill += limit - count;
+}
 
-        mac->rx->next_to_fill += count;
+static void pasemi_mac_restart_rx_intr(struct pasemi_mac *mac)
+{
+        unsigned int reg, pcnt;
+        /* Re-enable packet count interrupts: finally
+         * ack the packet count interrupt we got in rx_intr.
+         */
+
+        pcnt = *mac->rx_status & PAS_STATUS_PCNT_M;
+
+        reg = PAS_IOB_DMA_RXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_RXCH_RESET_PINTC;
+
+        pci_write_config_dword(mac->iob_pdev,
+                               PAS_IOB_DMA_RXCH_RESET(mac->dma_rxch),
+                               reg);
+}
+
+static void pasemi_mac_restart_tx_intr(struct pasemi_mac *mac)
+{
+        unsigned int reg, pcnt;
+
+        /* Re-enable packet count interrupts */
+        pcnt = *mac->tx_status & PAS_STATUS_PCNT_M;
+
+        reg = PAS_IOB_DMA_TXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_TXCH_RESET_PINTC;
+
+        pci_write_config_dword(mac->iob_pdev,
+                               PAS_IOB_DMA_TXCH_RESET(mac->dma_txch), reg);
 }
 
+
 static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit)
 {
-        unsigned int i;
-        int start, count;
+        unsigned int n;
+        int count;
+        struct pas_dma_xct_descr *dp;
+        struct pasemi_mac_buffer *info;
+        struct sk_buff *skb;
+        unsigned int i, len;
+        u64 macrx;
+        dma_addr_t dma;
 
         spin_lock(&mac->rx->lock);
 
-        start = mac->rx->next_to_clean;
-        count = 0;
+        n = mac->rx->next_to_clean;
 
-        for (i = start; i < (start + RX_RING_SIZE) && count < limit; i++) {
-                struct pas_dma_xct_descr *dp;
-                struct pasemi_mac_buffer *info;
-                struct sk_buff *skb;
-                unsigned int j, len;
-                dma_addr_t dma;
+        for (count = limit; count; count--) {
 
                 rmb();
 
-                dp = &RX_DESC(mac, i);
+                dp = &RX_DESC(mac, n);
+                macrx = dp->macrx;
 
-                if (!(dp->macrx & XCT_MACRX_O))
+                if (!(macrx & XCT_MACRX_O))
                         break;
 
-                count++;
 
                 info = NULL;
 
@@ -396,29 +459,42 @@ static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit)
                  */
 
                 dma = (dp->ptr & XCT_PTR_ADDR_M);
-                for (j = start; j < (start + RX_RING_SIZE); j++) {
-                        info = &RX_DESC_INFO(mac, j);
+                for (i = n; i < (n + RX_RING_SIZE); i++) {
+                        info = &RX_DESC_INFO(mac, i);
                         if (info->dma == dma)
                                 break;
                 }
 
-                BUG_ON(!info);
-                BUG_ON(info->dma != dma);
+                skb = info->skb;
+                info->dma = 0;
 
-                pci_unmap_single(mac->dma_pdev, info->dma, info->skb->len,
+                pci_unmap_single(mac->dma_pdev, dma, skb->len,
                                  PCI_DMA_FROMDEVICE);
 
-                skb = info->skb;
-
-                len = (dp->macrx & XCT_MACRX_LLEN_M) >> XCT_MACRX_LLEN_S;
+                len = (macrx & XCT_MACRX_LLEN_M) >> XCT_MACRX_LLEN_S;
+
+                if (len < 256) {
+                        struct sk_buff *new_skb =
+                            netdev_alloc_skb(mac->netdev, len + NET_IP_ALIGN);
+                        if (new_skb) {
+                                skb_reserve(new_skb, NET_IP_ALIGN);
+                                memcpy(new_skb->data - NET_IP_ALIGN,
+                                        skb->data - NET_IP_ALIGN,
+                                        len + NET_IP_ALIGN);
+                                /* save the skb in buffer_info as good */
+                                skb = new_skb;
+                        }
+                        /* else just continue with the old one */
+                } else
+                        info->skb = NULL;
 
                 skb_put(skb, len);
 
                 skb->protocol = eth_type_trans(skb, mac->netdev);
 
-                if ((dp->macrx & XCT_MACRX_HTY_M) == XCT_MACRX_HTY_IPV4_OK) {
+                if ((macrx & XCT_MACRX_HTY_M) == XCT_MACRX_HTY_IPV4_OK) {
                         skb->ip_summed = CHECKSUM_COMPLETE;
-                        skb->csum = (dp->macrx & XCT_MACRX_CSUM_M) >>
+                        skb->csum = (macrx & XCT_MACRX_CSUM_M) >>
                                            XCT_MACRX_CSUM_S;
                 } else
                         skb->ip_summed = CHECKSUM_NONE;
@@ -428,13 +504,13 @@ static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit)
 
                 netif_receive_skb(skb);
 
-                info->dma = 0;
-                info->skb = NULL;
                 dp->ptr = 0;
                 dp->macrx = 0;
+
+                n++;
         }
 
-        mac->rx->next_to_clean += count;
+        mac->rx->next_to_clean += limit - count;
         pasemi_mac_replenish_rx_ring(mac->netdev);
 
         spin_unlock(&mac->rx->lock);
@@ -476,6 +552,8 @@ static int pasemi_mac_clean_tx(struct pasemi_mac *mac)
         mac->tx->next_to_clean += count;
         spin_unlock_irqrestore(&mac->tx->lock, flags);
 
+        netif_wake_queue(mac->netdev);
+
         return count;
 }
 
@@ -486,18 +564,28 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data)
         struct pasemi_mac *mac = netdev_priv(dev);
         unsigned int reg;
 
-        if (!(*mac->rx_status & PAS_STATUS_INT))
+        if (!(*mac->rx_status & PAS_STATUS_CAUSE_M))
                 return IRQ_NONE;
 
-        netif_rx_schedule(dev);
-        pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_COM_TIMEOUTCFG,
-                               PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0));
+        if (*mac->rx_status & PAS_STATUS_ERROR)
+                printk("rx_status reported error\n");
+
+        /* Don't reset packet count so it won't fire again but clear
+         * all others.
+         */
 
-        reg = PAS_IOB_DMA_RXCH_RESET_PINTC | PAS_IOB_DMA_RXCH_RESET_SINTC |
-              PAS_IOB_DMA_RXCH_RESET_DINTC;
+        pci_read_config_dword(mac->dma_pdev, PAS_DMA_RXINT_RCMDSTA(mac->dma_if), &reg);
+
+        reg = 0;
+        if (*mac->rx_status & PAS_STATUS_SOFT)
+                reg |= PAS_IOB_DMA_RXCH_RESET_SINTC;
+        if (*mac->rx_status & PAS_STATUS_ERROR)
+                reg |= PAS_IOB_DMA_RXCH_RESET_DINTC;
         if (*mac->rx_status & PAS_STATUS_TIMER)
                 reg |= PAS_IOB_DMA_RXCH_RESET_TINTC;
 
+        netif_rx_schedule(dev);
+
         pci_write_config_dword(mac->iob_pdev,
                                PAS_IOB_DMA_RXCH_RESET(mac->dma_rxch), reg);
 
@@ -509,32 +597,141 @@ static irqreturn_t pasemi_mac_tx_intr(int irq, void *data)
 {
         struct net_device *dev = data;
         struct pasemi_mac *mac = netdev_priv(dev);
-        unsigned int reg;
-        int was_full;
+        unsigned int reg, pcnt;
 
-        was_full = mac->tx->next_to_clean - mac->tx->next_to_use == TX_RING_SIZE;
-
-        if (!(*mac->tx_status & PAS_STATUS_INT))
+        if (!(*mac->tx_status & PAS_STATUS_CAUSE_M))
                 return IRQ_NONE;
 
         pasemi_mac_clean_tx(mac);
 
-        reg = PAS_IOB_DMA_TXCH_RESET_PINTC | PAS_IOB_DMA_TXCH_RESET_SINTC;
-        if (*mac->tx_status & PAS_STATUS_TIMER)
-                reg |= PAS_IOB_DMA_TXCH_RESET_TINTC;
+        pcnt = *mac->tx_status & PAS_STATUS_PCNT_M;
 
-        pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_TXCH_RESET(mac->dma_txch),
-                               reg);
+        reg = PAS_IOB_DMA_TXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_TXCH_RESET_PINTC;
 
-        if (was_full)
-                netif_wake_queue(dev);
+        if (*mac->tx_status & PAS_STATUS_SOFT)
+                reg |= PAS_IOB_DMA_TXCH_RESET_SINTC;
+        if (*mac->tx_status & PAS_STATUS_ERROR)
+                reg |= PAS_IOB_DMA_TXCH_RESET_DINTC;
+
+        pci_write_config_dword(mac->iob_pdev,
+                               PAS_IOB_DMA_TXCH_RESET(mac->dma_txch),
+                               reg);
 
         return IRQ_HANDLED;
 }
 
+static void pasemi_adjust_link(struct net_device *dev)
+{
+        struct pasemi_mac *mac = netdev_priv(dev);
+        int msg;
+        unsigned int flags;
+        unsigned int new_flags;
+
+        if (!mac->phydev->link) {
+                /* If no link, MAC speed settings don't matter. Just report
+                 * link down and return.
+                 */
+                if (mac->link && netif_msg_link(mac))
+                        printk(KERN_INFO "%s: Link is down.\n", dev->name);
+
+                netif_carrier_off(dev);
+                mac->link = 0;
+
+                return;
+        } else
+                netif_carrier_on(dev);
+
+        pci_read_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, &flags);
+        new_flags = flags & ~(PAS_MAC_CFG_PCFG_HD | PAS_MAC_CFG_PCFG_SPD_M |
+                              PAS_MAC_CFG_PCFG_TSR_M);
+
+        if (!mac->phydev->duplex)
+                new_flags |= PAS_MAC_CFG_PCFG_HD;
+
+        switch (mac->phydev->speed) {
+        case 1000:
+                new_flags |= PAS_MAC_CFG_PCFG_SPD_1G |
+                             PAS_MAC_CFG_PCFG_TSR_1G;
+                break;
+        case 100:
+                new_flags |= PAS_MAC_CFG_PCFG_SPD_100M |
+                             PAS_MAC_CFG_PCFG_TSR_100M;
+                break;
+        case 10:
+                new_flags |= PAS_MAC_CFG_PCFG_SPD_10M |
+                             PAS_MAC_CFG_PCFG_TSR_10M;
+                break;
+        default:
+                printk("Unsupported speed %d\n", mac->phydev->speed);
+        }
+
+        /* Print on link or speed/duplex change */
+        msg = mac->link != mac->phydev->link || flags != new_flags;
+
+        mac->duplex = mac->phydev->duplex;
+        mac->speed = mac->phydev->speed;
+        mac->link = mac->phydev->link;
+
+        if (new_flags != flags)
+                pci_write_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, new_flags);
+
+        if (msg && netif_msg_link(mac))
+                printk(KERN_INFO "%s: Link is up at %d Mbps, %s duplex.\n",
+                       dev->name, mac->speed, mac->duplex ? "full" : "half");
+}
+
+static int pasemi_mac_phy_init(struct net_device *dev)
+{
+        struct pasemi_mac *mac = netdev_priv(dev);
+        struct device_node *dn, *phy_dn;
+        struct phy_device *phydev;
+        unsigned int phy_id;
+        const phandle *ph;
+        const unsigned int *prop;
+        struct resource r;
+        int ret;
+
+        dn = pci_device_to_OF_node(mac->pdev);
+        ph = of_get_property(dn, "phy-handle", NULL);
+        if (!ph)
+                return -ENODEV;
+        phy_dn = of_find_node_by_phandle(*ph);
+
+        prop = of_get_property(phy_dn, "reg", NULL);
+        ret = of_address_to_resource(phy_dn->parent, 0, &r);
+        if (ret)
+                goto err;
+
+        phy_id = *prop;
+        snprintf(mac->phy_id, BUS_ID_SIZE, PHY_ID_FMT, (int)r.start, phy_id);
+
+        of_node_put(phy_dn);
+
+        mac->link = 0;
+        mac->speed = 0;
+        mac->duplex = -1;
+
+        phydev = phy_connect(dev, mac->phy_id, &pasemi_adjust_link, 0, PHY_INTERFACE_MODE_SGMII);
+
+        if (IS_ERR(phydev)) {
+                printk(KERN_ERR "%s: Could not attach to phy\n", dev->name);
+                return PTR_ERR(phydev);
+        }
+
+        mac->phydev = phydev;
+
+        return 0;
+
+err:
+        of_node_put(phy_dn);
+        return -ENODEV;
+}
+
+
 static int pasemi_mac_open(struct net_device *dev)
 {
         struct pasemi_mac *mac = netdev_priv(dev);
+        int base_irq;
         unsigned int flags;
         int ret;
 
@@ -558,10 +755,18 @@ static int pasemi_mac_open(struct net_device *dev)
         flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G;
 
         pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch),
-                               PAS_IOB_DMA_RXCH_CFG_CNTTH(30));
+                               PAS_IOB_DMA_RXCH_CFG_CNTTH(1));
+
+        pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_TXCH_CFG(mac->dma_txch),
+                               PAS_IOB_DMA_TXCH_CFG_CNTTH(32));
+
+        /* Clear out any residual packet count state from firmware */
+        pasemi_mac_restart_rx_intr(mac);
+        pasemi_mac_restart_tx_intr(mac);
 
+        /* 0xffffff is max value, about 16ms */
         pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_COM_TIMEOUTCFG,
-                               PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(1000000));
+                               PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0xffffff));
 
         pci_write_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, flags);
 
@@ -595,31 +800,50 @@ static int pasemi_mac_open(struct net_device *dev)
 
         pasemi_mac_replenish_rx_ring(dev);
 
+        ret = pasemi_mac_phy_init(dev);
+        /* Some configs don't have PHYs (XAUI etc), so don't complain about
+         * failed init due to -ENODEV.
+         */
+        if (ret && ret != -ENODEV)
+                dev_warn(&mac->pdev->dev, "phy init failed: %d\n", ret);
+
         netif_start_queue(dev);
         netif_poll_enable(dev);
 
-        ret = request_irq(mac->dma_pdev->irq + mac->dma_txch,
-                          &pasemi_mac_tx_intr, IRQF_DISABLED,
+        /* Interrupts are a bit different for our DMA controller: While
+         * it's got one a regular PCI device header, the interrupt there
+         * is really the base of the range it's using. Each tx and rx
+         * channel has it's own interrupt source.
+         */
+
+        base_irq = virq_to_hw(mac->dma_pdev->irq);
+
+        mac->tx_irq = irq_create_mapping(NULL, base_irq + mac->dma_txch);
+        mac->rx_irq = irq_create_mapping(NULL, base_irq + 20 + mac->dma_txch);
+
+        ret = request_irq(mac->tx_irq, &pasemi_mac_tx_intr, IRQF_DISABLED,
                           mac->tx->irq_name, dev);
         if (ret) {
                 dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n",
-                       mac->dma_pdev->irq + mac->dma_txch, ret);
+                        base_irq + mac->dma_txch, ret);
                 goto out_tx_int;
         }
 
-        ret = request_irq(mac->dma_pdev->irq + 20 + mac->dma_rxch,
-                          &pasemi_mac_rx_intr, IRQF_DISABLED,
+        ret = request_irq(mac->rx_irq, &pasemi_mac_rx_intr, IRQF_DISABLED,
                           mac->rx->irq_name, dev);
         if (ret) {
                 dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n",
-                       mac->dma_pdev->irq + 20 + mac->dma_rxch, ret);
+                        base_irq + 20 + mac->dma_rxch, ret);
                 goto out_rx_int;
         }
 
+        if (mac->phydev)
+                phy_start(mac->phydev);
+
         return 0;
 
 out_rx_int:
-        free_irq(mac->dma_pdev->irq + mac->dma_txch, dev);
+        free_irq(mac->tx_irq, dev);
 out_tx_int:
         netif_poll_disable(dev);
         netif_stop_queue(dev);
@@ -639,6 +863,11 @@ static int pasemi_mac_close(struct net_device *dev)
         unsigned int stat;
         int retries;
 
+        if (mac->phydev) {
+                phy_stop(mac->phydev);
+                phy_disconnect(mac->phydev);
+        }
+
         netif_stop_queue(dev);
 
         /* Clean out any pending buffers */
@@ -660,40 +889,37 @@ static int pasemi_mac_close(struct net_device *dev)
                 pci_read_config_dword(mac->dma_pdev,
                                       PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch),
                                       &stat);
-                if (stat & PAS_DMA_TXCHAN_TCMDSTA_ACT)
+                if (!(stat & PAS_DMA_TXCHAN_TCMDSTA_ACT))
                         break;
                 cond_resched();
         }
 
-        if (!(stat & PAS_DMA_TXCHAN_TCMDSTA_ACT)) {
+        if (stat & PAS_DMA_TXCHAN_TCMDSTA_ACT)
                 dev_err(&mac->dma_pdev->dev, "Failed to stop tx channel\n");
-        }
 
         for (retries = 0; retries < MAX_RETRIES; retries++) {
                 pci_read_config_dword(mac->dma_pdev,
                                       PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch),
                                       &stat);
-                if (stat & PAS_DMA_RXCHAN_CCMDSTA_ACT)
+                if (!(stat & PAS_DMA_RXCHAN_CCMDSTA_ACT))
                         break;
                 cond_resched();
         }
 
-        if (!(stat & PAS_DMA_RXCHAN_CCMDSTA_ACT)) {
+        if (stat & PAS_DMA_RXCHAN_CCMDSTA_ACT)
                 dev_err(&mac->dma_pdev->dev, "Failed to stop rx channel\n");
-        }
 
         for (retries = 0; retries < MAX_RETRIES; retries++) {
                 pci_read_config_dword(mac->dma_pdev,
                                       PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
                                       &stat);
-                if (stat & PAS_DMA_RXINT_RCMDSTA_ACT)
+                if (!(stat & PAS_DMA_RXINT_RCMDSTA_ACT))
                         break;
                 cond_resched();
         }
 
-        if (!(stat & PAS_DMA_RXINT_RCMDSTA_ACT)) {
+        if (stat & PAS_DMA_RXINT_RCMDSTA_ACT)
                 dev_err(&mac->dma_pdev->dev, "Failed to stop rx interface\n");
-        }
 
         /* Then, disable the channel. This must be done separately from
          * stopping, since you can't disable when active.
@@ -706,8 +932,8 @@ static int pasemi_mac_close(struct net_device *dev)
         pci_write_config_dword(mac->dma_pdev,
                                PAS_DMA_RXINT_RCMDSTA(mac->dma_if), 0);
 
-        free_irq(mac->dma_pdev->irq + mac->dma_txch, dev);
-        free_irq(mac->dma_pdev->irq + 20 + mac->dma_rxch, dev);
+        free_irq(mac->tx_irq, dev);
+        free_irq(mac->rx_irq, dev);
 
         /* Free resources */
         pasemi_mac_free_rx_resources(dev);
@@ -757,6 +983,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
         if (txring->next_to_clean - txring->next_to_use == TX_RING_SIZE) {
                 spin_unlock_irqrestore(&txring->lock, flags);
                 pasemi_mac_clean_tx(mac);
+                pasemi_mac_restart_tx_intr(mac);
                 spin_lock_irqsave(&txring->lock, flags);
 
                 if (txring->next_to_clean - txring->next_to_use ==
@@ -802,6 +1029,7 @@ static struct net_device_stats *pasemi_mac_get_stats(struct net_device *dev)
         return &mac->stats;
 }
 
+
 static void pasemi_mac_set_rx_mode(struct net_device *dev)
 {
         struct pasemi_mac *mac = netdev_priv(dev);
@@ -826,18 +1054,17 @@ static int pasemi_mac_poll(struct net_device *dev, int *budget)
 
         pkts = pasemi_mac_clean_rx(mac, limit);
 
+        dev->quota -= pkts;
+        *budget -= pkts;
+
         if (pkts < limit) {
                 /* all done, no more packets present */
                 netif_rx_complete(dev);
 
-                /* re-enable receive interrupts */
-                pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_COM_TIMEOUTCFG,
-                                       PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(1000000));
+                pasemi_mac_restart_rx_intr(mac);
                 return 0;
         } else {
                 /* used up our quantum, so reschedule */
-                dev->quota -= pkts;
-                *budget -= pkts;
                 return 1;
         }
 }
@@ -937,6 +1164,11 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         mac->rx_status = &dma_status->rx_sta[mac->dma_rxch];
         mac->tx_status = &dma_status->tx_sta[mac->dma_txch];
 
+        mac->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
+
+        /* Enable most messages by default */
+        mac->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
+
         err = register_netdev(dev);
 
         if (err) {
@@ -988,6 +1220,7 @@ static void __devexit pasemi_mac_remove(struct pci_dev *pdev)
 static struct pci_device_id pasemi_mac_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa005) },
         { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa006) },
+        { },
 };
 
 MODULE_DEVICE_TABLE(pci, pasemi_mac_pci_tbl);
@@ -1011,9 +1244,5 @@ int pasemi_mac_init_module(void)
         return pci_register_driver(&pasemi_mac_driver);
 }
 
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
-MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
-
 module_init(pasemi_mac_init_module);
 module_exit(pasemi_mac_cleanup_module);
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h
index c3e37e46a18a..c29ee159c33d 100644
--- a/drivers/net/pasemi_mac.h
+++ b/drivers/net/pasemi_mac.h
@@ -24,6 +24,7 @@
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
+#include <linux/phy.h>
 
 struct pasemi_mac_txring {
         spinlock_t       lock;
@@ -54,6 +55,7 @@ struct pasemi_mac {
         struct pci_dev *pdev;
         struct pci_dev *dma_pdev;
         struct pci_dev *iob_pdev;
+        struct phy_device *phydev;
         struct net_device_stats stats;
 
         /* Pointer to the cacheable per-channel status registers */
@@ -73,6 +75,14 @@ struct pasemi_mac {
 
         struct pasemi_mac_txring *tx;
         struct pasemi_mac_rxring *rx;
+        unsigned long   tx_irq;
+        unsigned long   rx_irq;
+        int     link;
+        int     speed;
+        int     duplex;
+
+        unsigned int    msg_enable;
+        char    phy_id[BUS_ID_SIZE];
 };
 
 /* Software status descriptor (desc_info) */
@@ -193,11 +203,15 @@ enum {
 #define PAS_DMA_RXINT_RCMDSTA(i)        (0x200+(i)*_PAS_DMA_RXINT_STRIDE)
 #define    PAS_DMA_RXINT_RCMDSTA_EN     0x00000001
 #define    PAS_DMA_RXINT_RCMDSTA_ST     0x00000002
-#define    PAS_DMA_RXINT_RCMDSTA_OO     0x00000100
-#define    PAS_DMA_RXINT_RCMDSTA_BP     0x00000200
-#define    PAS_DMA_RXINT_RCMDSTA_DR     0x00000400
+#define    PAS_DMA_RXINT_RCMDSTA_MBT    0x00000008
+#define    PAS_DMA_RXINT_RCMDSTA_MDR    0x00000010
+#define    PAS_DMA_RXINT_RCMDSTA_MOO    0x00000020
+#define    PAS_DMA_RXINT_RCMDSTA_MBP    0x00000040
 #define    PAS_DMA_RXINT_RCMDSTA_BT     0x00000800
-#define    PAS_DMA_RXINT_RCMDSTA_TB     0x00001000
+#define    PAS_DMA_RXINT_RCMDSTA_DR     0x00001000
+#define    PAS_DMA_RXINT_RCMDSTA_OO     0x00002000
+#define    PAS_DMA_RXINT_RCMDSTA_BP     0x00004000
+#define    PAS_DMA_RXINT_RCMDSTA_TB     0x00008000
 #define    PAS_DMA_RXINT_RCMDSTA_ACT    0x00010000
 #define    PAS_DMA_RXINT_RCMDSTA_DROPS_M        0xfffe0000
 #define    PAS_DMA_RXINT_RCMDSTA_DROPS_S        17
@@ -297,6 +311,7 @@ enum {
 #define    PAS_STATUS_DCNT_S            16
 #define    PAS_STATUS_BPCNT_M           0x0000ffff00000000ull
 #define    PAS_STATUS_BPCNT_S           32
+#define    PAS_STATUS_CAUSE_M           0xf000000000000000ull
 #define    PAS_STATUS_TIMER             0x1000000000000000ull
 #define    PAS_STATUS_ERROR             0x2000000000000000ull
 #define    PAS_STATUS_SOFT              0x4000000000000000ull
@@ -326,7 +341,7 @@ enum {
                                                  PAS_IOB_DMA_TXCH_STAT_CNTDEL_M)
 #define PAS_IOB_DMA_RXCH_RESET(i)       (0x1500 + (i)*4)
 #define    PAS_IOB_DMA_RXCH_RESET_PCNT_M        0xffff0000
-#define    PAS_IOB_DMA_RXCH_RESET_PCNT_S        0
+#define    PAS_IOB_DMA_RXCH_RESET_PCNT_S        16
 #define    PAS_IOB_DMA_RXCH_RESET_PCNT(x)       (((x) << PAS_IOB_DMA_RXCH_RESET_PCNT_S) & \
                                                  PAS_IOB_DMA_RXCH_RESET_PCNT_M)
 #define    PAS_IOB_DMA_RXCH_RESET_PCNTRST       0x00000020
@@ -337,7 +352,7 @@ enum {
 #define    PAS_IOB_DMA_RXCH_RESET_PINTC         0x00000001
 #define PAS_IOB_DMA_TXCH_RESET(i)       (0x1600 + (i)*4)
 #define    PAS_IOB_DMA_TXCH_RESET_PCNT_M        0xffff0000
-#define    PAS_IOB_DMA_TXCH_RESET_PCNT_S        0
+#define    PAS_IOB_DMA_TXCH_RESET_PCNT_S        16
 #define    PAS_IOB_DMA_TXCH_RESET_PCNT(x)       (((x) << PAS_IOB_DMA_TXCH_RESET_PCNT_S) & \
                                                  PAS_IOB_DMA_TXCH_RESET_PCNT_M)
 #define    PAS_IOB_DMA_TXCH_RESET_PCNTRST       0x00000020
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 74f862001247..5d658bc9791c 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -2,11 +2,9 @@
 # PCMCIA Network device configuration
 #
 
-menu "PCMCIA network device support"
-        depends on NETDEVICES && PCMCIA!=n
-
-config NET_PCMCIA
+menuconfig NET_PCMCIA
         bool "PCMCIA network device support"
+        depends on PCMCIA
         ---help---
           Say Y if you would like to include support for any PCMCIA or CardBus
           network adapters, then say Y to the driver for your particular card
@@ -21,9 +19,10 @@ config NET_PCMCIA
 
           If unsure, say N.
 
+if NET_PCMCIA
+
 config PCMCIA_3C589
         tristate "3Com 3c589 PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         help
           Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
           (PC-card) Ethernet card to your computer.
@@ -33,7 +32,6 @@ config PCMCIA_3C589
 
 config PCMCIA_3C574
         tristate "3Com 3c574 PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         help
           Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
           (PC-card) Fast Ethernet card to your computer.
@@ -43,7 +41,6 @@ config PCMCIA_3C574
 
 config PCMCIA_FMVJ18X
         tristate "Fujitsu FMV-J18x PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         select CRC32
         help
           Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible
@@ -54,7 +51,6 @@ config PCMCIA_FMVJ18X
 
 config PCMCIA_PCNET
         tristate "NE2000 compatible PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         select CRC32
         help
           Say Y here if you intend to attach an NE2000 compatible PCMCIA
@@ -65,7 +61,6 @@ config PCMCIA_PCNET
 
 config PCMCIA_NMCLAN
         tristate "New Media PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         help
           Say Y here if you intend to attach a New Media Ethernet or LiveWire
           PCMCIA (PC-card) Ethernet card to your computer.
@@ -75,7 +70,6 @@ config PCMCIA_NMCLAN
 
 config PCMCIA_SMC91C92
         tristate "SMC 91Cxx PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         select CRC32
         select MII
         help
@@ -87,7 +81,6 @@ config PCMCIA_SMC91C92
 
 config PCMCIA_XIRC2PS
         tristate "Xircom 16-bit PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         help
           Say Y here if you intend to attach a Xircom 16-bit PCMCIA (PC-card)
           Ethernet or Fast Ethernet card to your computer.
@@ -97,7 +90,6 @@ config PCMCIA_XIRC2PS
 
 config PCMCIA_AXNET
         tristate "Asix AX88190 PCMCIA support"
-        depends on NET_PCMCIA && PCMCIA
         ---help---
           Say Y here if you intend to attach an Asix AX88190-based PCMCIA
           (PC-card) Fast Ethernet card to your computer.  These cards are
@@ -109,7 +101,7 @@ config PCMCIA_AXNET
 
 config ARCNET_COM20020_CS
         tristate "COM20020 ARCnet PCMCIA support"
-        depends on NET_PCMCIA && ARCNET_COM20020 && PCMCIA
+        depends on ARCNET_COM20020
         help
           Say Y here if you intend to attach this type of ARCnet PCMCIA card
           to your computer.
@@ -119,7 +111,7 @@ config ARCNET_COM20020_CS
 
 config PCMCIA_IBMTR
         tristate "IBM PCMCIA tokenring adapter support"
-        depends on NET_PCMCIA && IBMTR!=y && TR && PCMCIA && !64BIT
+        depends on IBMTR!=y && TR && !64BIT
         help
           Say Y here if you intend to attach this type of Token Ring PCMCIA
           card to your computer. You then also need to say Y to "Token Ring
@@ -128,5 +120,4 @@ config PCMCIA_IBMTR
           To compile this driver as a module, choose M here: the module will be
           called ibmtr_cs.
 
-endmenu
-
+endif # NET_PCMCIA
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 1060154ae750..4ecb8ca5a992 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -189,16 +189,20 @@ static void ibmtr_detach(struct pcmcia_device *link)
 {
     struct ibmtr_dev_t *info = link->priv;
     struct net_device *dev = info->dev;
+     struct tok_info *ti = netdev_priv(dev);
 
     DEBUG(0, "ibmtr_detach(0x%p)\n", link);
+    
+    /* 
+     * When the card removal interrupt hits tok_interrupt(), 
+     * bail out early, so we don't crash the machine 
+     */
+    ti->sram_phys |= 1;
 
     if (link->dev_node)
         unregister_netdev(dev);
-
-    {
-        struct tok_info *ti = netdev_priv(dev);
-        del_timer_sync(&(ti->tr_timer));
-    }
+    
+    del_timer_sync(&(ti->tr_timer));
 
     ibmtr_release(link);
 
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 809ec440b8eb..258d6f396186 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1420,7 +1420,7 @@ set_addresses(struct net_device *dev)
     kio_addr_t ioaddr = dev->base_addr;
     local_info_t *lp = netdev_priv(dev);
     struct dev_mc_list *dmi = dev->mc_list;
-    char *addr;
+    unsigned char *addr;
     int i,j,k,n;
 
     SelectPage(k=0x50);
@@ -1429,6 +1429,9 @@ set_addresses(struct net_device *dev)
             if (++n > 9)
                 break;
             i = 0;
+            if (n > 1 && n <= dev->mc_count && dmi) {
+                 dmi = dmi->next;
+            }
         }
         if (j > 15) {
             j = 8;
@@ -1436,10 +1439,9 @@ set_addresses(struct net_device *dev)
             SelectPage(k);
         }
 
-        if (n && n <= dev->mc_count && dmi) {
+        if (n && n <= dev->mc_count && dmi)
             addr = dmi->dmi_addr;
-            dmi = dmi->next;
-        } else
+        else
             addr = dev->dev_addr;
 
         if (lp->mohawk)
@@ -1465,10 +1467,10 @@ set_multicast_list(struct net_device *dev)
     if (dev->flags & IFF_PROMISC) { /* snoop */
         PutByte(XIRCREG42_SWC1, 0x06); /* set MPE and PME */
     } else if (dev->mc_count > 9 || (dev->flags & IFF_ALLMULTI)) {
-        PutByte(XIRCREG42_SWC1, 0x06); /* set MPE */
+        PutByte(XIRCREG42_SWC1, 0x02); /* set MPE */
     } else if (dev->mc_count) {
         /* the chip can filter 9 addresses perfectly */
-        PutByte(XIRCREG42_SWC1, 0x00);
+        PutByte(XIRCREG42_SWC1, 0x01);
         SelectPage(0x40);
         PutByte(XIRCREG40_CMD0, Offline);
         set_addresses(dev);
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index f994f129f3d8..09b6f259eb92 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -2,69 +2,61 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
         tristate "PHY Device support and infrastructure"
+        depends on !S390
         depends on NET_ETHERNET && (BROKEN || !S390)
         help
           Ethernet controllers are usually attached to PHY
           devices.  This option provides infrastructure for
           managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-        depends on PHYLIB
 
 config MARVELL_PHY
         tristate "Drivers for Marvell PHYs"
-        depends on PHYLIB
         ---help---
           Currently has a driver for the 88E1011S
         
 config DAVICOM_PHY
         tristate "Drivers for Davicom PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
         tristate "Drivers for Quality Semiconductor PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the qs6612
 
 config LXT_PHY
         tristate "Drivers for the Intel LXT PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the lxt970, lxt971
 
 config CICADA_PHY
         tristate "Drivers for the Cicada PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the cis8204
+
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
         tristate "Drivers for SMSC PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the LAN83C185 PHY
 
 config BROADCOM_PHY
         tristate "Drivers for Broadcom PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
 
 config FIXED_PHY
         tristate "Drivers for PHY emulation on fixed speed/link"
-        depends on PHYLIB
         ---help---
           Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
           but with the ability to manipulate the speed/link in software. The relevant MII
@@ -79,5 +71,4 @@ config FIXED_MII_100_FDX
         bool "Emulation for 100M Fdx fixed PHY behavior"
         depends on FIXED_PHY
 
-endmenu
-
+endif # PHYLIB
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 519baa38be8d..7ed632db00d7 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -139,7 +139,7 @@ static int dm9161_ack_interrupt(struct phy_device *phydev)
         return (err < 0) ? err : 0;
 }
 
-static struct phy_driver dm9161_driver = {
+static struct phy_driver dm9161e_driver = {
         .phy_id         = 0x0181b880,
         .name           = "Davicom DM9161E",
         .phy_id_mask    = 0x0ffffff0,
@@ -147,7 +147,18 @@ static struct phy_driver dm9161_driver = {
         .config_init    = dm9161_config_init,
         .config_aneg    = dm9161_config_aneg,
         .read_status    = genphy_read_status,
-        .driver         = { .owner = THIS_MODULE,},
+        .driver         = { .owner = THIS_MODULE,},
+};
+
+static struct phy_driver dm9161a_driver = {
+        .phy_id         = 0x0181b8a0,
+        .name           = "Davicom DM9161A",
+        .phy_id_mask    = 0x0ffffff0,
+        .features       = PHY_BASIC_FEATURES,
+        .config_init    = dm9161_config_init,
+        .config_aneg    = dm9161_config_aneg,
+        .read_status    = genphy_read_status,
+        .driver         = { .owner = THIS_MODULE,},
 };
 
 static struct phy_driver dm9131_driver = {
@@ -160,31 +171,38 @@ static struct phy_driver dm9131_driver = {
         .read_status    = genphy_read_status,
         .ack_interrupt  = dm9161_ack_interrupt,
         .config_intr    = dm9161_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
+        .driver         = { .owner = THIS_MODULE,},
 };
 
 static int __init davicom_init(void)
 {
         int ret;
 
-        ret = phy_driver_register(&dm9161_driver);
+        ret = phy_driver_register(&dm9161e_driver);
         if (ret)
                 goto err1;
 
-        ret = phy_driver_register(&dm9131_driver);
+        ret = phy_driver_register(&dm9161a_driver);
         if (ret)
                 goto err2;
+
+        ret = phy_driver_register(&dm9131_driver);
+        if (ret)
+                goto err3;
         return 0;
 
- err2:  
-        phy_driver_unregister(&dm9161_driver);
+ err3:
+        phy_driver_unregister(&dm9161a_driver);
+ err2:
+        phy_driver_unregister(&dm9161e_driver);
  err1:
         return ret;
 }
 
 static void __exit davicom_exit(void)
 {
-        phy_driver_unregister(&dm9161_driver);
+        phy_driver_unregister(&dm9161e_driver);
+        phy_driver_unregister(&dm9161a_driver);
         phy_driver_unregister(&dm9131_driver);
 }
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index eed433d6056a..f71dab347667 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -662,10 +662,10 @@ int phy_stop_interrupts(struct phy_device *phydev)
                 phy_error(phydev);
 
         /*
-         * Finish any pending work; we might have been scheduled
-         * to be called from keventd ourselves, though.
+         * Finish any pending work; we might have been scheduled to be called
+         * from keventd ourselves, but cancel_work_sync() handles that.
          */
-        run_scheduled_work(&phydev->phy_queue);
+        cancel_work_sync(&phydev->phy_queue);
 
         free_irq(phydev->irq, phydev);
 
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 6d596ca50cfd..541168713f1f 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -40,7 +40,6 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/rwsem.h>
 #include <linux/stddef.h>
 #include <linux/device.h>
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 290e1c1f30c6..e3e6d410d72c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -84,7 +84,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
 
-#define DRV_VERSION "2.0.22.1"
+#define DRV_VERSION "2.0.23.1"
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -281,6 +281,28 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
         ("lro_out_of_sequence_pkts"),
         ("lro_flush_due_to_max_pkts"),
         ("lro_avg_aggr_pkts"),
+        ("mem_alloc_fail_cnt"),
+        ("watchdog_timer_cnt"),
+        ("mem_allocated"),
+        ("mem_freed"),
+        ("link_up_cnt"),
+        ("link_down_cnt"),
+        ("link_up_time"),
+        ("link_down_time"),
+        ("tx_tcode_buf_abort_cnt"),
+        ("tx_tcode_desc_abort_cnt"),
+        ("tx_tcode_parity_err_cnt"),
+        ("tx_tcode_link_loss_cnt"),
+        ("tx_tcode_list_proc_err_cnt"),
+        ("rx_tcode_parity_err_cnt"),
+        ("rx_tcode_abort_cnt"),
+        ("rx_tcode_parity_abort_cnt"),
+        ("rx_tcode_rda_fail_cnt"),
+        ("rx_tcode_unkn_prot_cnt"),
+        ("rx_tcode_fcs_err_cnt"),
+        ("rx_tcode_buf_size_err_cnt"),
+        ("rx_tcode_rxd_corrupt_cnt"),
+        ("rx_tcode_unkn_err_cnt")
 };
 
 #define S2IO_XENA_STAT_LEN sizeof(ethtool_xena_stats_keys)/ ETH_GSTRING_LEN
@@ -490,6 +512,7 @@ static int init_shared_mem(struct s2io_nic *nic)
 
         struct mac_info *mac_control;
         struct config_param *config;
+        unsigned long long mem_allocated = 0;
 
         mac_control = &nic->mac_control;
         config = &nic->config;
@@ -519,6 +542,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                                   "Malloc failed for list_info\n");
                         return -ENOMEM;
                 }
+                mem_allocated += list_holder_size;
                 memset(mac_control->fifos[i].list_info, 0, list_holder_size);
         }
         for (i = 0; i < config->tx_fifo_num; i++) {
@@ -565,6 +589,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                                         DBG_PRINT(INFO_DBG, "failed for TxDL\n");
                                         return -ENOMEM;
                                 }
+                                mem_allocated += PAGE_SIZE;
                         }
                         while (k < lst_per_page) {
                                 int l = (j * lst_per_page) + k;
@@ -582,6 +607,7 @@ static int init_shared_mem(struct s2io_nic *nic)
         nic->ufo_in_band_v = kcalloc(size, sizeof(u64), GFP_KERNEL);
         if (!nic->ufo_in_band_v)
                 return -ENOMEM;
+         mem_allocated += (size * sizeof(u64));
 
         /* Allocation and initialization of RXDs in Rings */
         size = 0;
@@ -639,6 +665,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                                 rx_blocks->block_virt_addr = tmp_v_addr;
                                 return -ENOMEM;
                         }
+                        mem_allocated += size;
                         memset(tmp_v_addr, 0, size);
                         rx_blocks->block_virt_addr = tmp_v_addr;
                         rx_blocks->block_dma_addr = tmp_p_addr;
@@ -647,6 +674,8 @@ static int init_shared_mem(struct s2io_nic *nic)
                                                   GFP_KERNEL);
                         if (!rx_blocks->rxds)
                                 return -ENOMEM;
+                        mem_allocated += 
+                        (sizeof(struct rxd_info)* rxd_count[nic->rxd_mode]);
                         for (l=0; l<rxd_count[nic->rxd_mode];l++) {
                                 rx_blocks->rxds[l].virt_addr =
                                         rx_blocks->block_virt_addr +
@@ -689,6 +718,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                                      GFP_KERNEL);
                         if (!mac_control->rings[i].ba)
                                 return -ENOMEM;
+                        mem_allocated +=(sizeof(struct buffAdd *) * blk_cnt);
                         for (j = 0; j < blk_cnt; j++) {
                                 int k = 0;
                                 mac_control->rings[i].ba[j] =
@@ -697,6 +727,8 @@ static int init_shared_mem(struct s2io_nic *nic)
                                                 GFP_KERNEL);
                                 if (!mac_control->rings[i].ba[j])
                                         return -ENOMEM;
+                                mem_allocated += (sizeof(struct buffAdd) *  \
+                                        (rxd_count[nic->rxd_mode] + 1));
                                 while (k != rxd_count[nic->rxd_mode]) {
                                         ba = &mac_control->rings[i].ba[j][k];
 
@@ -704,6 +736,8 @@ static int init_shared_mem(struct s2io_nic *nic)
                                             (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
                                         if (!ba->ba_0_org)
                                                 return -ENOMEM;
+                                        mem_allocated += 
+                                                (BUF0_LEN + ALIGN_SIZE);
                                         tmp = (unsigned long)ba->ba_0_org;
                                         tmp += ALIGN_SIZE;
                                         tmp &= ~((unsigned long) ALIGN_SIZE);
@@ -713,6 +747,8 @@ static int init_shared_mem(struct s2io_nic *nic)
                                             (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
                                         if (!ba->ba_1_org)
                                                 return -ENOMEM;
+                                        mem_allocated 
+                                                += (BUF1_LEN + ALIGN_SIZE);
                                         tmp = (unsigned long) ba->ba_1_org;
                                         tmp += ALIGN_SIZE;
                                         tmp &= ~((unsigned long) ALIGN_SIZE);
@@ -736,6 +772,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                  */
                 return -ENOMEM;
         }
+        mem_allocated += size;
         mac_control->stats_mem_sz = size;
 
         tmp_v_addr = mac_control->stats_mem;
@@ -743,7 +780,7 @@ static int init_shared_mem(struct s2io_nic *nic)
         memset(tmp_v_addr, 0, size);
         DBG_PRINT(INIT_DBG, "%s:Ring Mem PHY: 0x%llx\n", dev->name,
                   (unsigned long long) tmp_p_addr);
-
+        mac_control->stats_info->sw_stat.mem_allocated += mem_allocated;
         return SUCCESS;
 }
 
@@ -757,12 +794,14 @@ static int init_shared_mem(struct s2io_nic *nic)
 static void free_shared_mem(struct s2io_nic *nic)
 {
         int i, j, blk_cnt, size;
+        u32 ufo_size = 0;
         void *tmp_v_addr;
         dma_addr_t tmp_p_addr;
         struct mac_info *mac_control;
         struct config_param *config;
         int lst_size, lst_per_page;
         struct net_device *dev = nic->dev;
+        int page_num = 0;
 
         if (!nic)
                 return;
@@ -774,8 +813,9 @@ static void free_shared_mem(struct s2io_nic *nic)
         lst_per_page = PAGE_SIZE / lst_size;
 
         for (i = 0; i < config->tx_fifo_num; i++) {
-                int page_num = TXD_MEM_PAGE_CNT(config->tx_cfg[i].fifo_len,
-                                                lst_per_page);
+                ufo_size += config->tx_cfg[i].fifo_len;
+                page_num = TXD_MEM_PAGE_CNT(config->tx_cfg[i].fifo_len,
+                                                        lst_per_page);
                 for (j = 0; j < page_num; j++) {
                         int mem_blks = (j * lst_per_page);
                         if (!mac_control->fifos[i].list_info)
@@ -790,6 +830,8 @@ static void free_shared_mem(struct s2io_nic *nic)
                                             mac_control->fifos[i].
                                             list_info[mem_blks].
                                             list_phy_addr);
+                        nic->mac_control.stats_info->sw_stat.mem_freed 
+                                                += PAGE_SIZE;
                 }
                 /* If we got a zero DMA address during allocation,
                  * free the page now
@@ -803,8 +845,12 @@ static void free_shared_mem(struct s2io_nic *nic)
                                 dev->name);
                         DBG_PRINT(INIT_DBG, "Virtual address %p\n",
                                 mac_control->zerodma_virt_addr);
+                        nic->mac_control.stats_info->sw_stat.mem_freed 
+                                                += PAGE_SIZE;
                 }
                 kfree(mac_control->fifos[i].list_info);
+                nic->mac_control.stats_info->sw_stat.mem_freed += 
+                (nic->config.tx_cfg[i].fifo_len *sizeof(struct list_info_hold));
         }
 
         size = SIZE_OF_BLOCK;
@@ -819,7 +865,10 @@ static void free_shared_mem(struct s2io_nic *nic)
                                 break;
                         pci_free_consistent(nic->pdev, size,
                                             tmp_v_addr, tmp_p_addr);
+                        nic->mac_control.stats_info->sw_stat.mem_freed += size;
                         kfree(mac_control->rings[i].rx_blocks[j].rxds);
+                        nic->mac_control.stats_info->sw_stat.mem_freed += 
+                        ( sizeof(struct rxd_info)* rxd_count[nic->rxd_mode]);
                 }
         }
 
@@ -836,12 +885,20 @@ static void free_shared_mem(struct s2io_nic *nic)
                                         struct buffAdd *ba =
                                                 &mac_control->rings[i].ba[j][k];
                                         kfree(ba->ba_0_org);
+                                        nic->mac_control.stats_info->sw_stat.\
+                                        mem_freed += (BUF0_LEN + ALIGN_SIZE);
                                         kfree(ba->ba_1_org);
+                                        nic->mac_control.stats_info->sw_stat.\
+                                        mem_freed += (BUF1_LEN + ALIGN_SIZE);
                                         k++;
                                 }
                                 kfree(mac_control->rings[i].ba[j]);
+                                nic->mac_control.stats_info->sw_stat.mem_freed                          += (sizeof(struct buffAdd) * 
+                                (rxd_count[nic->rxd_mode] + 1));
                         }
                         kfree(mac_control->rings[i].ba);
+                        nic->mac_control.stats_info->sw_stat.mem_freed += 
+                        (sizeof(struct buffAdd *) * blk_cnt);
                 }
         }
 
@@ -850,9 +907,14 @@ static void free_shared_mem(struct s2io_nic *nic)
                                     mac_control->stats_mem_sz,
                                     mac_control->stats_mem,
                                     mac_control->stats_mem_phy);
+                nic->mac_control.stats_info->sw_stat.mem_freed += 
+                        mac_control->stats_mem_sz;
         }
-        if (nic->ufo_in_band_v)
+        if (nic->ufo_in_band_v) {
                 kfree(nic->ufo_in_band_v);
+                nic->mac_control.stats_info->sw_stat.mem_freed 
+                        += (ufo_size * sizeof(u64));
+        }
 }
 
 /**
@@ -2122,10 +2184,12 @@ static void free_tx_buffers(struct s2io_nic *nic)
 
         for (i = 0; i < config->tx_fifo_num; i++) {
                 for (j = 0; j < config->tx_cfg[i].fifo_len - 1; j++) {
-                        txdp = (struct TxD *) mac_control->fifos[i].list_info[j].
-                            list_virt_addr;
+                        txdp = (struct TxD *) \
+                        mac_control->fifos[i].list_info[j].list_virt_addr;
                         skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j);
                         if (skb) {
+                                nic->mac_control.stats_info->sw_stat.mem_freed 
+                                        += skb->truesize;
                                 dev_kfree_skb(skb);
                                 cnt++;
                         }
@@ -2186,11 +2250,14 @@ static int fill_rxd_3buf(struct s2io_nic *nic, struct RxD_t *rxdp, struct \
         /* skb_shinfo(skb)->frag_list will have L4 data payload */
         skb_shinfo(skb)->frag_list = dev_alloc_skb(dev->mtu + ALIGN_SIZE);
         if (skb_shinfo(skb)->frag_list == NULL) {
+                nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
                 DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n ", dev->name);
                 return -ENOMEM ;
         }
         frag_list = skb_shinfo(skb)->frag_list;
         skb->truesize += frag_list->truesize;
+        nic->mac_control.stats_info->sw_stat.mem_allocated 
+                += frag_list->truesize;
         frag_list->next = NULL;
         tmp = (void *)ALIGN((long)frag_list->data, ALIGN_SIZE + 1);
         frag_list->data = tmp;
@@ -2319,8 +2386,12 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                                 wmb();
                                 first_rxdp->Control_1 |= RXD_OWN_XENA;
                         }
+                        nic->mac_control.stats_info->sw_stat. \
+                                mem_alloc_fail_cnt++;
                         return -ENOMEM ;
                 }
+                nic->mac_control.stats_info->sw_stat.mem_allocated 
+                        += skb->truesize;
                 if (nic->rxd_mode == RXD_MODE_1) {
                         /* 1 buffer mode - normal operation mode */
                         memset(rxdp, 0, sizeof(struct RxD1));
@@ -2328,7 +2399,8 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                         ((struct RxD1*)rxdp)->Buffer0_ptr = pci_map_single
                             (nic->pdev, skb->data, size - NET_IP_ALIGN,
                                 PCI_DMA_FROMDEVICE);
-                        rxdp->Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN);
+                        rxdp->Control_2 = 
+                                SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN);
 
                 } else if (nic->rxd_mode >= RXD_MODE_3A) {
                         /*
@@ -2342,7 +2414,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                          * payload
                          */
 
-                        /* save the buffer pointers to avoid frequent dma mapping */
+                        /* save buffer pointers to avoid frequent dma mapping */
                         Buffer0_ptr = ((struct RxD3*)rxdp)->Buffer0_ptr;
                         Buffer1_ptr = ((struct RxD3*)rxdp)->Buffer1_ptr;
                         memset(rxdp, 0, sizeof(struct RxD3));
@@ -2364,7 +2436,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                                            PCI_DMA_FROMDEVICE);
                         else
                                 pci_dma_sync_single_for_device(nic->pdev,
-                                    (dma_addr_t) ((struct RxD3*)rxdp)->Buffer0_ptr,
+                                (dma_addr_t) ((struct RxD3*)rxdp)->Buffer0_ptr,
                                     BUF0_LEN, PCI_DMA_FROMDEVICE);
                         rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
                         if (nic->rxd_mode == RXD_MODE_3B) {
@@ -2391,6 +2463,8 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                         } else {
                                 /* 3 buffer mode */
                                 if (fill_rxd_3buf(nic, rxdp, skb) == -ENOMEM) {
+                                        nic->mac_control.stats_info->sw_stat.\
+                                        mem_freed += skb->truesize;
                                         dev_kfree_skb_irq(skb);
                                         if (first_rxdp) {
                                                 wmb();
@@ -2491,6 +2565,7 @@ static void free_rxd_blk(struct s2io_nic *sp, int ring_no, int blk)
                                 PCI_DMA_FROMDEVICE);
                         memset(rxdp, 0, sizeof(struct RxD3));
                 }
+                sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
                 dev_kfree_skb(skb);
                 atomic_dec(&sp->rx_bufs_left[ring_no]);
         }
@@ -2820,13 +2895,35 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
                                 nic->mac_control.stats_info->sw_stat.
                                                 parity_err_cnt++;
                         }
-                        if ((err >> 48) == 0xA) {
-                                DBG_PRINT(TX_DBG, "TxD returned due \
-                                                to loss of link\n");
-                        }
-                        else {
-                                DBG_PRINT(ERR_DBG, "***TxD error %llx\n", err);
-                        }
+
+                        /* update t_code statistics */
+                        err >>= 48;
+                        switch(err) {
+                                case 2:
+                                        nic->mac_control.stats_info->sw_stat.
+                                                        tx_buf_abort_cnt++;
+                                break;
+
+                                case 3:
+                                        nic->mac_control.stats_info->sw_stat.
+                                                        tx_desc_abort_cnt++;
+                                break;
+
+                                case 7:
+                                        nic->mac_control.stats_info->sw_stat.
+                                                        tx_parity_err_cnt++;
+                                break;
+
+                                case 10:
+                                        nic->mac_control.stats_info->sw_stat.
+                                                        tx_link_loss_cnt++;
+                                break;
+
+                                case 15:
+                                        nic->mac_control.stats_info->sw_stat.
+                                                        tx_list_proc_err_cnt++;
+                                break;
+                        }
                 }
 
                 skb = s2io_txdl_getskb(fifo_data, txdlp, get_info.offset);
@@ -2839,6 +2936,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
 
                 /* Updating the statistics block */
                 nic->stats.tx_bytes += skb->len;
+                nic->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
                 dev_kfree_skb_irq(skb);
 
                 get_info.offset++;
@@ -3314,7 +3412,9 @@ static void s2io_reset(struct s2io_nic * sp)
         u16 subid, pci_cmd;
         int i;
         u16 val16;
-        unsigned long long reset_cnt = 0;
+        unsigned long long up_cnt, down_cnt, up_time, down_time, reset_cnt;
+        unsigned long long mem_alloc_cnt, mem_free_cnt, watchdog_cnt;
+
         DBG_PRINT(INIT_DBG,"%s - Resetting XFrame card %s\n",
                         __FUNCTION__, sp->dev->name);
 
@@ -3380,11 +3480,26 @@ new_way:
 
         /* Reset device statistics maintained by OS */
         memset(&sp->stats, 0, sizeof (struct net_device_stats));
-        /* save reset count */
+        
+        up_cnt = sp->mac_control.stats_info->sw_stat.link_up_cnt;
+        down_cnt = sp->mac_control.stats_info->sw_stat.link_down_cnt;
+        up_time = sp->mac_control.stats_info->sw_stat.link_up_time;
+        down_time = sp->mac_control.stats_info->sw_stat.link_down_time;
         reset_cnt = sp->mac_control.stats_info->sw_stat.soft_reset_cnt;
+        mem_alloc_cnt = sp->mac_control.stats_info->sw_stat.mem_allocated;
+        mem_free_cnt = sp->mac_control.stats_info->sw_stat.mem_freed;
+        watchdog_cnt = sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt;
+        /* save link up/down time/cnt, reset/memory/watchdog cnt */
         memset(sp->mac_control.stats_info, 0, sizeof(struct stat_block));
-        /* restore reset count */
+        /* restore link up/down time/cnt, reset/memory/watchdog cnt */
+        sp->mac_control.stats_info->sw_stat.link_up_cnt = up_cnt;
+        sp->mac_control.stats_info->sw_stat.link_down_cnt = down_cnt;
+        sp->mac_control.stats_info->sw_stat.link_up_time = up_time;
+        sp->mac_control.stats_info->sw_stat.link_down_time = down_time;
         sp->mac_control.stats_info->sw_stat.soft_reset_cnt = reset_cnt;
+        sp->mac_control.stats_info->sw_stat.mem_allocated = mem_alloc_cnt;
+        sp->mac_control.stats_info->sw_stat.mem_freed = mem_free_cnt;
+        sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt = watchdog_cnt;
 
         /* SXE-002: Configure link and activity LED to turn it off */
         subid = sp->pdev->subsystem_device;
@@ -3672,19 +3787,29 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
         nic->entries = kmalloc(MAX_REQUESTED_MSI_X * sizeof(struct msix_entry),
                                GFP_KERNEL);
         if (nic->entries == NULL) {
-                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", __FUNCTION__);
+                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", \
+                        __FUNCTION__);
+                nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
                 return -ENOMEM;
         }
-        memset(nic->entries, 0, MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
+        nic->mac_control.stats_info->sw_stat.mem_allocated 
+                += (MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
+        memset(nic->entries, 0,MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
 
         nic->s2io_entries =
                 kmalloc(MAX_REQUESTED_MSI_X * sizeof(struct s2io_msix_entry),
                                    GFP_KERNEL);
         if (nic->s2io_entries == NULL) {
-                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", __FUNCTION__);
+                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", 
+                        __FUNCTION__);
+                nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
                 kfree(nic->entries);
+                nic->mac_control.stats_info->sw_stat.mem_freed 
+                        += (MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
                 return -ENOMEM;
         }
+         nic->mac_control.stats_info->sw_stat.mem_allocated 
+                += (MAX_REQUESTED_MSI_X * sizeof(struct s2io_msix_entry));
         memset(nic->s2io_entries, 0,
                MAX_REQUESTED_MSI_X * sizeof(struct s2io_msix_entry));
 
@@ -3708,7 +3833,8 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
                 rx_mat = readq(&bar0->rx_mat);
                 for (j=0; j<nic->config.rx_ring_num; j++, msix_indx++) {
                         rx_mat |= RX_MAT_SET(j, msix_indx);
-                        nic->s2io_entries[msix_indx].arg = &nic->mac_control.rings[j];
+                        nic->s2io_entries[msix_indx].arg 
+                                = &nic->mac_control.rings[j];
                         nic->s2io_entries[msix_indx].type = MSIX_RING_TYPE;
                         nic->s2io_entries[msix_indx].in_use = MSIX_FLG;
                 }
@@ -3717,7 +3843,8 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
                 tx_mat = readq(&bar0->tx_mat0_n[7]);
                 for (j=0; j<nic->config.rx_ring_num; j++, msix_indx++) {
                         tx_mat |= TX_MAT_SET(i, msix_indx);
-                        nic->s2io_entries[msix_indx].arg = &nic->mac_control.rings[j];
+                        nic->s2io_entries[msix_indx].arg 
+                                = &nic->mac_control.rings[j];
                         nic->s2io_entries[msix_indx].type = MSIX_RING_TYPE;
                         nic->s2io_entries[msix_indx].in_use = MSIX_FLG;
                 }
@@ -3734,7 +3861,11 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
         if (ret) {
                 DBG_PRINT(ERR_DBG, "%s: Enabling MSIX failed\n", nic->dev->name);
                 kfree(nic->entries);
+                nic->mac_control.stats_info->sw_stat.mem_freed 
+                        += (MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
                 kfree(nic->s2io_entries);
+                nic->mac_control.stats_info->sw_stat.mem_freed 
+                += (MAX_REQUESTED_MSI_X * sizeof(struct s2io_msix_entry));
                 nic->entries = NULL;
                 nic->s2io_entries = NULL;
                 nic->avail_msix_vectors = 0;
@@ -3802,10 +3933,16 @@ static int s2io_open(struct net_device *dev)
 
 hw_init_failed:
         if (sp->intr_type == MSI_X) {
-                if (sp->entries)
+                if (sp->entries) {
                         kfree(sp->entries);
-                if (sp->s2io_entries)
+                        sp->mac_control.stats_info->sw_stat.mem_freed 
+                        += (MAX_REQUESTED_MSI_X * sizeof(struct msix_entry));
+                }
+                if (sp->s2io_entries) {
                         kfree(sp->s2io_entries);
+                        sp->mac_control.stats_info->sw_stat.mem_freed 
+                        += (MAX_REQUESTED_MSI_X * sizeof(struct s2io_msix_entry));
+                }
         }
         return err;
 }
@@ -3866,6 +4003,13 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         config = &sp->config;
 
         DBG_PRINT(TX_DBG, "%s: In Neterion Tx routine\n", dev->name);
+
+        if (unlikely(skb->len <= 0)) {
+                DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name);
+                dev_kfree_skb_any(skb);
+                return 0;
+}
+
         spin_lock_irqsave(&sp->tx_lock, flags);
         if (atomic_read(&sp->card_state) == CARD_DOWN) {
                 DBG_PRINT(TX_DBG, "%s: Card going down for reset\n",
@@ -3876,7 +4020,6 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         queue = 0;
-
         /* Get Fifo number to Transmit based on vlan priority */
         if (sp->vlgrp && vlan_tx_tag_present(skb)) {
                 vlan_tag = vlan_tx_tag_get(skb);
@@ -3900,14 +4043,6 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 return 0;
         }
 
-        /* A buffer with no data will be dropped */
-        if (!skb->len) {
-                DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name);
-                dev_kfree_skb(skb);
-                spin_unlock_irqrestore(&sp->tx_lock, flags);
-                return 0;
-        }
-
         offload_type = s2io_offload_type(skb);
         if (offload_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
                 txdp->Control_1 |= TXD_TCP_LSO_EN;
@@ -4003,7 +4138,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                           put_off, get_off);
                 netif_stop_queue(dev);
         }
-
+        mac_control->stats_info->sw_stat.mem_allocated += skb->truesize;
         dev->trans_start = jiffies;
         spin_unlock_irqrestore(&sp->tx_lock, flags);
 
@@ -4775,6 +4910,40 @@ static int s2io_ethtool_idnic(struct net_device *dev, u32 data)
         return 0;
 }
 
+static void s2io_ethtool_gringparam(struct net_device *dev,
+                                    struct ethtool_ringparam *ering)
+{
+        struct s2io_nic *sp = dev->priv;
+        int i,tx_desc_count=0,rx_desc_count=0;
+
+        if (sp->rxd_mode == RXD_MODE_1)
+                ering->rx_max_pending = MAX_RX_DESC_1;
+        else if (sp->rxd_mode == RXD_MODE_3B)
+                ering->rx_max_pending = MAX_RX_DESC_2;
+        else if (sp->rxd_mode == RXD_MODE_3A)
+                ering->rx_max_pending = MAX_RX_DESC_3;
+
+        ering->tx_max_pending = MAX_TX_DESC;
+        for (i = 0 ; i < sp->config.tx_fifo_num ; i++) {
+                tx_desc_count += sp->config.tx_cfg[i].fifo_len;
+        }
+        DBG_PRINT(INFO_DBG,"\nmax txds : %d\n",sp->config.max_txds);
+        ering->tx_pending = tx_desc_count;
+        rx_desc_count = 0;
+        for (i = 0 ; i < sp->config.rx_ring_num ; i++) {
+                rx_desc_count += sp->config.rx_cfg[i].num_rxd;
+        }
+        ering->rx_pending = rx_desc_count;
+
+        ering->rx_mini_max_pending = 0;
+        ering->rx_mini_pending = 0;
+        if(sp->rxd_mode == RXD_MODE_1)
+                ering->rx_jumbo_max_pending = MAX_RX_DESC_1;
+        else if (sp->rxd_mode == RXD_MODE_3B)
+                ering->rx_jumbo_max_pending = MAX_RX_DESC_2;
+        ering->rx_jumbo_pending = rx_desc_count;
+}
+
 /**
  * s2io_ethtool_getpause_data -Pause frame frame generation and reception.
  * @sp : private member of the device structure, which is a pointer to the
@@ -4981,8 +5150,11 @@ static void s2io_vpd_read(struct s2io_nic *nic)
         strcpy(nic->serial_num, "NOT AVAILABLE");
 
         vpd_data = kmalloc(256, GFP_KERNEL);
-        if (!vpd_data)
+        if (!vpd_data) {
+                nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
                 return;
+        }
+        nic->mac_control.stats_info->sw_stat.mem_allocated += 256;
 
         for (i = 0; i < 256; i +=4 ) {
                 pci_write_config_byte(nic->pdev, (vpd_addr + 2), i);
@@ -5022,6 +5194,7 @@ static void s2io_vpd_read(struct s2io_nic *nic)
                 memcpy(nic->product_name, &vpd_data[3], vpd_data[1]);
         }
         kfree(vpd_data);
+        nic->mac_control.stats_info->sw_stat.mem_freed += 256;
 }
 
 /**
@@ -5742,6 +5915,30 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
         }
         else
                 tmp_stats[i++] = 0;
+        tmp_stats[i++] = stat_info->sw_stat.mem_alloc_fail_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.watchdog_timer_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.mem_allocated;
+        tmp_stats[i++] = stat_info->sw_stat.mem_freed;
+        tmp_stats[i++] = stat_info->sw_stat.link_up_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.link_down_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.link_up_time;
+        tmp_stats[i++] = stat_info->sw_stat.link_down_time;
+
+        tmp_stats[i++] = stat_info->sw_stat.tx_buf_abort_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.tx_desc_abort_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.tx_parity_err_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.tx_link_loss_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.tx_list_proc_err_cnt;
+
+        tmp_stats[i++] = stat_info->sw_stat.rx_parity_err_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_abort_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_parity_abort_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_rda_fail_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_unkn_prot_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_fcs_err_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_buf_size_err_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_rxd_corrupt_cnt;
+        tmp_stats[i++] = stat_info->sw_stat.rx_unkn_err_cnt;
 }
 
 static int s2io_ethtool_get_regs_len(struct net_device *dev)
@@ -5854,6 +6051,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_eeprom_len = s2io_get_eeprom_len,
         .get_eeprom = s2io_ethtool_geeprom,
         .set_eeprom = s2io_ethtool_seeprom,
+        .get_ringparam = s2io_ethtool_gringparam,
         .get_pauseparam = s2io_ethtool_getpause_data,
         .set_pauseparam = s2io_ethtool_setpause_data,
         .get_rx_csum = s2io_ethtool_get_rx_csum,
@@ -5962,7 +6160,7 @@ static void s2io_tasklet(unsigned long dev_addr)
                         if (ret == -ENOMEM) {
                                 DBG_PRINT(INFO_DBG, "%s: Out of ",
                                           dev->name);
-                                DBG_PRINT(ERR_DBG, "memory in tasklet\n");
+                                DBG_PRINT(INFO_DBG, "memory in tasklet\n");
                                 break;
                         } else if (ret == -EFILL) {
                                 DBG_PRINT(INFO_DBG,
@@ -6077,9 +6275,14 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
                                 DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
-                                DBG_PRINT(INFO_DBG, "memory to allocate SKBs\n");
+                                DBG_PRINT(INFO_DBG, "memory to allocate ");
+                                DBG_PRINT(INFO_DBG, "1 buf mode SKBs\n");
+                                sp->mac_control.stats_info->sw_stat. \
+                                        mem_alloc_fail_cnt++;
                                 return -ENOMEM ;
                         }
+                        sp->mac_control.stats_info->sw_stat.mem_allocated 
+                                += (*skb)->truesize;
                         /* storing the mapped addr in a temp variable
                          * such it will be used for next rxd whose
                          * Host Control is NULL
@@ -6099,10 +6302,15 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
-                                DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n",
-                                        dev->name);
+                                DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
+                                DBG_PRINT(INFO_DBG, "memory to allocate ");
+                                DBG_PRINT(INFO_DBG, "2 buf mode SKBs\n");
+                                sp->mac_control.stats_info->sw_stat. \
+                                        mem_alloc_fail_cnt++;
                                 return -ENOMEM;
                         }
+                        sp->mac_control.stats_info->sw_stat.mem_allocated 
+                                += (*skb)->truesize;
                         ((struct RxD3*)rxdp)->Buffer2_ptr = *temp2 =
                                 pci_map_single(sp->pdev, (*skb)->data,
                                                dev->mtu + 4,
@@ -6126,10 +6334,15 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                 } else {
                         *skb = dev_alloc_skb(size);
                         if (!(*skb)) {
-                                DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb failed\n",
-                                          dev->name);
+                                DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
+                                DBG_PRINT(INFO_DBG, "memory to allocate ");
+                                DBG_PRINT(INFO_DBG, "3 buf mode SKBs\n");
+                                sp->mac_control.stats_info->sw_stat. \
+                                        mem_alloc_fail_cnt++;
                                 return -ENOMEM;
                         }
+                        sp->mac_control.stats_info->sw_stat.mem_allocated 
+                                += (*skb)->truesize;
                         ((struct RxD3*)rxdp)->Buffer0_ptr = *temp0 =
                                 pci_map_single(sp->pdev, ba->ba_0, BUF0_LEN,
                                                PCI_DMA_FROMDEVICE);
@@ -6147,10 +6360,14 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                         if (skb_shinfo(*skb)->frag_list == NULL) {
                                 DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb \
                                           failed\n ", dev->name);
+                                sp->mac_control.stats_info->sw_stat. \
+                                        mem_alloc_fail_cnt++;
                                 return -ENOMEM ;
                         }
                         frag_list = skb_shinfo(*skb)->frag_list;
                         frag_list->next = NULL;
+                        sp->mac_control.stats_info->sw_stat.mem_allocated 
+                                += frag_list->truesize;
                         /*
                          * Buffer-2 receives L4 data payload
                          */
@@ -6566,6 +6783,7 @@ static void s2io_tx_watchdog(struct net_device *dev)
         struct s2io_nic *sp = dev->priv;
 
         if (netif_carrier_ok(dev)) {
+                sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt++;
                 schedule_work(&sp->rst_timer_task);
                 sp->mac_control.stats_info->sw_stat.soft_reset_cnt++;
         }
@@ -6606,7 +6824,53 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                 if (err & 0x1) {
                         sp->mac_control.stats_info->sw_stat.parity_err_cnt++;
                 }
+                err >>= 48;
+                switch(err) {
+                        case 1:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_parity_err_cnt++;
+                        break;
 
+                        case 2:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_abort_cnt++;
+                        break;
+
+                        case 3:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_parity_abort_cnt++;
+                        break;
+
+                        case 4:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_rda_fail_cnt++;
+                        break;
+
+                        case 5:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_unkn_prot_cnt++;
+                        break;
+
+                        case 6:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_fcs_err_cnt++;
+                        break;
+
+                        case 7:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_buf_size_err_cnt++;
+                        break;
+
+                        case 8:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_rxd_corrupt_cnt++;
+                        break;
+
+                        case 15:
+                                sp->mac_control.stats_info->sw_stat.
+                                rx_unkn_err_cnt++;
+                        break;
+                }
                 /*
                 * Drop the packet if bad transfer code. Exception being
                 * 0x5, which could be due to unsupported IPv6 extension header.
@@ -6614,10 +6878,12 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                 * Note that in this case, since checksum will be incorrect,
                 * stack will validate the same.
                 */
-                if (err && ((err >> 48) != 0x5)) {
+                if (err != 0x5) {
                         DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%llx\n",
                                 dev->name, err);
                         sp->stats.rx_crc_errors++;
+                        sp->mac_control.stats_info->sw_stat.mem_freed 
+                                += skb->truesize;
                         dev_kfree_skb(skb);
                         atomic_dec(&sp->rx_bufs_left[ring_no]);
                         rxdp->Host_Control = 0;
@@ -6627,7 +6893,6 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
 
         /* Updating statistics */
         rxdp->Host_Control = 0;
-        sp->stats.rx_packets++;
         if (sp->rxd_mode == RXD_MODE_1) {
                 int len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2);
 
@@ -6731,7 +6996,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
         } else {
                 skb->ip_summed = CHECKSUM_NONE;
         }
-
+        sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
         if (!sp->lro) {
                 skb->protocol = eth_type_trans(skb, dev);
                 if ((sp->vlgrp && RXD_GET_VLAN_TAG(rxdp->Control_2) &&
@@ -6780,12 +7045,21 @@ static void s2io_link(struct s2io_nic * sp, int link)
                 if (link == LINK_DOWN) {
                         DBG_PRINT(ERR_DBG, "%s: Link down\n", dev->name);
                         netif_carrier_off(dev);
+                        if(sp->mac_control.stats_info->sw_stat.link_up_cnt)
+                        sp->mac_control.stats_info->sw_stat.link_up_time = 
+                                jiffies - sp->start_time;
+                        sp->mac_control.stats_info->sw_stat.link_down_cnt++;
                 } else {
                         DBG_PRINT(ERR_DBG, "%s: Link Up\n", dev->name);
+                        if (sp->mac_control.stats_info->sw_stat.link_down_cnt)
+                        sp->mac_control.stats_info->sw_stat.link_down_time = 
+                                jiffies - sp->start_time;
+                        sp->mac_control.stats_info->sw_stat.link_up_cnt++;
                         netif_carrier_on(dev);
                 }
         }
         sp->last_link_state = link;
+        sp->start_time = jiffies;
 }
 
 /**
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index a656d18b33df..54baa0b8ec7c 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -95,6 +95,32 @@ struct swStat {
         unsigned long long flush_max_pkts;
         unsigned long long sum_avg_pkts_aggregated;
         unsigned long long num_aggregations;
+        /* Other statistics */
+        unsigned long long mem_alloc_fail_cnt;
+        unsigned long long watchdog_timer_cnt;
+        unsigned long long mem_allocated;
+        unsigned long long mem_freed;
+        unsigned long long link_up_cnt;
+        unsigned long long link_down_cnt;
+        unsigned long long link_up_time;
+        unsigned long long link_down_time;
+
+        /* Transfer Code statistics */
+        unsigned long long tx_buf_abort_cnt;
+        unsigned long long tx_desc_abort_cnt;
+        unsigned long long tx_parity_err_cnt;
+        unsigned long long tx_link_loss_cnt;
+        unsigned long long tx_list_proc_err_cnt;
+
+        unsigned long long rx_parity_err_cnt;
+        unsigned long long rx_abort_cnt;
+        unsigned long long rx_parity_abort_cnt;
+        unsigned long long rx_rda_fail_cnt;
+        unsigned long long rx_unkn_prot_cnt;
+        unsigned long long rx_fcs_err_cnt;
+        unsigned long long rx_buf_size_err_cnt;
+        unsigned long long rx_rxd_corrupt_cnt;
+        unsigned long long rx_unkn_err_cnt;
 };
 
 /* Xpak releated alarm and warnings */
@@ -308,6 +334,11 @@ struct stat_block {
 #define MAX_TX_FIFOS 8
 #define MAX_RX_RINGS 8
 
+#define MAX_RX_DESC_1  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 127 )
+#define MAX_RX_DESC_2  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 85 )
+#define MAX_RX_DESC_3  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 85 )
+#define MAX_TX_DESC    (MAX_AVAILABLE_TXDS)
+
 /* FIFO mappings for all possible number of fifos configured */
 static int fifo_map[][MAX_TX_FIFOS] = {
         {0, 0, 0, 0, 0, 0, 0, 0},
@@ -819,6 +850,7 @@ struct s2io_nic {
 #define LINK_UP         2
 
         int task_flag;
+        unsigned long long start_time;
 #define CARD_DOWN 1
 #define CARD_UP 2
         atomic_t card_state;
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 1fc77300b055..2106becf6990 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -16,11 +16,13 @@
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
+#include <linux/platform_device.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 
 #include <asm/sgi/hpc3.h>
 #include <asm/sgi/ip22.h>
+#include <asm/sgi/seeq.h>
 
 #include "sgiseeq.h"
 
@@ -92,13 +94,9 @@ struct sgiseeq_private {
 
         struct net_device_stats stats;
 
-        struct net_device *next_module;
         spinlock_t tx_lock;
 };
 
-/* A list of all installed seeq devices, for removing the driver module. */
-static struct net_device *root_sgiseeq_dev;
-
 static inline void hpc3_eth_reset(struct hpc3_ethregs *hregs)
 {
         hregs->reset = HPC3_ERST_CRESET | HPC3_ERST_CLRIRQ;
@@ -624,9 +622,12 @@ static inline void setup_rx_ring(struct sgiseeq_rx_desc *buf, int nbufs)
 
 #define ALIGNED(x)  ((((unsigned long)(x)) + 0xf) & ~(0xf))
 
-static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq, int has_eeprom)
+static int __init sgiseeq_probe(struct platform_device *pdev)
 {
+        struct sgiseeq_platform_data *pd = pdev->dev.platform_data;
+        struct hpc3_regs *hpcregs = pd->hpc;
         struct sgiseeq_init_block *sr;
+        unsigned int irq = pd->irq;
         struct sgiseeq_private *sp;
         struct net_device *dev;
         int err, i;
@@ -637,6 +638,8 @@ static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq, int has_eeprom)
                 err = -ENOMEM;
                 goto err_out;
         }
+
+        platform_set_drvdata(pdev, dev);
         sp = netdev_priv(dev);
 
         /* Make private data page aligned */
@@ -648,15 +651,7 @@ static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq, int has_eeprom)
         }
         sp->srings = sr;
 
-#define EADDR_NVOFS     250
-        for (i = 0; i < 3; i++) {
-                unsigned short tmp = has_eeprom ?
-                        ip22_eeprom_read(&hpcregs->eeprom, EADDR_NVOFS / 2+i) :
-                        ip22_nvram_read(EADDR_NVOFS / 2+i);
-
-                dev->dev_addr[2 * i]     = tmp >> 8;
-                dev->dev_addr[2 * i + 1] = tmp & 0xff;
-        }
+        memcpy(dev->dev_addr, pd->mac, ETH_ALEN);
 
 #ifdef DEBUG
         gpriv = sp;
@@ -720,9 +715,6 @@ static int sgiseeq_init(struct hpc3_regs* hpcregs, int irq, int has_eeprom)
         for (i = 0; i < 6; i++)
                 printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
 
-        sp->next_module = root_sgiseeq_dev;
-        root_sgiseeq_dev = dev;
-
         return 0;
 
 err_out_free_page:
@@ -734,43 +726,42 @@ err_out:
         return err;
 }
 
-static int __init sgiseeq_probe(void)
+static void __exit sgiseeq_remove(struct platform_device *pdev)
 {
-        unsigned int tmp, ret1, ret2 = 0;
-
-        /* On board adapter on 1st HPC is always present */
-        ret1 = sgiseeq_init(hpc3c0, SGI_ENET_IRQ, 0);
-        /* Let's see if second HPC is there */
-        if (!(ip22_is_fullhouse()) &&
-            get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]) == 0) {
-                sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 |
-                                 SGIMC_GIOPAR_EXP164 |
-                                 SGIMC_GIOPAR_HPC264;
-                hpc3c1->pbus_piocfg[0][0] = 0x3ffff;
-                /* interrupt/config register on Challenge S Mezz board */
-                hpc3c1->pbus_extregs[0][0] = 0x30;
-                ret2 = sgiseeq_init(hpc3c1, SGI_GIO_0_IRQ, 1);
-        }
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct sgiseeq_private *sp = netdev_priv(dev);
 
-        return (ret1 & ret2) ? ret1 : 0;
+        unregister_netdev(dev);
+        free_page((unsigned long) sp->srings);
+        free_netdev(dev);
+        platform_set_drvdata(pdev, NULL);
 }
 
-static void __exit sgiseeq_exit(void)
-{
-        struct net_device *next, *dev;
-        struct sgiseeq_private *sp;
+static struct platform_driver sgiseeq_driver = {
+        .probe  = sgiseeq_probe,
+        .remove = __devexit_p(sgiseeq_remove),
+        .driver = {
+                .name   = "sgiseeq"
+        }
+};
 
-        for (dev = root_sgiseeq_dev; dev; dev = next) {
-                sp = (struct sgiseeq_private *) netdev_priv(dev);
-                next = sp->next_module;
-                unregister_netdev(dev);
-                free_page((unsigned long) sp->srings);
-                free_netdev(dev);
+static int __init sgiseeq_module_init(void)
+{
+        if (platform_driver_register(&sgiseeq_driver)) {
+                printk(KERN_ERR "Driver registration failed\n");
+                return -ENODEV;
         }
+
+        return 0;
+}
+
+static void __exit sgiseeq_module_exit(void)
+{
+        platform_driver_unregister(&sgiseeq_driver);
 }
 
-module_init(sgiseeq_probe);
-module_exit(sgiseeq_exit);
+module_init(sgiseeq_module_init);
+module_exit(sgiseeq_module_exit);
 
 MODULE_DESCRIPTION("SGI Seeq 8003 driver");
 MODULE_AUTHOR("Linux/MIPS Mailing List <linux-mips@linux-mips.org>");
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 21afe108d3cb..776692946562 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -135,10 +135,13 @@ static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 /* Wake on Lan only supported on Yukon chips with rev 1 or above */
 static u32 wol_supported(const struct skge_hw *hw)
 {
-        if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev != 0)
-                return WAKE_MAGIC | WAKE_PHY;
-        else
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                return 0;
+
+        if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev == 0)
                 return 0;
+
+        return WAKE_MAGIC | WAKE_PHY;
 }
 
 static u32 pci_wake_enabled(struct pci_dev *dev)
@@ -3591,7 +3594,9 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
         skge->duplex = -1;
         skge->speed = -1;
         skge->advertising = skge_supported_modes(hw);
-        skge->wol = pci_wake_enabled(hw->pdev) ? wol_supported(hw) : 0;
+
+        if (pci_wake_enabled(hw->pdev))
+                skge->wol = wol_supported(hw) & WAKE_MAGIC;
 
         hw->dev[port] = dev;
 
@@ -3797,6 +3802,9 @@ static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
         struct skge_hw *hw  = pci_get_drvdata(pdev);
         int i, err, wol = 0;
 
+        if (!hw)
+                return 0;
+
         err = pci_save_state(pdev);
         if (err)
                 return err;
@@ -3825,6 +3833,9 @@ static int skge_resume(struct pci_dev *pdev)
         struct skge_hw *hw  = pci_get_drvdata(pdev);
         int i, err;
 
+        if (!hw)
+                return 0;
+
         err = pci_set_power_state(pdev, PCI_D0);
         if (err)
                 goto out;
@@ -3863,6 +3874,9 @@ static void skge_shutdown(struct pci_dev *pdev)
         struct skge_hw *hw  = pci_get_drvdata(pdev);
         int i, wol = 0;
 
+        if (!hw)
+                return;
+
         for (i = 0; i < hw->ports; i++) {
                 struct net_device *dev = hw->dev[i];
                 struct skge_port *skge = netdev_priv(dev);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 238c2ca34da6..832fd69a0e59 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -124,16 +124,13 @@ static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) }, /* 88E8050 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) }, /* 88E8053 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) }, /* 88E8055 */
-#ifdef broken
-        /* This device causes data corruption problems that are not resolved */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4364) }, /* 88E8056 */
-#endif
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4366) }, /* 88EC036 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4367) }, /* 88EC032 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) }, /* 88EC034 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4369) }, /* 88EC042 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x436A) }, /* 88E8058 */
-        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x436B) }, /* 88E8071 */
+//      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x436B) }, /* 88E8071 */
         { 0 }
 };
 
@@ -307,10 +304,13 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                            PHY_M_EC_MAC_S_MSK);
                 ectrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ);
 
+                /* on PHY 88E1040 Rev.D0 (and newer) downshift control changed */
                 if (hw->chip_id == CHIP_ID_YUKON_EC)
+                        /* set downshift counter to 3x and enable downshift */
                         ectrl |= PHY_M_EC_DSC_2(2) | PHY_M_EC_DOWN_S_ENA;
                 else
-                        ectrl |= PHY_M_EC_M_DSC(2) | PHY_M_EC_S_DSC(3);
+                        /* set master & slave downshift counter to 1x */
+                        ectrl |= PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
 
                 gm_phy_write(hw, port, PHY_MARV_EXT_CTRL, ectrl);
         }
@@ -327,10 +327,12 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                         /* enable automatic crossover */
                         ctrl |= PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO);
 
+                        /* downshift on PHY 88E1112 and 88E1149 is changed */
                         if (sky2->autoneg == AUTONEG_ENABLE
                             && (hw->chip_id == CHIP_ID_YUKON_XL
                                 || hw->chip_id == CHIP_ID_YUKON_EC_U
                                 || hw->chip_id == CHIP_ID_YUKON_EX)) {
+                                /* set downshift counter to 3x and enable downshift */
                                 ctrl &= ~PHY_M_PC_DSC_MSK;
                                 ctrl |= PHY_M_PC_DSC(2) | PHY_M_PC_DOWN_S_ENA;
                         }
@@ -842,10 +844,12 @@ static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
 /* Update chip's next pointer */
 static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, u16 idx)
 {
-        q = Y2_QADDR(q, PREF_UNIT_PUT_IDX);
+        /* Make sure write' to descriptors are complete before we tell hardware */
         wmb();
-        sky2_write16(hw, q, idx);
-        sky2_read16(hw, q);
+        sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx);
+
+        /* Synchronize I/O on since next processor may write to tail */
+        mmiowb();
 }
 
 
@@ -977,6 +981,7 @@ stopped:
 
         /* reset the Rx prefetch unit */
         sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
+        mmiowb();
 }
 
 /* Clean out receive buffer area, assumes receiver hardware stopped */
@@ -1196,7 +1201,7 @@ static int sky2_rx_start(struct sky2_port *sky2)
         }
 
         /* Tell chip about available buffers */
-        sky2_write16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX), sky2->rx_put);
+        sky2_put_idx(hw, rxq, sky2->rx_put);
         return 0;
 nomem:
         sky2_rx_clean(sky2);
@@ -1538,6 +1543,8 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
         }
 
         sky2->tx_cons = idx;
+        smp_mb();
+
         if (tx_avail(sky2) > MAX_SKB_TX_LE + 4)
                 netif_wake_queue(dev);
 }
@@ -1577,13 +1584,6 @@ static int sky2_down(struct net_device *dev)
         imask &= ~portirq_msk[port];
         sky2_write32(hw, B0_IMSK, imask);
 
-        /*
-         * Both ports share the NAPI poll on port 0, so if necessary undo the
-         * the disable that is done in dev_close.
-         */
-        if (sky2->port == 0 && hw->ports > 1)
-                netif_poll_enable(dev);
-
         sky2_gmac_reset(hw, port);
 
         /* Stop transmitter */
@@ -2139,8 +2139,10 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
                 switch (le->opcode & ~HW_OWNER) {
                 case OP_RXSTAT:
                         skb = sky2_receive(dev, length, status);
-                        if (!skb)
+                        if (unlikely(!skb)) {
+                                sky2->net_stats.rx_dropped++;
                                 goto force_update;
+                        }
 
                         skb->protocol = eth_type_trans(skb, dev);
                         sky2->net_stats.rx_packets++;
@@ -2221,6 +2223,7 @@ force_update:
 
         /* Fully processed status ring so clear irq */
         sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
+        mmiowb();
 
 exit_loop:
         if (buf_write[0]) {
@@ -2341,6 +2344,12 @@ static void sky2_mac_intr(struct sky2_hw *hw, unsigned port)
                 printk(KERN_INFO PFX "%s: mac interrupt status 0x%x\n",
                        dev->name, status);
 
+        if (status & GM_IS_RX_CO_OV)
+                gma_read16(hw, port, GM_RX_IRQ_SRC);
+
+        if (status & GM_IS_TX_CO_OV)
+                gma_read16(hw, port, GM_TX_IRQ_SRC);
+
         if (status & GM_IS_RX_FF_OR) {
                 ++sky2->net_stats.rx_fifo_errors;
                 sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_CLI_RX_FO);
@@ -2439,6 +2448,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
         if (work_done < work_limit) {
                 netif_rx_complete(dev0);
 
+                /* end of interrupt, re-enables also acts as I/O synchronization */
                 sky2_read32(hw, B0_Y2_SP_LISR);
                 return 0;
         } else {
@@ -3584,7 +3594,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         err = pci_request_regions(pdev, DRV_NAME);
         if (err) {
                 dev_err(&pdev->dev, "cannot obtain PCI resources\n");
-                goto err_out;
+                goto err_out_disable;
         }
 
         pci_set_master(pdev);
@@ -3721,8 +3731,10 @@ err_out_free_hw:
         kfree(hw);
 err_out_free_regions:
         pci_release_regions(pdev);
+err_out_disable:
         pci_disable_device(pdev);
 err_out:
+        pci_set_drvdata(pdev, NULL);
         return err;
 }
 
@@ -3775,6 +3787,9 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
         struct sky2_hw *hw = pci_get_drvdata(pdev);
         int i, wol = 0;
 
+        if (!hw)
+                return 0;
+
         del_timer_sync(&hw->idle_timer);
         netif_poll_disable(hw->dev[0]);
 
@@ -3806,6 +3821,9 @@ static int sky2_resume(struct pci_dev *pdev)
         struct sky2_hw *hw = pci_get_drvdata(pdev);
         int i, err;
 
+        if (!hw)
+                return 0;
+
         err = pci_set_power_state(pdev, PCI_D0);
         if (err)
                 goto out;
@@ -3852,6 +3870,9 @@ static void sky2_shutdown(struct pci_dev *pdev)
         struct sky2_hw *hw = pci_get_drvdata(pdev);
         int i, wol = 0;
 
+        if (!hw)
+                return;
+
         del_timer_sync(&hw->idle_timer);
         netif_poll_disable(hw->dev[0]);
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 81f24847c963..db43e42bee35 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -77,7 +77,6 @@ static const char version[] =
 #include <linux/skbuff.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #include "smc911x.h"
 
@@ -2084,12 +2083,11 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)
         lp->ctl_rspeed = 100;
 
         /* Grab the IRQ */
-        retval = request_irq(dev->irq, &smc911x_interrupt, IRQF_SHARED, dev->name, dev);
+        retval = request_irq(dev->irq, &smc911x_interrupt,
+                        IRQF_SHARED | IRQF_TRIGGER_FALLING, dev->name, dev);
         if (retval)
                 goto err_out;
 
-        set_irq_type(dev->irq, IRQT_FALLING);
-
 #ifdef SMC_USE_DMA
         lp->rxdma = SMC_DMA_REQUEST(dev, smc911x_rx_dma_irq);
         lp->txdma = SMC_DMA_REQUEST(dev, smc911x_tx_dma_irq);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 7053026d6c76..111f23d05764 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -279,6 +279,40 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_insw(a, r, p, l)    insw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)   outsw((a) + (r), p, l)
 
+#elif   defined(CONFIG_SUPERH)
+
+#if defined(CONFIG_SH_7780_SOLUTION_ENGINE) || defined(CONFIG_SH_7722_SOLUTION_ENGINE)
+#define SMC_CAN_USE_8BIT       0
+#define SMC_CAN_USE_16BIT      1
+#define SMC_CAN_USE_32BIT      0
+#define SMC_IO_SHIFT           0
+#define SMC_NOWAIT             1
+
+#define SMC_inb(a, r)          (inw((a) + ((r)&~1)) >> (8*(r%2)))&0xff
+#define SMC_inw(a, r)          inw((a) + (r))
+#define SMC_outb(v, a, r)      outw(((inw((a)+((r)&~1))*(0xff<<8*(r%2)))) | ((v)<<(8*(r&2)))), (a) + ((r)&~1))
+
+#define SMC_outw(v, a, r)      outw(v, (a) + (r))
+#define SMC_insw(a, r, p, l)   insw((a) + (r), p, l)
+#define SMC_outsw(a, r, p, l)  outsw((a) + (r), p, l)
+
+#else /* BOARDS */
+
+#define SMC_CAN_USE_8BIT       1
+#define SMC_CAN_USE_16BIT      1
+#define SMC_CAN_USE_32BIT      1
+
+#define SMC_inb(a, r)          inb((a) + (r))
+#define SMC_inw(a, r)          inw((a) + (r))
+#define SMC_outb(v, a, r)      outb(v, (a) + (r))
+#define SMC_outw(v, a, r)      outw(v, (a) + (r))
+#define SMC_insw(a, r, p, l)   insw((a) + (r), p, l)
+#define SMC_outsw(a, r, p, l)  outsw((a) + (r), p, l)
+
+#endif  /* BOARDS */
+
+#define set_irq_type(irq, type) do {} while (0)
+
 #elif   defined(CONFIG_M32R)
 
 #define SMC_CAN_USE_8BIT        0
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 230da14b1b68..c3964c3d89d9 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -175,12 +175,10 @@ spider_net_setup_aneg(struct spider_net_card *card)
 {
         struct mii_phy *phy = &card->phy;
         u32 advertise = 0;
-        u16 bmcr, bmsr, stat1000, estat;
+        u16 bmsr, estat;
 
-        bmcr     = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMCR);
-        bmsr     = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR);
-        stat1000 = spider_net_read_phy(card->netdev, phy->mii_id, MII_STAT1000);
-        estat    = spider_net_read_phy(card->netdev, phy->mii_id, MII_ESTATUS);
+        bmsr  = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR);
+        estat = spider_net_read_phy(card->netdev, phy->mii_id, MII_ESTATUS);
 
         if (bmsr & BMSR_10HALF)
                 advertise |= ADVERTISED_10baseT_Half;
@@ -432,7 +430,8 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
         /* and we need to have it 128 byte aligned, therefore we allocate a
          * bit more */
         /* allocate an skb */
-        descr->skb = dev_alloc_skb(bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
+        descr->skb = netdev_alloc_skb(card->netdev,
+                                      bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
         if (!descr->skb) {
                 if (netif_msg_rx_err(card) && net_ratelimit())
                         pr_err("Not enough memory to allocate rx buffer\n");
@@ -1830,7 +1829,7 @@ try_host_fw:
         if (!dn)
                 goto out_err;
 
-        fw_prop = get_property(dn, "firmware", &fw_size);
+        fw_prop = of_get_property(dn, "firmware", &fw_size);
         if (!fw_prop)
                 goto out_err;
 
@@ -2236,7 +2235,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
         if (!dn)
                 return -EIO;
 
-        mac = get_property(dn, "local-mac-address", NULL);
+        mac = of_get_property(dn, "local-mac-address", NULL);
         if (!mac)
                 return -EIO;
         memcpy(addr.sa_data, mac, ETH_ALEN);
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index f51ba31970aa..e1f912d04043 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -110,8 +110,7 @@ static char *media[MAX_UNITS];
 
 /* These identify the driver base version and may not be removed. */
 static char version[] =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n"
-KERN_INFO "  http://www.scyld.com/network/sundance.html\n";
+KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("Sundance Alta Ethernet driver");
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 5da73212ac91..432803855034 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2903,7 +2903,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
         struct net_device *dev = gp->dev;
         const unsigned char *addr;
 
-        addr = get_property(gp->of_node, "local-mac-address", NULL);
+        addr = of_get_property(gp->of_node, "local-mac-address", NULL);
         if (addr == NULL) {
 #ifdef CONFIG_SPARC
                 addr = idprom->id_ethaddr;
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 56a110ca5e6f..61843fd57525 100644
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -451,7 +451,7 @@ static int bcm5421_init(struct mii_phy* phy)
         if (phy->platform_data) {
                 struct device_node *np = of_get_parent(phy->platform_data);
                 int can_low_power = 1;
-                if (np == NULL || get_property(np, "no-autolowpower", NULL))
+                if (np == NULL || of_get_property(np, "no-autolowpower", NULL))
                         can_low_power = 0;
                 if (can_low_power) {
                         /* Enable automatic low-power */
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index f1e2dfc795a2..463d600ed83d 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -540,7 +540,6 @@ static struct sk_buff *alloc_rxbuf_skb(struct net_device *dev,
         skb = dev_alloc_skb(RX_BUF_SIZE);
         if (!skb)
                 return NULL;
-        skb->dev = dev;
         *dma_handle = pci_map_single(hwdev, skb->data, RX_BUF_SIZE,
                                      PCI_DMA_FROMDEVICE);
         if (pci_dma_mapping_error(*dma_handle)) {
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e5e901ecd808..923b9c725cc3 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3716,10 +3716,8 @@ static void tg3_reset_task(struct work_struct *work)
         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;
         }
@@ -3750,8 +3748,6 @@ static void tg3_reset_task(struct work_struct *work)
                 mod_timer(&tp->timer, jiffies + 1);
 
 out:
-        tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK;
-
         tg3_full_unlock(tp);
 }
 
@@ -7390,12 +7386,7 @@ 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);
+        cancel_work_sync(&tp->reset_task);
 
         netif_stop_queue(dev);
 
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 4d334cf5a243..bd9f4f428e5b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2228,7 +2228,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_40BIT_DMA_BUG          0x08000000
 #define TG3_FLAG_BROKEN_CHECKSUMS       0x10000000
 #define TG3_FLAG_SUPPORT_MSI            0x20000000
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index 0bfc2c9c1c08..1aabc91f6458 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -82,6 +82,7 @@ struct tsi108_prv_data {
         unsigned int phy;               /* Index of PHY for this interface */
         unsigned int irq_num;
         unsigned int id;
+        unsigned int phy_type;
 
         struct timer_list timer;/* Timer that triggers the check phy function */
         unsigned int rxtail;    /* Next entry in rxring to read */
@@ -1256,11 +1257,11 @@ static void tsi108_init_phy(struct net_device *dev)
         if (i == 0)
                 printk(KERN_ERR "%s function time out \n", __FUNCTION__);
 
-#if (TSI108_PHY_TYPE == PHY_BCM54XX)    /* Broadcom BCM54xx PHY */
-        tsi108_write_mii(data, 0x09, 0x0300);
-        tsi108_write_mii(data, 0x10, 0x1020);
-        tsi108_write_mii(data, 0x1c, 0x8c00);
-#endif
+        if (data->phy_type == TSI108_PHY_BCM54XX) {
+                tsi108_write_mii(data, 0x09, 0x0300);
+                tsi108_write_mii(data, 0x10, 0x1020);
+                tsi108_write_mii(data, 0x1c, 0x8c00);
+        }
 
         tsi108_write_mii(data,
                          MII_BMCR,
@@ -1587,6 +1588,7 @@ tsi108_init_one(struct platform_device *pdev)
         data->mii_if.supports_gmii = mii_check_gmii_support(&data->mii_if);
 
         data->phy = einfo->phy;
+        data->phy_type = einfo->phy_type;
         data->irq_num = einfo->irq_num;
         data->id = pdev->id;
         dev->open = tsi108_open;
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/tsi108_eth.h
index 77a769df228a..5a77ae6c5f36 100644
--- a/drivers/net/tsi108_eth.h
+++ b/drivers/net/tsi108_eth.h
@@ -43,15 +43,6 @@
         in_be32((data->phyregs + (offset)))
 
 /*
- * PHY Configuration Options
- *
- * NOTE: Enable set of definitions corresponding to your board type
- */
-#define PHY_MV88E       1       /* Marvel 88Exxxx PHY */
-#define PHY_BCM54XX     2       /* Broardcom BCM54xx PHY */
-#define TSI108_PHY_TYPE PHY_MV88E
-
-/*
  * TSI108 GIGE port registers
  */
 
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 9b08afbd1f65..ea896777bcaf 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -269,7 +269,7 @@ done:
             This would turn on IM for devices that is not contributing
             to backlog congestion with unnecessary latency.
 
-             We monitor the the device RX-ring and have:
+             We monitor the device RX-ring and have:
 
              HW Interrupt Mitigation either ON or OFF.
 
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index fa440706fb4a..38f3b99716b8 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1021,7 +1021,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
                 np->tx_ring[entry].length |= DescEndRing;
 
         /* Now acquire the irq spinlock.
-         * The difficult race is the the ordering between
+         * The difficult race is the ordering between
          * increasing np->cur_tx and setting DescOwned:
          * - if np->cur_tx is increased first the interrupt
          *   handler could consider the packet as transmitted
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 985a1810ca59..2470b1ee33c0 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -1043,7 +1043,7 @@ static int enable_promisc(struct xircom_private *card)
 
 
 /*
-link_status() checks the the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what.
+link_status() checks the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what.
 
 Must be called in locked state with interrupts disabled
 */
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index f2dd7763cd0b..f72573594121 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -639,7 +639,7 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,
 
         typhoon_inc_cmd_index(&ring->lastWrite, num_cmd);
 
-        /* "I feel a presence... another warrior is on the the mesa."
+        /* "I feel a presence... another warrior is on the mesa."
          */
         wmb();
         iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 16b9acdabbe8..c2ccbd098f53 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
+ * Copyright (C) 2006-2007 Freescale Semicondutor, Inc. All rights reserved.
  *
  * Author: Shlomi Gridish <gridish@freescale.com>
  *         Li Yang <leoli@freescale.com>
@@ -293,7 +293,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
                 else {
                         init_enet_offset =
                             qe_muram_alloc(thread_size, thread_alignment);
-                        if (IS_MURAM_ERR(init_enet_offset)) {
+                        if (IS_ERR_VALUE(init_enet_offset)) {
                                 ugeth_err
                 ("fill_init_enet_entries: Can not allocate DPRAM memory.");
                                 qe_put_snum((u8) snum);
@@ -2594,7 +2594,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         ugeth->tx_bd_ring_offset[j] =
                             qe_muram_alloc(length,
                                            UCC_GETH_TX_BD_RING_ALIGNMENT);
-                        if (!IS_MURAM_ERR(ugeth->tx_bd_ring_offset[j]))
+                        if (!IS_ERR_VALUE(ugeth->tx_bd_ring_offset[j]))
                                 ugeth->p_tx_bd_ring[j] =
                                     (u8 *) qe_muram_addr(ugeth->
                                                          tx_bd_ring_offset[j]);
@@ -2629,7 +2629,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                         ugeth->rx_bd_ring_offset[j] =
                             qe_muram_alloc(length,
                                            UCC_GETH_RX_BD_RING_ALIGNMENT);
-                        if (!IS_MURAM_ERR(ugeth->rx_bd_ring_offset[j]))
+                        if (!IS_ERR_VALUE(ugeth->rx_bd_ring_offset[j]))
                                 ugeth->p_rx_bd_ring[j] =
                                     (u8 *) qe_muram_addr(ugeth->
                                                          rx_bd_ring_offset[j]);
@@ -2713,7 +2713,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         ugeth->tx_glbl_pram_offset =
             qe_muram_alloc(sizeof(struct ucc_geth_tx_global_pram),
                            UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->tx_glbl_pram_offset)) {
+        if (IS_ERR_VALUE(ugeth->tx_glbl_pram_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_tx_glbl_pram.",
                      __FUNCTION__);
@@ -2735,7 +2735,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            sizeof(struct ucc_geth_thread_data_tx) +
                            32 * (numThreadsTxNumerical == 1),
                            UCC_GETH_THREAD_DATA_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->thread_dat_tx_offset)) {
+        if (IS_ERR_VALUE(ugeth->thread_dat_tx_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_thread_data_tx.",
                      __FUNCTION__);
@@ -2763,7 +2763,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
             qe_muram_alloc(ug_info->numQueuesTx *
                            sizeof(struct ucc_geth_send_queue_qd),
                            UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->send_q_mem_reg_offset)) {
+        if (IS_ERR_VALUE(ugeth->send_q_mem_reg_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_send_q_mem_reg.",
                      __FUNCTION__);
@@ -2806,7 +2806,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 ugeth->scheduler_offset =
                     qe_muram_alloc(sizeof(struct ucc_geth_scheduler),
                                    UCC_GETH_SCHEDULER_ALIGNMENT);
-                if (IS_MURAM_ERR(ugeth->scheduler_offset)) {
+                if (IS_ERR_VALUE(ugeth->scheduler_offset)) {
                         ugeth_err
                          ("%s: Can not allocate DPRAM memory for p_scheduler.",
                              __FUNCTION__);
@@ -2854,7 +2854,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                     qe_muram_alloc(sizeof
                                    (struct ucc_geth_tx_firmware_statistics_pram),
                                    UCC_GETH_TX_STATISTICS_ALIGNMENT);
-                if (IS_MURAM_ERR(ugeth->tx_fw_statistics_pram_offset)) {
+                if (IS_ERR_VALUE(ugeth->tx_fw_statistics_pram_offset)) {
                         ugeth_err
                             ("%s: Can not allocate DPRAM memory for"
                                 " p_tx_fw_statistics_pram.", __FUNCTION__);
@@ -2893,7 +2893,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         ugeth->rx_glbl_pram_offset =
             qe_muram_alloc(sizeof(struct ucc_geth_rx_global_pram),
                            UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->rx_glbl_pram_offset)) {
+        if (IS_ERR_VALUE(ugeth->rx_glbl_pram_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_rx_glbl_pram.",
                      __FUNCTION__);
@@ -2914,7 +2914,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
             qe_muram_alloc(numThreadsRxNumerical *
                            sizeof(struct ucc_geth_thread_data_rx),
                            UCC_GETH_THREAD_DATA_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->thread_dat_rx_offset)) {
+        if (IS_ERR_VALUE(ugeth->thread_dat_rx_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_thread_data_rx.",
                      __FUNCTION__);
@@ -2937,7 +2937,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                     qe_muram_alloc(sizeof
                                    (struct ucc_geth_rx_firmware_statistics_pram),
                                    UCC_GETH_RX_STATISTICS_ALIGNMENT);
-                if (IS_MURAM_ERR(ugeth->rx_fw_statistics_pram_offset)) {
+                if (IS_ERR_VALUE(ugeth->rx_fw_statistics_pram_offset)) {
                         ugeth_err
                                 ("%s: Can not allocate DPRAM memory for"
                                 " p_rx_fw_statistics_pram.", __FUNCTION__);
@@ -2959,7 +2959,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
             qe_muram_alloc(ug_info->numQueuesRx *
                            sizeof(struct ucc_geth_rx_interrupt_coalescing_entry)
                            + 4, UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) {
+        if (IS_ERR_VALUE(ugeth->rx_irq_coalescing_tbl_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for"
                         " p_rx_irq_coalescing_tbl.", __FUNCTION__);
@@ -3027,7 +3027,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                            (sizeof(struct ucc_geth_rx_bd_queues_entry) +
                             sizeof(struct ucc_geth_rx_prefetched_bds)),
                            UCC_GETH_RX_BD_QUEUES_ALIGNMENT);
-        if (IS_MURAM_ERR(ugeth->rx_bd_qs_tbl_offset)) {
+        if (IS_ERR_VALUE(ugeth->rx_bd_qs_tbl_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_rx_bd_qs_tbl.",
                      __FUNCTION__);
@@ -3116,7 +3116,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 ugeth->exf_glbl_param_offset =
                     qe_muram_alloc(sizeof(struct ucc_geth_exf_global_pram),
                 UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT);
-                if (IS_MURAM_ERR(ugeth->exf_glbl_param_offset)) {
+                if (IS_ERR_VALUE(ugeth->exf_glbl_param_offset)) {
                         ugeth_err
                                 ("%s: Can not allocate DPRAM memory for"
                                 " p_exf_glbl_param.", __FUNCTION__);
@@ -3258,7 +3258,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
 
         /* Allocate InitEnet command parameter structure */
         init_enet_pram_offset = qe_muram_alloc(sizeof(struct ucc_geth_init_pram), 4);
-        if (IS_MURAM_ERR(init_enet_pram_offset)) {
+        if (IS_ERR_VALUE(init_enet_pram_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",
                      __FUNCTION__);
@@ -3737,21 +3737,21 @@ static int ucc_geth_close(struct net_device *dev)
 
 const struct ethtool_ops ucc_geth_ethtool_ops = { };
 
-static phy_interface_t to_phy_interface(const char *interface_type)
+static phy_interface_t to_phy_interface(const char *phy_connection_type)
 {
-        if (strcasecmp(interface_type, "mii") == 0)
+        if (strcasecmp(phy_connection_type, "mii") == 0)
                 return PHY_INTERFACE_MODE_MII;
-        if (strcasecmp(interface_type, "gmii") == 0)
+        if (strcasecmp(phy_connection_type, "gmii") == 0)
                 return PHY_INTERFACE_MODE_GMII;
-        if (strcasecmp(interface_type, "tbi") == 0)
+        if (strcasecmp(phy_connection_type, "tbi") == 0)
                 return PHY_INTERFACE_MODE_TBI;
-        if (strcasecmp(interface_type, "rmii") == 0)
+        if (strcasecmp(phy_connection_type, "rmii") == 0)
                 return PHY_INTERFACE_MODE_RMII;
-        if (strcasecmp(interface_type, "rgmii") == 0)
+        if (strcasecmp(phy_connection_type, "rgmii") == 0)
                 return PHY_INTERFACE_MODE_RGMII;
-        if (strcasecmp(interface_type, "rgmii-id") == 0)
+        if (strcasecmp(phy_connection_type, "rgmii-id") == 0)
                 return PHY_INTERFACE_MODE_RGMII_ID;
-        if (strcasecmp(interface_type, "rtbi") == 0)
+        if (strcasecmp(phy_connection_type, "rtbi") == 0)
                 return PHY_INTERFACE_MODE_RTBI;
 
         return PHY_INTERFACE_MODE_MII;
@@ -3787,7 +3787,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
-        prop = get_property(np, "device-id", NULL);
+        prop = of_get_property(np, "device-id", NULL);
         ucc_num = *prop - 1;
         if ((ucc_num < 0) || (ucc_num > 7))
                 return -ENODEV;
@@ -3795,9 +3795,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         ug_info = &ugeth_info[ucc_num];
         ug_info->uf_info.ucc_num = ucc_num;
 
-        prop = get_property(np, "rx-clock", NULL);
+        prop = of_get_property(np, "rx-clock", NULL);
         ug_info->uf_info.rx_clock = *prop;
-        prop = get_property(np, "tx-clock", NULL);
+        prop = of_get_property(np, "tx-clock", NULL);
         ug_info->uf_info.tx_clock = *prop;
         err = of_address_to_resource(np, 0, &res);
         if (err)
@@ -3806,42 +3806,34 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         ug_info->uf_info.regs = res.start;
         ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
 
-        ph = get_property(np, "phy-handle", NULL);
+        ph = of_get_property(np, "phy-handle", NULL);
         phy = of_find_node_by_phandle(*ph);
 
         if (phy == NULL)
                 return -ENODEV;
 
         /* set the PHY address */
-        prop = get_property(phy, "reg", NULL);
+        prop = of_get_property(phy, "reg", NULL);
         if (prop == NULL)
                 return -1;
         ug_info->phy_address = *prop;
 
         /* get the phy interface type, or default to MII */
-        prop = get_property(np, "interface-type", NULL);
+        prop = of_get_property(np, "phy-connection-type", NULL);
         if (!prop) {
                 /* handle interface property present in old trees */
-                prop = get_property(phy, "interface", NULL);
-                if (prop != NULL)
+                prop = of_get_property(phy, "interface", NULL);
+                if (prop != NULL) {
                         phy_interface = enet_to_phy_interface[*prop];
-                else
+                        max_speed = enet_to_speed[*prop];
+                } else
                         phy_interface = PHY_INTERFACE_MODE_MII;
         } else {
                 phy_interface = to_phy_interface((const char *)prop);
         }
 
-        /* get speed, or derive from interface */
-        prop = get_property(np, "max-speed", NULL);
-        if (!prop) {
-                /* handle interface property present in old trees */
-                prop = get_property(phy, "interface", NULL);
-                if (prop != NULL)
-                        max_speed = enet_to_speed[*prop];
-        } else {
-                max_speed = *prop;
-        }
-        if (!max_speed) {
+        /* get speed, or derive from PHY interface */
+        if (max_speed == 0)
                 switch (phy_interface) {
                 case PHY_INTERFACE_MODE_GMII:
                 case PHY_INTERFACE_MODE_RGMII:
@@ -3854,9 +3846,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                         max_speed = SPEED_100;
                         break;
                 }
-        }
 
         if (max_speed == SPEED_1000) {
+                /* configure muram FIFOs for gigabit operation */
                 ug_info->uf_info.urfs = UCC_GETH_URFS_GIGA_INIT;
                 ug_info->uf_info.urfet = UCC_GETH_URFET_GIGA_INIT;
                 ug_info->uf_info.urfset = UCC_GETH_URFSET_GIGA_INIT;
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index 73b5a538e8f4..f96966d4bcc2 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -1,12 +1,13 @@
 /*
  * drivers/net/ucc_geth_mii.c
  *
- * Gianfar Ethernet Driver -- MIIM bus implementation
- * Provides Bus interface for MIIM regs
+ * QE UCC Gigabit Ethernet Driver -- MII Management Bus Implementation
+ * Provides Bus interface for MII Management regs in the UCC register space
  *
- * Author: Li Yang
+ * Copyright (C) 2007 Freescale Semiconductor, Inc.
  *
- * Copyright (c) 2002-2004 Freescale Semiconductor, Inc.
+ * Authors: Li Yang <leoli@freescale.com>
+ *          Kim Phillips <kim.phillips@freescale.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
@@ -172,7 +173,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
         while ((child = of_get_next_child(np, child)) != NULL) {
                 int irq = irq_of_parse_and_map(child, 0);
                 if (irq != NO_IRQ) {
-                        const u32 *id = get_property(child, "reg", NULL);
+                        const u32 *id = of_get_property(child, "reg", NULL);
                         new_bus->irq[*id] = irq;
                 }
         }
@@ -203,7 +204,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
                 if ((res.start >= tempres.start) &&
                     (res.end <= tempres.end)) {
                         /* set this UCC to be the MII master */
-                        const u32 *id = get_property(tempnp, "device-id", NULL);
+                        const u32 *id = of_get_property(tempnp, "device-id", NULL);
                         if (id == NULL)
                                 goto bus_register_fail;
 
diff --git a/drivers/net/ucc_geth_mii.h b/drivers/net/ucc_geth_mii.h
index 98430fe0bfc6..d83437039919 100644
--- a/drivers/net/ucc_geth_mii.h
+++ b/drivers/net/ucc_geth_mii.h
@@ -1,13 +1,13 @@
 /*
  * drivers/net/ucc_geth_mii.h
  *
- * Gianfar Ethernet Driver -- MII Management Bus Implementation
- * Driver for the MDIO bus controller in the Gianfar register space
+ * QE UCC Gigabit Ethernet Driver -- MII Management Bus Implementation
+ * Provides Bus interface for MII Management regs in the UCC register space
  *
- * Author: Andy Fleming
- * Maintainer: Kumar Gala
+ * Copyright (C) 2007 Freescale Semiconductor, Inc.
  *
- * Copyright (c) 2002-2004 Freescale Semiconductor, Inc.
+ * Authors: Li Yang <leoli@freescale.com>
+ *          Kim Phillips <kim.phillips@freescale.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
diff --git a/drivers/usb/net/Kconfig b/drivers/net/usb/Kconfig
index 3de564b23147..3de564b23147 100644
--- a/drivers/usb/net/Kconfig
+++ b/drivers/net/usb/Kconfig
diff --git a/drivers/usb/net/Makefile b/drivers/net/usb/Makefile
index 595a539f8384..595a539f8384 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/net/usb/Makefile
diff --git a/drivers/usb/net/asix.c b/drivers/net/usb/asix.c
index d5ef97bc4d01..d5ef97bc4d01 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/net/usb/asix.c
diff --git a/drivers/usb/net/catc.c b/drivers/net/usb/catc.c
index 86e90c59d551..86e90c59d551 100644
--- a/drivers/usb/net/catc.c
+++ b/drivers/net/usb/catc.c
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 5a21f06bf8a5..5a21f06bf8a5 100644
--- a/drivers/usb/net/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
diff --git a/drivers/usb/net/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index bc62b012602b..bc62b012602b 100644
--- a/drivers/usb/net/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
diff --git a/drivers/usb/net/dm9601.c b/drivers/net/usb/dm9601.c
index a67638601477..a67638601477 100644
--- a/drivers/usb/net/dm9601.c
+++ b/drivers/net/usb/dm9601.c
diff --git a/drivers/usb/net/gl620a.c b/drivers/net/usb/gl620a.c
index 031cf5ca4dbb..031cf5ca4dbb 100644
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/net/usb/gl620a.c
diff --git a/drivers/usb/net/kaweth.c b/drivers/net/usb/kaweth.c
index 60d29440f316..60d29440f316 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/net/usb/kaweth.c
diff --git a/drivers/usb/net/kawethfw.h b/drivers/net/usb/kawethfw.h
index cf85fcb0d1a6..cf85fcb0d1a6 100644
--- a/drivers/usb/net/kawethfw.h
+++ b/drivers/net/usb/kawethfw.h
diff --git a/drivers/usb/net/mcs7830.c b/drivers/net/usb/mcs7830.c
index 6240b978fe3d..6240b978fe3d 100644
--- a/drivers/usb/net/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
diff --git a/drivers/usb/net/net1080.c b/drivers/net/usb/net1080.c
index 19bf8dae70c9..19bf8dae70c9 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/net/usb/net1080.c
diff --git a/drivers/usb/net/pegasus.c b/drivers/net/usb/pegasus.c
index a05fd97e5bc2..a05fd97e5bc2 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/net/usb/pegasus.c
diff --git a/drivers/usb/net/pegasus.h b/drivers/net/usb/pegasus.h
index c7467823cd1c..c7467823cd1c 100644
--- a/drivers/usb/net/pegasus.h
+++ b/drivers/net/usb/pegasus.h
diff --git a/drivers/usb/net/plusb.c b/drivers/net/usb/plusb.c
index 45300939d185..45300939d185 100644
--- a/drivers/usb/net/plusb.c
+++ b/drivers/net/usb/plusb.c
diff --git a/drivers/usb/net/rndis_host.c b/drivers/net/usb/rndis_host.c
index 980e4aaa97aa..980e4aaa97aa 100644
--- a/drivers/usb/net/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
diff --git a/drivers/usb/net/rtl8150.c b/drivers/net/usb/rtl8150.c
index fa598f0340cf..fa598f0340cf 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
diff --git a/drivers/usb/net/usbnet.c b/drivers/net/usb/usbnet.c
index f9cd42d058b0..f9cd42d058b0 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/net/usb/usbnet.c
diff --git a/drivers/usb/net/usbnet.h b/drivers/net/usb/usbnet.h
index cbb53e065d6c..82db5a8e528e 100644
--- a/drivers/usb/net/usbnet.h
+++ b/drivers/net/usb/usbnet.h
@@ -129,7 +129,7 @@ extern void usbnet_disconnect(struct usb_interface *);
 
 
 /* Drivers that reuse some of the standard USB CDC infrastructure
- * (notably, using multiple interfaces according to the the CDC
+ * (notably, using multiple interfaces according to the CDC
  * union descriptor) get some helper code.
  */
 struct cdc_state {
diff --git a/drivers/usb/net/zaurus.c b/drivers/net/usb/zaurus.c
index 9f98e8ce487a..9f98e8ce487a 100644
--- a/drivers/usb/net/zaurus.c
+++ b/drivers/net/usb/zaurus.c
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 8897f538a7c7..4fc8681bc110 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -2,10 +2,7 @@
 # wan devices configuration
 #
 
-menu "Wan interfaces"
-        depends on NETDEVICES
-
-config WAN
+menuconfig WAN
         bool "Wan interfaces support"
         ---help---
           Wide Area Networks (WANs), such as X.25, Frame Relay and leased
@@ -23,10 +20,12 @@ config WAN
 
           If unsure, say N.
 
+if WAN
+
 # There is no way to detect a comtrol sv11 - force it modular for now.
 config HOSTESS_SV11
         tristate "Comtrol Hostess SV-11 support"
-        depends on WAN && ISA && m && ISA_DMA_API && INET
+        depends on ISA && m && ISA_DMA_API && INET
         help
           Driver for Comtrol Hostess SV-11 network card which
           operates on low speed synchronous serial links at up to
@@ -38,7 +37,7 @@ config HOSTESS_SV11
 # The COSA/SRP driver has not been tested as non-modular yet.
 config COSA
         tristate "COSA/SRP sync serial boards support"
-        depends on WAN && ISA && m && ISA_DMA_API
+        depends on ISA && m && ISA_DMA_API
         ---help---
           Driver for COSA and SRP synchronous serial boards.
 
@@ -62,7 +61,7 @@ config COSA
 #
 config LANMEDIA
         tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
-        depends on WAN && PCI
+        depends on PCI
         ---help---
           Driver for the following Lan Media family of serial boards:
 
@@ -89,7 +88,7 @@ config LANMEDIA
 # There is no way to detect a Sealevel board. Force it modular
 config SEALEVEL_4021
         tristate "Sealevel Systems 4021 support"
-        depends on WAN && ISA && m && ISA_DMA_API && INET
+        depends on ISA && m && ISA_DMA_API && INET
         help
           This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
 
@@ -99,7 +98,6 @@ config SEALEVEL_4021
 # Generic HDLC
 config HDLC
         tristate "Generic HDLC layer"
-        depends on WAN
         help
           Say Y to this option if your Linux box contains a WAN (Wide Area
           Network) card supported by this driver and you are planning to
@@ -167,7 +165,7 @@ config HDLC_X25
           If unsure, say N.
 
 comment "X.25/LAPB support is disabled"
-        depends on WAN && HDLC && (LAPB!=m || HDLC!=m) && LAPB!=y
+        depends on HDLC && (LAPB!=m || HDLC!=m) && LAPB!=y
 
 config PCI200SYN
         tristate "Goramo PCI200SYN support"
@@ -230,10 +228,10 @@ config PC300_MLPPP
           Multilink PPP over the PC300 synchronous communication boards.
 
 comment "Cyclades-PC300 MLPPP support is disabled."
-        depends on WAN && HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP)
+        depends on HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP)
 
 comment "Refer to the file README.mlppp, provided by PC300 package."
-        depends on WAN && HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP)
+        depends on HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP)
 
 config PC300TOO
         tristate "Cyclades PC300 RSV/X21 alternative support"
@@ -338,7 +336,6 @@ config DSCC4_PCI_RST
 
 config DLCI
         tristate "Frame Relay DLCI support"
-        depends on WAN
         ---help---
           Support for the Frame Relay protocol.
 
@@ -385,7 +382,7 @@ config SDLA
 # Wan router core.
 config WAN_ROUTER_DRIVERS
         tristate "WAN router drivers"
-        depends on WAN && WAN_ROUTER
+        depends on WAN_ROUTER
         ---help---
           Connect LAN to WAN via Linux box.
 
@@ -440,7 +437,7 @@ config CYCLOMX_X25
 # X.25 network drivers
 config LAPBETHER
         tristate "LAPB over Ethernet driver (EXPERIMENTAL)"
-        depends on WAN && LAPB && X25
+        depends on LAPB && X25
         ---help---
           Driver for a pseudo device (typically called /dev/lapb0) which allows
           you to open an LAPB point-to-point connection to some other computer
@@ -456,7 +453,7 @@ config LAPBETHER
 
 config X25_ASY
         tristate "X.25 async driver (EXPERIMENTAL)"
-        depends on WAN && LAPB && X25
+        depends on LAPB && X25
         ---help---
           Send and receive X.25 frames over regular asynchronous serial
           lines such as telephone lines equipped with ordinary modems.
@@ -471,7 +468,7 @@ config X25_ASY
 
 config SBNI
         tristate "Granch SBNI12 Leased Line adapter support"
-        depends on WAN && X86
+        depends on X86
         ---help---
           Driver for ISA SBNI12-xx cards which are low cost alternatives to
           leased line modems.
@@ -497,5 +494,4 @@ config SBNI_MULTILINE
 
           If unsure, say N.
 
-endmenu
-
+endif # WAN
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 23464735fa88..9ef49ce148b2 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -90,7 +90,6 @@
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 
 #undef COSA_SLOW_IO     /* for testing purposes only */
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 0184614517f9..e3f5bb0fe603 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Wireless LAN"
+        depends on !S390
 
 config WLAN_PRE80211
         bool "Wireless LAN (pre-802.11)"
@@ -267,7 +268,7 @@ config IPW2200_DEBUG
 
 config LIBERTAS_USB
         tristate "Marvell Libertas 8388 802.11a/b/g cards"
-        depends on NET_RADIO && USB
+        depends on USB && WLAN_80211
         select FW_LOADER
         ---help---
           A driver for Marvell Libertas 8388 USB devices.
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index f21bbafcb728..2d3a180dada0 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -25,7 +25,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
 
 #include <linux/sched.h>
 #include <linux/ptrace.h>
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c
index 38fac3bbcd82..7d5b8c2cc614 100644
--- a/drivers/net/wireless/airport.c
+++ b/drivers/net/wireless/airport.c
@@ -149,7 +149,7 @@ static int airport_hard_reset(struct orinoco_private *priv)
         /* Vitally important.  If we don't do this it seems we get an
          * interrupt somewhere during the power cycle, since
          * hw_unavailable is already set it doesn't get ACKed, we get
-         * into an interrupt loop and the the PMU decides to turn us
+         * into an interrupt loop and the PMU decides to turn us
          * off. */
         disable_irq(dev->irq);
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index f8483c179e4c..10e07e865426 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -658,12 +658,6 @@ struct bcm43xx_pio {
 
 #define BCM43xx_MAX_80211_CORES         2
 
-#ifdef CONFIG_BCM947XX
-#define core_offset(bcm) (bcm)->current_core_offset
-#else
-#define core_offset(bcm) 0
-#endif
-
 /* Generic information about a core. */
 struct bcm43xx_coreinfo {
         u8 available:1,
@@ -789,10 +783,6 @@ struct bcm43xx_private {
 
         /* The currently active core. */
         struct bcm43xx_coreinfo *current_core;
-#ifdef CONFIG_BCM947XX
-        /** current core memory offset */
-        u32 current_core_offset;
-#endif
         struct bcm43xx_coreinfo *active_80211_core;
         /* coreinfo structs for all possible cores follow.
          * Note that a core might not exist.
@@ -943,25 +933,25 @@ struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy,
 static inline
 u16 bcm43xx_read16(struct bcm43xx_private *bcm, u16 offset)
 {
-        return ioread16(bcm->mmio_addr + core_offset(bcm) + offset);
+        return ioread16(bcm->mmio_addr + offset);
 }
 
 static inline
 void bcm43xx_write16(struct bcm43xx_private *bcm, u16 offset, u16 value)
 {
-        iowrite16(value, bcm->mmio_addr + core_offset(bcm) + offset);
+        iowrite16(value, bcm->mmio_addr + offset);
 }
 
 static inline
 u32 bcm43xx_read32(struct bcm43xx_private *bcm, u16 offset)
 {
-        return ioread32(bcm->mmio_addr + core_offset(bcm) + offset);
+        return ioread32(bcm->mmio_addr + offset);
 }
 
 static inline
 void bcm43xx_write32(struct bcm43xx_private *bcm, u16 offset, u32 value)
 {
-        iowrite32(value, bcm->mmio_addr + core_offset(bcm) + offset);
+        iowrite32(value, bcm->mmio_addr + offset);
 }
 
 static inline
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index e3d2e61a31ee..1f7731fcfbd5 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -660,10 +660,6 @@ struct bcm43xx_dmaring * bcm43xx_setup_dmaring(struct bcm43xx_private *bcm,
         ring->routing = BCM43xx_DMA32_CLIENTTRANS;
         if (dma64)
                 ring->routing = BCM43xx_DMA64_CLIENTTRANS;
-#ifdef CONFIG_BCM947XX
-        if (bcm->pci_dev->bus->number == 0)
-                ring->routing = dma64 ? BCM43xx_DMA64_NOTRANS : BCM43xx_DMA32_NOTRANS;
-#endif
 
         ring->bcm = bcm;
         ring->nr_slots = nr_slots;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 5e96bca6730a..ef6b253a92ce 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -61,10 +61,6 @@ MODULE_AUTHOR("Stefano Brivio");
 MODULE_AUTHOR("Michael Buesch");
 MODULE_LICENSE("GPL");
 
-#ifdef CONFIG_BCM947XX
-extern char *nvram_get(char *name);
-#endif
-
 #if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO)
 static int modparam_pio;
 module_param_named(pio, modparam_pio, int, 0444);
@@ -142,10 +138,6 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for using multiple fi
         { PCI_VENDOR_ID_BROADCOM, 0x4324, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         /* Broadcom 43XG 802.11b/g */
         { PCI_VENDOR_ID_BROADCOM, 0x4325, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-#ifdef CONFIG_BCM947XX
-        /* SB bus on BCM947xx */
-        { PCI_VENDOR_ID_BROADCOM, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-#endif
         { 0 },
 };
 MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl);
@@ -786,9 +778,6 @@ static int bcm43xx_sprom_extract(struct bcm43xx_private *bcm)
 {
         u16 value;
         u16 *sprom;
-#ifdef CONFIG_BCM947XX
-        char *c;
-#endif
 
         sprom = kzalloc(BCM43xx_SPROM_SIZE * sizeof(u16),
                         GFP_KERNEL);
@@ -796,28 +785,7 @@ static int bcm43xx_sprom_extract(struct bcm43xx_private *bcm)
                 printk(KERN_ERR PFX "sprom_extract OOM\n");
                 return -ENOMEM;
         }
-#ifdef CONFIG_BCM947XX
-        sprom[BCM43xx_SPROM_BOARDFLAGS2] = atoi(nvram_get("boardflags2"));
-        sprom[BCM43xx_SPROM_BOARDFLAGS] = atoi(nvram_get("boardflags"));
-
-        if ((c = nvram_get("il0macaddr")) != NULL)
-                e_aton(c, (char *) &(sprom[BCM43xx_SPROM_IL0MACADDR]));
-
-        if ((c = nvram_get("et1macaddr")) != NULL)
-                e_aton(c, (char *) &(sprom[BCM43xx_SPROM_ET1MACADDR]));
-
-        sprom[BCM43xx_SPROM_PA0B0] = atoi(nvram_get("pa0b0"));
-        sprom[BCM43xx_SPROM_PA0B1] = atoi(nvram_get("pa0b1"));
-        sprom[BCM43xx_SPROM_PA0B2] = atoi(nvram_get("pa0b2"));
-
-        sprom[BCM43xx_SPROM_PA1B0] = atoi(nvram_get("pa1b0"));
-        sprom[BCM43xx_SPROM_PA1B1] = atoi(nvram_get("pa1b1"));
-        sprom[BCM43xx_SPROM_PA1B2] = atoi(nvram_get("pa1b2"));
-
-        sprom[BCM43xx_SPROM_BOARDREV] = atoi(nvram_get("boardrev"));
-#else
         bcm43xx_sprom_read(bcm, sprom);
-#endif
 
         /* boardflags2 */
         value = sprom[BCM43xx_SPROM_BOARDFLAGS2];
@@ -1225,12 +1193,6 @@ static int _switch_core(struct bcm43xx_private *bcm, int core)
                         goto error;
                 udelay(10);
         }
-#ifdef CONFIG_BCM947XX
-        if (bcm->pci_dev->bus->number == 0)
-                bcm->current_core_offset = 0x1000 * core;
-        else
-                bcm->current_core_offset = 0;
-#endif
 
         return 0;
 error:
@@ -1387,19 +1349,6 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy)
 
         if ((bcm43xx_core_enabled(bcm)) &&
             !bcm43xx_using_pio(bcm)) {
-//FIXME: Do we _really_ want #ifndef CONFIG_BCM947XX here?
-#if 0
-#ifndef CONFIG_BCM947XX
-                /* reset all used DMA controllers. */
-                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA1_BASE);
-                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA2_BASE);
-                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA3_BASE);
-                bcm43xx_dmacontroller_tx_reset(bcm, BCM43xx_MMIO_DMA4_BASE);
-                bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA1_BASE);
-                if (bcm->current_core->rev < 5)
-                        bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA4_BASE);
-#endif
-#endif
         }
         if (bcm43xx_status(bcm) == BCM43xx_STAT_SHUTTINGDOWN) {
                 bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
@@ -2140,32 +2089,11 @@ out:
         return err;
 }
 
-#ifdef CONFIG_BCM947XX
-static struct pci_device_id bcm43xx_47xx_ids[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
-        { 0 }
-};
-#endif
-
 static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
 {
         int err;
 
         bcm->irq = bcm->pci_dev->irq;
-#ifdef CONFIG_BCM947XX
-        if (bcm->pci_dev->bus->number == 0) {
-                struct pci_dev *d;
-                struct pci_device_id *id;
-                for (id = bcm43xx_47xx_ids; id->vendor; id++) {
-                        d = pci_get_device(id->vendor, id->device, NULL);
-                        if (d != NULL) {
-                                bcm->irq = d->irq;
-                                pci_dev_put(d);
-                                break;
-                        }
-                }
-        }
-#endif
         err = request_irq(bcm->irq, bcm43xx_interrupt_handler,
                           IRQF_SHARED, KBUILD_MODNAME, bcm);
         if (err)
@@ -2645,10 +2573,6 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm)
                         chip_id_16 = 0x4610;
                 else if ((pci_device >= 0x4710) && (pci_device <= 0x4715))
                         chip_id_16 = 0x4710;
-#ifdef CONFIG_BCM947XX
-                else if ((pci_device >= 0x4320) && (pci_device <= 0x4325))
-                        chip_id_16 = 0x4309;
-#endif
                 else {
                         printk(KERN_ERR PFX "Could not determine Chip ID\n");
                         return -ENODEV;
@@ -4144,11 +4068,6 @@ static int __devinit bcm43xx_init_one(struct pci_dev *pdev,
         struct bcm43xx_private *bcm;
         int err;
 
-#ifdef CONFIG_BCM947XX
-        if ((pdev->bus->number == 0) && (pdev->device != 0x0800))
-                return -ENODEV;
-#endif
-
 #ifdef DEBUG_SINGLE_DEVICE_ONLY
         if (strcmp(pci_name(pdev), DEBUG_SINGLE_DEVICE_ONLY))
                 return -ENODEV;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
index f76357178e4d..c8f3c532bab5 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
@@ -33,25 +33,6 @@
 
 #include "bcm43xx.h"
 
-#ifdef CONFIG_BCM947XX
-#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
-
-static inline void e_aton(char *str, char *dest)
-{
-        int i = 0;
-        u16 *d = (u16 *) dest;
-
-        for (;;) {
-                dest[i++] = (char) simple_strtoul(str, NULL, 16);
-                str += 2;
-                if (!*str++ || i == 6)
-                        break;
-        }
-        for (i = 0; i < 3; i++)
-                d[i] = cpu_to_be16(d[i]);
-}
-#endif
-
 #define P4D_BYT3S(magic, nr_bytes)      u8 __p4dding##magic[nr_bytes]
 #define P4D_BYTES(line, nr_bytes)       P4D_BYT3S(line, nr_bytes)
 /* Magic helper macro to pad structures. Ignore those above. It's magic. */
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index cb08bc5db2bd..cdea7f71b9eb 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1,7 +1,6 @@
 /* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */
 
 #include <linux/types.h>
-#include <linux/smp_lock.h>
 #include <linux/ethtool.h>
 #include <net/ieee80211_crypt.h>
 
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index 19c935071d8e..56a8ea1fbf04 100644
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -1,5 +1,3 @@
-# EXTRA_CFLAGS += -Wpacked
-
 usb8xxx-objs := main.o fw.o wext.o \
                 rx.o tx.o cmd.o           \
                 cmdresp.o scan.o          \
@@ -7,13 +5,6 @@ usb8xxx-objs := main.o fw.o wext.o \
                 ioctl.o debugfs.o         \
                 ethtool.o assoc.o
 
-ifeq ($(CONFIG_LIBERTAS_USB_DEBUG), y)
-EXTRA_CFLAGS += -DDEBUG -DPROC_DEBUG
-endif
-
-
-# This is needed to support the newer boot2 bootloader (v >= 3104)
-EXTRA_CFLAGS += -DSUPPORT_BOOT_COMMAND
 usb8xxx-objs += if_bootcmd.o
 usb8xxx-objs += if_usb.o
 
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index 688da4c784b1..378577200b56 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -40,64 +40,11 @@ NAME
 SYNOPSIS
         iwpriv <ethX> <command> [sub-command] ...
 
-        iwpriv ethX version
-        iwpriv ethX scantype [sub-command]
-        iwpriv ethX getSNR <n>
-        iwpriv ethX getNF <n>
-        iwpriv ethX getRSSI <n>
-        iwpriv ethX setrxant <n>
-        iwpriv ethX getrxant
-        iwpriv ethX settxant <n>
-        iwpriv ethX gettxant
-        iwpriv ethX authalgs <n>
-        iwpriv ethX pre-TBTT <n>
-        iwpriv ethX 8021xauthalgs <n>
-        iwpriv ethX encryptionmode <n>
         iwpriv ethX setregioncode <n>
         iwpriv ethX getregioncode
-        iwpriv ethX setbcnavg <n>
-        iwpriv ethX getbcnavg
-        iwpriv ethX setdataavg <n>
-        iwpriv ethX setlisteninter <n>
-        iwpriv ethX getlisteninter
-        iwpriv ethX setmultipledtim <n>
-        iwpriv ethX getmultipledtim
-        iwpriv ethX atimwindow <n>
-        iwpriv ethX deauth
-        iwpriv ethX adhocstop
-        iwpriv ethX radioon
-        iwpriv ethX radiooff
-        iwpriv ethX reasso-on
-        iwpriv ethX reasso-off
-        iwpriv ethX scanmode  [sub-command]
-        iwpriv ethX setwpaie <n>
-        iwpriv ethX wlanidle-off
-        iwpriv ethX wlanidle-on
-        iwpriv ethX getcis
-        iwpriv ethX getlog
-        iwpriv ethX getadhocstatus
-        iwpriv ethX adhocgrate <n>
-
-Version 4 Command:
-        iwpriv ethX inactvityto <n>
-        iwpriv ethX sleeppd <n>
-        iwpriv ethX enable11d <n>
-        iwpriv ethX tpccfg <n>
-        iwpriv ethX powercfg <n>
-        iwpriv ethX setafc <n>
-        iwpriv ethX getafc
 
 Version 5 Command:
         iwpriv ethX ledgpio <n>
-        iwpriv ethX scanprobes <n>
-        iwpriv ethX lolisteninter <n>
-        iwpriv ethX rateadapt <n> <m>
-        iwpriv ethX txcontrol <n>
-        iwpriv ethX psnullinterval <n>
-        iwpriv ethX prescan <n>
-        iwpriv ethX getrxinfo
-        iwpriv ethX gettxrate
-        iwpriv ethX beaconinterval
 
 BT Commands:
         The blinding table (BT) contains a list of mac addresses that should be
@@ -150,114 +97,6 @@ DESCRIPTION
         The ethX parameter specifies the network device that is to be used to
                 perform this command on. it could be eth0, eth1 etc.
 
-version
-        This is used to get the current version of the driver and the firmware.
-
-scantype
-        This command is used to set the scan type to be used by the driver in
-        the scan command. This setting will not be used while performing a scan
-        for a specific SSID, as it is always done with scan type being active.
-
-        where the sub-commands are: -
-                        active  -- to set the scan type to active
-                        passive -- to set the scan type to passive
-                        get     -- to get the scan type set in the driver
-
-getSNR
-        This command gets the average and non average value of Signal to Noise
-        Ratio of Beacon and Data.
-
-        where value is:-
-                        0       -- Beacon non-average.
-                        1       -- Beacon average.
-                        2       -- Data non-average.
-                        3       -- Data average.
-
-        If no value is given, all four values are returned in the order mentioned
-        above.
-
-        Note: This command is available only when STA is connected.
-
-getRSSI
-        This command gets the average and non average value os Receive Signal
-        Strength of Beacon and Data.
-
-        where value is:-
-                        0       -- Beacon non-average.
-                        1       -- Beacon average.
-                        2       -- Data non-average.
-                        3       -- Data average.
-
-        Note: This command is available only when STA is connected.
-
-getNF
-        This command gets the average and non average value of Noise Floor of
-        Beacon and Data.
-
-        where value is:-
-                        0       -- Beacon non-average.
-                        1       -- Beacon average.
-                        2       -- Data non-average.
-                        3       -- Data average.
-
-        Note: This command is available only when STA is connected.
-
-setrxant
-        This command is used to set the mode for Rx antenna.
-
-        The options that can be sent are:-
-                        1       -- Antenna 1.
-                        2       -- Antenna 2.
-                        0xFFFF  -- Diversity.
-
-        Usage:
-                iwpriv ethX setrxant 0x01: select Antenna 1.
-
-getrxant
-        This command is used to get the mode for Rx antenna.
-
-
-settxant
-        This command is used to set the mode for Tx antenna.
-                The options that can be sent are:-
-                        1       -- Antenna 1.
-                        2       -- Antenna 2.
-                        0xFFFF  -- Diversity.
-        Usage:
-                iwpriv ethX settxant 0x01: select Antenna 1.
-
-gettxant
-        This command is used to get the mode for Tx antenna.
-
-authalgs
-        This command is used by the WPA supplicant to set the authentication
-        algorithms in the station.
-
-8021xauthalgs
-        This command is used by the WPA supplicant to set the 8021.x authentication algorithm type
-        station.
-
-        where values can be:-
-                        1       -- None
-                        2       -- LEAP
-                        4       -- TLS
-                        8       -- TTLs
-                        16      -- MD5
-
-
-encryptionmode
-        This command is used by the WPA supplicant to set the encryption algorithm.
-
-        where values can be:-
-                        0       -- NONE
-                        1       -- WEP40
-                        2       -- TKIP
-                        3       -- CCMP
-                        4       -- WEP104
-
-pre-TBTT
-        This command is used to set pre-TBTT time period where value is in microseconds.
-
 setregioncode
         This command is used to set the region code in the station.
         where value is 'region code' for various regions like
@@ -270,114 +109,6 @@ getregioncode
         This command is used to get the region code information set in the
         station.
 
-setbcnavg
-        Set the weighting factor for calculating RSSI.
-
-getbcnavg
-        Get weighting factor for calculating RSSI.
-
-setdataavg
-        Set the weighting factor for calculating SNR.
-
-setlisteninter
-        This command is used to set the listen interval in the
-        station.
-
-        where the value ranges between 1 - 255
-
-getlisteninter
-        This command is used to get the listen interval value set in the
-        station.
-
-setmultipledtim
-        This command is used to set the multiple dtim value in the
-        station.
-                where the value is 1,2,3,4,5,0xfffe
-                0xfffe means the firmware will use listen interval in association
-                command for waking up
-
-getmultipledtim
-        This command is used to get the multiple dtim value set in the station.
-
-atimwindow
-        This command is used to set the atim value in the
-        station.
-
-        where the value ranges between 0 - 50
-
-deauth
-        This command is used to send the de-authentication to the AP with which
-        the station is associated. This command is valid only when
-        station is in Infrastructure mode.
-
-        Note: This command is available only when STA is connected.
-
-adhocstop
-        This command is used to stop beacon transmission from the station and
-        go into idle state in ad-hoc mode.
-
-        Note: This command is available only when STA is connected.
-
-radioon
-        This command is used to turn on the RF antenna.
-
-radiooff
-        This command is sued to turn off the RF antenna.
-
-scanmode
-        This command is used to set the station to scan for either IBSS
-        networks or BSS networks or both BSS and IBSS networks. This
-        command can be used with sub commands,
-
-        where the value for
-                        bss     -- Scan All the BSS networks.
-                        ibss    -- Scan All the IBSS networks.
-                        any     -- Scan both BSS and IBSS networks.
-
-
-
-setwpaie
-        This command is used by WPA supplicant to send the WPA-IE to the driver.
-
-wlanidle-off
-        This command is used to get into idle state.
-
-        Note: This command is available only when STA is connected.
-
-wlanidle-on
-        This command is used to get off the idle state.
-
-        Note: This command is available only when STA is connected.
-
-
-getlog
-        This command is used to get the 802.11 statistics available in the
-                station.
-
-        Note: This command is available only when STA is connected.
-
-getadhocstatus
-        This command is used to get the ad-hoc Network Status.
-
-        The various status codes are:
-                AdhocStarted
-                AdhocJoined
-                AdhocIdle
-                InfraMode
-                AutoUnknownMode
-
-        Note: This command is available only when STA is connected.
-
-adhocgrate
-        This command is used to enable(1) g_rate, Disable(0) g_rate
-        and request(2) the status which g_rate is disabled/enabled,
-        for Ad-hoc creator.
-
-        where value is:-
-                0       -- Disabled
-                1       -- Enabled
-                2       -- Get
-
 ledgpio
         This command is used to set/get LEDs.
 
@@ -400,253 +131,6 @@ ledgpio
         Note: LED0 is invalid
         Note: Maximum Number of LEDs are 16.
 
-inactivityto
-        This command is used by the host to set/get the inactivity timeout value,
-        which specifies when WLAN device is put to sleep.
-
-        Usage:
-                iwpriv ethX inactivityto [<timeout>]
-
-        where the parameter are:
-                timeout: timeout value in milliseconds.
-
-        Example:
-                iwpriv eth1 inactivityto
-                        "get the timeout value"
-
-                iwpriv eth1 inactivityto X
-                        "set timeout value to X ms"
-
-
-sleeppd
-        This command is used to configure the sleep period of the WLAN device.
-
-        Usage:
-                iwpriv ethX sleeppd [<sleep period>]
-
-        where the parameter are:
-                Period: sleep period in milliseconds. Range 10~60.
-
-        Example:
-                iwpriv eth1 sleeppd 10
-                        "set period as 10 ms"
-                iwpriv eth1 sleeppd
-                        "get the sleep period configuration"
-
-enable11d
-        This command is used to control 11d
-        where value is:-
-                1       -- Enabled
-                0       -- Disabled
-                2       -- Get
-
-
-
-
-tpccfg
-        Enables or disables automatic transmit power control.
-
-        The first parameter turns this feature on (1) or off (0).  When turning
-        on, the user must also supply four more parameters in the following
-        order:
-                -UseSNR (Use SNR (in addition to PER) for TPC algorithm),
-                -P0 (P0 power level for TPC),
-                -P1 (P1 power level for TPC),
-                -P2 (P2 power level for TPC).
-
-        Usage:
-                iwpriv ethX tpccfg: Get current configuration
-                iwpriv ethX tpccfg 0: disable auto TPC
-                iwpriv ethX tpccfg 0x01 0x00 0x05 0x0a 0x0d: enable auto TPC; do not use SNR;
-                                                             P0=0x05; P1=0x0a; P2=0x0d;
-                iwpriv ethX tpccfg 0x01 0x01 0x05 0x0a 0x0d: enable auto TPC; use SNR;
-                                                             P0=0x05; P1=0x0a; P2=0x0d.
-
-powercfg
-        Enables or disables power adaptation.
-
-        The first parameter turns this feature on (1) or off (0).  When turning
-        on, the user must also supply three more parameters in the following
-        order:
-                -P0 (P0 power level for Power Adaptation),
-                -P1 (P1 power level for Power Adaptation),
-                -P2 (P2 power level for Power Adaptation).
-
-        Usage:
-                iwpriv ethX powercfg: Get current configuration
-                iwpriv ethX powercfg 0: disable power adaptation
-                iwpriv ethX powercfg 1 0x0d 0x0f 0x12: enable power adaptation;
-                                                       P0=0x0d; P1=0x0f; P2=0x12.
-
-getafc
-        This command returns automatic frequency control parameters.  It returns
-        three integers:
-                -P0: automatic is on (1), or off (0),
-                -P1: current timing offset in PPM (part per million), and
-                -P2: current frequency offset in PPM.
-
-setafc
-        Set automatic frequency control options.
-
-        The first parameter turns automatic on (1) or off (0).
-        The user must supply two more parameters in either case, in the following
-  order:
-
-  When auto is on:
-
-                -P0 (automatic adjustment frequency threshold in PPM),
-                -P1 (automatic adjustment period in beacon period),
-
-  When auto is off:
-
-                -P0 (manual adjustment timing offset in PPM), and
-                -P1 (manual adjustment frequency offset in PPM).
-
-        Usage:
-                iwpriv ethX setafc 0 10 10: manual adjustment, both timing and frequcncy
-    offset are 10 PPM.
-
-                iwpriv ethX setafc 1 10 10 enable afc, automatic adjustment,
-    frequency threshold 10 PPM, for every 10 beacon periods.
-
-
-
-scanprobes
-        This command sets number of probe requests per channel.
-
-        Usage:
-                iwpriv ethX scanprobes 3 (set scan probes to 3)
-                iwpriv ethX scanprobes   (get scan probes)
-
-lolisteninter
-        This command sets the value of listen interval.
-
-        Usage:
-        iwpriv ethX lolisteninter 234 (set the lolisteninter to 234)
-        iwpriv ethX lolisteninter     (get the lolisteninter value)
-
-rateadapt
-        This command sets the data rates bitmap.
-        Where <n>
-                0: Disable auto rate adapt
-                1: Enable auto rate adapt
-
-              <m>
-                 data rate bitmap
-                        Bit     Data rate
-                        0       1 Mbps
-                        1       2 Mbps
-                        2       5.5 Mbps
-                        3       11 Mbps
-                        4       Reserved
-                        5       6 Mbps
-                        6       9 Mbps
-                        7       12 Mbps
-                        8       18 Mbps
-                        9       24 Mbps
-                        10      36 Mbps
-                        11      48 Mbps
-                        12      54 Mbps
-                        12-15   Reserved
-
-        Usage:
-        iwpriv ethX rateadapt
-                        read the currect data rate setting
-        iwpriv ethX rateadapt 1 0x07
-                        enable auto data rate adapt and
-                        data rates are 1Mbps, 2Mbsp and 5.5Mbps
-
-
-txcontrol
-        This command is used to set the Tx rate, ack policy, and retry limit on a per packet basis.
-
-        Where value <n> is:
-            if bit[4] == 1:
-                bit[3:0]        -- 0   1   2   3   4   5   6   7   8   9   10   11   12   13-16
-                Data Rate(Mbps) -- 1   2   5.5 11  Rsv 6   9   12  18  24  36   48   54   Rsv
-
-            bit[12:8]
-                if bit[12] == 1, bit[11:8] specifies the Tx retry limit.
-
-            bit[14:13] specifies per packet ack policy:
-                bit[14:13]
-                     1  0       use immediate ack policy for this packet
-                     1  1       use no ack policy for this packet
-                     0  x       use the per-packet ack policy setting
-
-        Usage:
-        iwpriv ethX txcontrol 0x7513
-                        Use no-ack policy, 5 retires for Tx, 11Mbps rate
-
-
-
-psnullinterval
-        This command is used to set/request NULL package interval for Power Save
-        under infrastructure mode.
-
-        where value is:-
-                -1      -- Disabled
-                n>0     -- Set interval as n (seconds)
-
-prescan
-        This command is used to enable (1)/disable(0) auto prescan before assoicate to the ap
-
-        where value is:-
-                0       -- Disabled
-                1       -- Enabled
-                2       -- Get
-
-getrxinfo
-        This command gets non average value of Signal to Noise Ratio of Data and rate index.
-
-        The following table shows RateIndex and Rate
-
-                     RateIndex  Data rate
-                        0       1 Mbps
-                        1       2 Mbps
-                        2       5.5 Mbps
-                        3       11 Mbps
-                        4       Reserved
-                        5       6 Mbps
-                        6       9 Mbps
-                        7       12 Mbps
-                        8       18 Mbps
-                        9       24 Mbps
-                        10      36 Mbps
-                        11      48 Mbps
-                        12      54 Mbps
-                        13-15   Reserved
-
-gettxrate
-        This command gets current Tx rate index of the first packet associated with Rate Adaptation.
-
-        The following table shows RateIndex and Rate
-
-                     RateIndex  Data rate
-                        0       1 Mbps
-                        1       2 Mbps
-                        2       5.5 Mbps
-                        3       11 Mbps
-                        4       Reserved
-                        5       6 Mbps
-                        6       9 Mbps
-                        7       12 Mbps
-                        8       18 Mbps
-                        9       24 Mbps
-                        10      36 Mbps
-                        11      48 Mbps
-                        12      54 Mbps
-                        13-15   Reserved
-
-bcninterval
-        This command is used to sets beacon interval in adhoc mode when an argument is given, and gets current adhoc
-        beacon interval when no argument is given. The valid beacon interval is between 20 - 1000,
-        default beacon interval is 100.
-
-        Usage:
-                iwpriv ethX bcninterval 100  (set adhoc beacon interval to 100)
-                iwpriv ethX bcninterval      (get adhoc beacon interval)
-
 fwt_add
         This command is used to insert an entry into the FWT table. The list of
         parameters must follow the following structure:
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index b55c7f57aca8..c260bd1b3d46 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -23,13 +23,13 @@ static int assoc_helper_essid(wlan_private *priv,
         ENTER();
 
         lbs_pr_debug(1, "New SSID requested: %s\n", assoc_req->ssid.ssid);
-        if (assoc_req->mode == wlan802_11infrastructure) {
+        if (assoc_req->mode == IW_MODE_INFRA) {
                 if (adapter->prescan) {
                         libertas_send_specific_SSID_scan(priv, &assoc_req->ssid, 1);
                 }
 
                 i = libertas_find_SSID_in_list(adapter, &assoc_req->ssid,
-                                NULL, wlan802_11infrastructure);
+                                NULL, IW_MODE_INFRA);
                 if (i >= 0) {
                         lbs_pr_debug(1,
                                "SSID found in scan list ... associating...\n");
@@ -44,7 +44,7 @@ static int assoc_helper_essid(wlan_private *priv,
                         lbs_pr_debug(1, "SSID '%s' not found; cannot associate\n",
                                 assoc_req->ssid.ssid);
                 }
-        } else if (assoc_req->mode == wlan802_11ibss) {
+        } else if (assoc_req->mode == IW_MODE_ADHOC) {
                 /* Scan for the network, do not save previous results.  Stale
                  *   scan data will cause us to join a non-existant adhoc network
                  */
@@ -52,7 +52,7 @@ static int assoc_helper_essid(wlan_private *priv,
 
                 /* Search for the requested SSID in the scan table */
                 i = libertas_find_SSID_in_list(adapter, &assoc_req->ssid, NULL,
-                                wlan802_11ibss);
+                                IW_MODE_ADHOC);
                 if (i >= 0) {
                         lbs_pr_debug(1, "SSID found at %d in List, so join\n", ret);
                         libertas_join_adhoc_network(priv, &adapter->scantable[i]);
@@ -90,10 +90,10 @@ static int assoc_helper_bssid(wlan_private *priv,
                 goto out;
         }
 
-        if (assoc_req->mode == wlan802_11infrastructure) {
+        if (assoc_req->mode == IW_MODE_INFRA) {
                 ret = wlan_associate(priv, &adapter->scantable[i]);
                 lbs_pr_debug(1, "ASSOC: return from wlan_associate(bssd) was %d\n", ret);
-        } else if (assoc_req->mode == wlan802_11ibss) {
+        } else if (assoc_req->mode == IW_MODE_ADHOC) {
                 libertas_join_adhoc_network(priv, &adapter->scantable[i]);
         }
         memcpy(&assoc_req->ssid, &adapter->scantable[i].ssid,
@@ -142,23 +142,23 @@ static int assoc_helper_mode(wlan_private *priv,
 
         ENTER();
 
-        if (assoc_req->mode == adapter->inframode) {
+        if (assoc_req->mode == adapter->mode) {
                 LEAVE();
                 return 0;
         }
 
-        if (assoc_req->mode == wlan802_11infrastructure) {
+        if (assoc_req->mode == IW_MODE_INFRA) {
                 if (adapter->psstate != PS_STATE_FULL_POWER)
                         libertas_ps_wakeup(priv, cmd_option_waitforrsp);
                 adapter->psmode = wlan802_11powermodecam;
         }
 
-        adapter->inframode = assoc_req->mode;
+        adapter->mode = assoc_req->mode;
         ret = libertas_prepare_and_send_command(priv,
                                     cmd_802_11_snmp_mib,
                                     0, cmd_option_waitforrsp,
                                     OID_802_11_INFRASTRUCTURE_MODE,
-                                    (void *) assoc_req->mode);
+                                    (void *) (size_t) assoc_req->mode);
 
         LEAVE();
         return ret;
@@ -196,7 +196,7 @@ static int assoc_helper_wep_keys(wlan_private *priv,
                 goto out;
 
         /* enable/disable the MAC's WEP packet filter */
-        if (assoc_req->secinfo.WEPstatus == wlan802_11WEPenabled)
+        if (assoc_req->secinfo.wep_enabled)
                 adapter->currentpacketfilter |= cmd_act_mac_wep_enable;
         else
                 adapter->currentpacketfilter &= ~cmd_act_mac_wep_enable;
@@ -300,8 +300,7 @@ static int should_deauth_infrastructure(wlan_adapter *adapter,
         }
 
         if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
-                if (adapter->secinfo.authmode !=
-                    assoc_req->secinfo.authmode) {
+                if (adapter->secinfo.auth_mode != assoc_req->secinfo.auth_mode) {
                         lbs_pr_debug(1, "Deauthenticating due to updated security "
                                 "info in configuration request.\n");
                         return 1;
@@ -316,7 +315,7 @@ static int should_deauth_infrastructure(wlan_adapter *adapter,
 
         /* FIXME: deal with 'auto' mode somehow */
         if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
-                if (assoc_req->mode != wlan802_11infrastructure)
+                if (assoc_req->mode != IW_MODE_INFRA)
                         return 1;
         }
 
@@ -333,12 +332,12 @@ static int should_stop_adhoc(wlan_adapter *adapter,
         if (adapter->curbssparams.ssid.ssidlength != assoc_req->ssid.ssidlength)
                 return 1;
         if (memcmp(adapter->curbssparams.ssid.ssid, assoc_req->ssid.ssid,
-                        sizeof(struct WLAN_802_11_SSID)))
+                        adapter->curbssparams.ssid.ssidlength))
                 return 1;
 
         /* FIXME: deal with 'auto' mode somehow */
         if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
-                if (assoc_req->mode != wlan802_11ibss)
+                if (assoc_req->mode != IW_MODE_ADHOC)
                         return 1;
         }
 
@@ -382,7 +381,7 @@ void wlan_association_worker(struct work_struct *work)
         }
 
         if (find_any_ssid) {
-                enum WLAN_802_11_NETWORK_INFRASTRUCTURE new_mode;
+                u8 new_mode;
 
                 ret = libertas_find_best_network_SSID(priv, &assoc_req->ssid,
                                 assoc_req->mode, &new_mode);
@@ -393,7 +392,7 @@ void wlan_association_worker(struct work_struct *work)
                 }
 
                 /* Ensure we switch to the mode of the AP */
-                if (assoc_req->mode == wlan802_11autounknown) {
+                if (assoc_req->mode == IW_MODE_AUTO) {
                         set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
                         assoc_req->mode = new_mode;
                 }
@@ -403,7 +402,7 @@ void wlan_association_worker(struct work_struct *work)
          * Check if the attributes being changing require deauthentication
          * from the currently associated infrastructure access point.
          */
-        if (adapter->inframode == wlan802_11infrastructure) {
+        if (adapter->mode == IW_MODE_INFRA) {
                 if (should_deauth_infrastructure(adapter, assoc_req)) {
                         ret = libertas_send_deauthentication(priv);
                         if (ret) {
@@ -412,7 +411,7 @@ void wlan_association_worker(struct work_struct *work)
                                         ret);
                         }
                 }
-        } else if (adapter->inframode == wlan802_11ibss) {
+        } else if (adapter->mode == IW_MODE_ADHOC) {
                 if (should_stop_adhoc(adapter, assoc_req)) {
                         ret = libertas_stop_adhoc_network(priv);
                         if (ret) {
@@ -543,7 +542,7 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter)
                 assoc_req->channel = adapter->curbssparams.channel;
 
         if (!test_bit(ASSOC_FLAG_MODE, &assoc_req->flags))
-                assoc_req->mode = adapter->inframode;
+                assoc_req->mode = adapter->mode;
 
         if (!test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
                 memcpy(&assoc_req->bssid, adapter->curbssparams.bssid,
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index bfdac58b5c06..de9cb46a70ff 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -381,15 +381,16 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
         switch (cmd_oid) {
         case OID_802_11_INFRASTRUCTURE_MODE:
         {
-                enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode =
-                        (enum WLAN_802_11_NETWORK_INFRASTRUCTURE) pdata_buf;
+                u8 mode = (u8) (size_t) pdata_buf;
                 pSNMPMIB->querytype = cpu_to_le16(cmd_act_set);
                 pSNMPMIB->oid = cpu_to_le16((u16) desired_bsstype_i);
                 pSNMPMIB->bufsize = sizeof(u8);
-                if (mode == wlan802_11infrastructure)
-                        ucTemp = SNMP_MIB_VALUE_INFRA;
-                else
+                if (mode == IW_MODE_ADHOC) {
                         ucTemp = SNMP_MIB_VALUE_ADHOC;
+                } else {
+                        /* Infra and Auto modes */
+                        ucTemp = SNMP_MIB_VALUE_INFRA;
+                }
 
                 memmove(pSNMPMIB->value, &ucTemp, sizeof(u8));
 
@@ -947,8 +948,8 @@ void libertas_queue_cmd(wlan_adapter * adapter, struct cmd_ctrl_node *cmdnode, u
 
         spin_unlock_irqrestore(&adapter->driver_lock, flags);
 
-        lbs_pr_debug(1, "QUEUE_CMD: Inserted node=0x%x, cmd=0x%x in cmdpendingq\n",
-               (u32) cmdnode,
+        lbs_pr_debug(1, "QUEUE_CMD: Inserted node=%p, cmd=0x%x in cmdpendingq\n",
+               cmdnode,
                ((struct cmd_ds_gen*)cmdnode->bufvirtualaddr)->command);
 
 done:
@@ -976,8 +977,8 @@ static int DownloadcommandToStation(wlan_private * priv,
         ENTER();
 
         if (!adapter || !cmdnode) {
-                lbs_pr_debug(1, "DNLD_CMD: adapter = %#x, cmdnode = %#x\n",
-                       (int)adapter, (int)cmdnode);
+                lbs_pr_debug(1, "DNLD_CMD: adapter = %p, cmdnode = %p\n",
+                       adapter, cmdnode);
                 if (cmdnode) {
                         spin_lock_irqsave(&adapter->driver_lock, flags);
                         __libertas_cleanup_and_insert_cmd(priv, cmdnode);
@@ -1174,8 +1175,8 @@ int libertas_prepare_and_send_command(wlan_private * priv,
 
         cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
 
-        lbs_pr_debug(1, "PREP_CMD: Val of cmd ptr =0x%x, command=0x%X\n",
-               (u32) cmdptr, cmd_no);
+        lbs_pr_debug(1, "PREP_CMD: Val of cmd ptr=%p, command=0x%X\n",
+               cmdptr, cmd_no);
 
         if (!cmdptr) {
                 lbs_pr_debug(1, "PREP_CMD: bufvirtualaddr of cmdnode is NULL\n");
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index cdb012c7e9cf..c86454034b58 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -72,8 +72,6 @@ void libertas_mac_event_disconnected(wlan_private * priv)
         adapter->secinfo.WPAenabled = 0;
         adapter->secinfo.WPA2enabled = 0;
         adapter->wpa_ie_len = 0;
-        adapter->secinfo.auth1xalg = WLAN_1X_AUTH_ALG_NONE;
-        adapter->secinfo.Encryptionmode = CIPHER_NONE;
 
         adapter->connect_status = libertas_disconnected;
 
@@ -811,7 +809,7 @@ int libertas_process_rx_command(wlan_private * priv)
                 if (result) {
                         lbs_pr_debug(1, "CMD_RESP: PS command failed- %#x \n",
                                resp->result);
-                        if (adapter->inframode == wlan802_11ibss) {
+                        if (adapter->mode == IW_MODE_ADHOC) {
                                 /*
                                  * We should not re-try enter-ps command in
                                  * ad-hoc mode. It takes place in
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 51dfd202f558..7d7bc5e86a56 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -7,6 +7,7 @@
 #include "dev.h"
 #include "decl.h"
 #include "host.h"
+#include "debugfs.h"
 
 static struct dentry *libertas_dir = NULL;
 static char *szStates[] = {
@@ -276,7 +277,7 @@ static void libertas_parse_ssid(char *buf, size_t count,
         if (!end)
                 end = buf + count - 1;
 
-        size = min(IW_ESSID_MAX_SIZE, end - hold);
+        size = min((size_t)IW_ESSID_MAX_SIZE, (size_t) (end - hold));
         strncpy(scan_cfg->specificSSID, hold, size);
 
         return;
@@ -1648,7 +1649,7 @@ struct libertas_debugfs_files {
         struct file_operations fops;
 };
 
-struct libertas_debugfs_files debugfs_files[] = {
+static struct libertas_debugfs_files debugfs_files[] = {
         { "info", 0444, FOPS(libertas_dev_info, write_file_dummy), },
         { "getscantable", 0444, FOPS(libertas_getscantable,
                                         write_file_dummy), },
@@ -1658,7 +1659,7 @@ struct libertas_debugfs_files debugfs_files[] = {
         { "setuserscan", 0600, FOPS(NULL, libertas_setuserscan), },
 };
 
-struct libertas_debugfs_files debugfs_events_files[] = {
+static struct libertas_debugfs_files debugfs_events_files[] = {
         {"low_rssi", 0644, FOPS(libertas_lowrssi_read,
                                 libertas_lowrssi_write), },
         {"low_snr", 0644, FOPS(libertas_lowsnr_read,
@@ -1673,7 +1674,7 @@ struct libertas_debugfs_files debugfs_events_files[] = {
                                 libertas_highsnr_write), },
 };
 
-struct libertas_debugfs_files debugfs_regs_files[] = {
+static struct libertas_debugfs_files debugfs_regs_files[] = {
         {"rdmac", 0644, FOPS(libertas_rdmac_read, libertas_rdmac_write), },
         {"wrmac", 0600, FOPS(NULL, libertas_wrmac_write), },
         {"rdbbp", 0644, FOPS(libertas_rdbbp_read, libertas_rdbbp_write), },
@@ -1778,7 +1779,7 @@ void libertas_debugfs_remove_one(wlan_private *priv)
 struct debug_data {
         char name[32];
         u32 size;
-        u32 addr;
+        size_t addr;
 };
 
 /* To debug any member of wlan_adapter, simply add one line here.
@@ -1825,6 +1826,8 @@ static ssize_t wlan_debugfs_read(struct file *file, char __user *userbuf,
                         val = *((u16 *) d[i].addr);
                 else if (d[i].size == 4)
                         val = *((u32 *) d[i].addr);
+                else if (d[i].size == 8)
+                        val = *((u64 *) d[i].addr);
 
                 pos += sprintf(p + pos, "%s=%d\n", d[i].name, val);
         }
@@ -1844,7 +1847,7 @@ static ssize_t wlan_debugfs_read(struct file *file, char __user *userbuf,
  *  @param data    data to write
  *  @return        number of data
  */
-static int wlan_debugfs_write(struct file *f, const char __user *buf,
+static ssize_t wlan_debugfs_write(struct file *f, const char __user *buf,
                             size_t cnt, loff_t *ppos)
 {
         int r, i;
@@ -1886,12 +1889,14 @@ static int wlan_debugfs_write(struct file *f, const char __user *buf,
                                 *((u16 *) d[i].addr) = (u16) r;
                         else if (d[i].size == 4)
                                 *((u32 *) d[i].addr) = (u32) r;
+                        else if (d[i].size == 8)
+                                *((u64 *) d[i].addr) = (u64) r;
                         break;
                 } while (1);
         }
         kfree(pdata);
 
-        return cnt;
+        return (ssize_t)cnt;
 }
 
 static struct file_operations libertas_debug_fops = {
@@ -1916,20 +1921,10 @@ void libertas_debug_init(wlan_private * priv, struct net_device *dev)
                 return;
 
         for (i = 0; i < num_of_items; i++)
-                items[i].addr += (u32) priv->adapter;
+                items[i].addr += (size_t) priv->adapter;
 
         priv->debugfs_debug = debugfs_create_file("debug", 0644,
                                                   priv->debugfs_dir, &items[0],
                                                   &libertas_debug_fops);
 }
 
-/**
- *  @brief remove proc file
- *
- *  @param priv    pointer wlan_private
- *  @return        N/A
- */
-void libertas_debug_remove(wlan_private * priv)
-{
-        debugfs_remove(priv->debugfs_debug);
-}
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index fb1478c1b87d..80dd9ea19c8e 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -9,6 +9,11 @@
 
 extern unsigned int libertas_debug;
 
+#ifdef CONFIG_LIBERTAS_DEBUG
+#define DEBUG
+#define PROC_DEBUG
+#endif
+
 #define DRV_NAME                "usb8xxx"
 
 #define lbs_pr_info(format, args...) \
@@ -223,31 +228,6 @@ enum SNRNF_DATA {
         MAX_TYPE_AVG
 };
 
-/** WLAN_802_11_AUTH_ALG*/
-enum WLAN_802_11_AUTH_ALG {
-        AUTH_ALG_OPEN_SYSTEM = 1,
-        AUTH_ALG_SHARED_KEY = 2,
-        AUTH_ALG_NETWORK_EAP = 8,
-};
-
-/** WLAN_802_1X_AUTH_ALG */
-enum WLAN_802_1X_AUTH_ALG {
-        WLAN_1X_AUTH_ALG_NONE = 1,
-        WLAN_1X_AUTH_ALG_LEAP = 2,
-        WLAN_1X_AUTH_ALG_TLS = 4,
-        WLAN_1X_AUTH_ALG_TTLS = 8,
-        WLAN_1X_AUTH_ALG_MD5 = 16,
-};
-
-/** WLAN_802_11_ENCRYPTION_MODE */
-enum WLAN_802_11_ENCRYPTION_MODE {
-        CIPHER_NONE,
-        CIPHER_WEP40,
-        CIPHER_TKIP,
-        CIPHER_CCMP,
-        CIPHER_WEP104,
-};
-
 /** WLAN_802_11_POWER_MODE */
 enum WLAN_802_11_POWER_MODE {
         wlan802_11powermodecam,
@@ -292,28 +272,6 @@ enum mv_ms_type {
         MVMS_EVENT
 };
 
-/** WLAN_802_11_NETWORK_INFRASTRUCTURE */
-enum WLAN_802_11_NETWORK_INFRASTRUCTURE {
-        wlan802_11ibss,
-        wlan802_11infrastructure,
-        wlan802_11autounknown,
-        /*defined as upper bound */
-        wlan802_11infrastructuremax
-};
-
-/** WLAN_802_11_AUTHENTICATION_MODE */
-enum WLAN_802_11_AUTHENTICATION_MODE {
-        wlan802_11authmodeopen = 0x00,
-        wlan802_11authmodeshared = 0x01,
-        wlan802_11authmodenetworkEAP = 0x80,
-};
-
-/** WLAN_802_11_WEP_STATUS */
-enum WLAN_802_11_WEP_STATUS {
-        wlan802_11WEPenabled,
-        wlan802_11WEPdisabled,
-};
-
 /** SNMP_MIB_INDEX_e */
 enum SNMP_MIB_INDEX_e {
         desired_bsstype_i = 0,
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index b1f876f9693b..e8b9020f9bd6 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -10,6 +10,7 @@
 #include <linux/wireless.h>
 #include <linux/ethtool.h>
 #include <linux/debugfs.h>
+#include <net/ieee80211.h>
 
 #include "defs.h"
 #include "scan.h"
@@ -56,10 +57,8 @@ struct region_channel {
 struct wlan_802_11_security {
         u8 WPAenabled;
         u8 WPA2enabled;
-        enum WLAN_802_11_WEP_STATUS WEPstatus;
-        enum WLAN_802_11_AUTHENTICATION_MODE authmode;
-        enum WLAN_802_1X_AUTH_ALG auth1xalg;
-        enum WLAN_802_11_ENCRYPTION_MODE Encryptionmode;
+        u8 wep_enabled;
+        u8 auth_mode;
 };
 
 /** Current Basic Service Set State Structure */
@@ -184,7 +183,7 @@ struct assoc_request {
 
         struct WLAN_802_11_SSID ssid;
         u8 channel;
-        enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode;
+        u8 mode;
         u8 bssid[ETH_ALEN];
 
         /** WEP keys */
@@ -198,7 +197,6 @@ struct assoc_request {
         struct wlan_802_11_security secinfo;
 
         /** WPA Information Elements*/
-#define MAX_WPA_IE_LEN 64
         u8 wpa_ie[MAX_WPA_IE_LEN];
         u8 wpa_ie_len;
 };
@@ -254,7 +252,8 @@ struct _wlan_adapter {
         /** current ssid/bssid related parameters*/
         struct current_bss_params curbssparams;
 
-        enum WLAN_802_11_NETWORK_INFRASTRUCTURE inframode;
+        /* IW_MODE_* */
+        u8 mode;
 
         struct bss_descriptor *pattemptedbssdesc;
 
@@ -339,7 +338,6 @@ struct _wlan_adapter {
         struct WLAN_802_11_KEY wpa_unicast_key;
 
         /** WPA Information Elements*/
-#define MAX_WPA_IE_LEN 64
         u8 wpa_ie[MAX_WPA_IE_LEN];
         u8 wpa_ie_len;
 
diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c
index b194a4570791..441123c85e62 100644
--- a/drivers/net/wireless/libertas/fw.c
+++ b/drivers/net/wireless/libertas/fw.c
@@ -194,16 +194,13 @@ static void wlan_init_adapter(wlan_private * priv)
         adapter->scanmode = cmd_bss_type_any;
 
         /* 802.11 specific */
-        adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;
+        adapter->secinfo.wep_enabled = 0;
         for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);
              i++)
                 memset(&adapter->wep_keys[i], 0, sizeof(struct WLAN_802_11_KEY));
         adapter->wep_tx_keyidx = 0;
-        adapter->secinfo.WEPstatus = wlan802_11WEPdisabled;
-        adapter->secinfo.authmode = wlan802_11authmodeopen;
-        adapter->secinfo.auth1xalg = WLAN_1X_AUTH_ALG_NONE;
-        adapter->secinfo.Encryptionmode = CIPHER_NONE;
-        adapter->inframode = wlan802_11infrastructure;
+        adapter->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
+        adapter->mode = IW_MODE_INFRA;
 
         adapter->assoc_req = NULL;
 
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 695fb6a66ffe..ae6f72a6cdf3 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -388,7 +388,7 @@ static int __if_usb_submit_rx_urb(wlan_private * priv,
         usb_fill_bulk_urb(cardp->rx_urb, cardp->udev,
                           usb_rcvbulkpipe(cardp->udev,
                                           cardp->bulk_in_endpointAddr),
-                          skb->tail + IPFIELD_ALIGN_OFFSET,
+                          (void *) (skb->tail + (size_t) IPFIELD_ALIGN_OFFSET),
                           MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn,
                           rinfo);
 
@@ -626,6 +626,7 @@ static void if_usb_receive(struct urb *urb)
                             cardp->usb_event_cause);
                 if (cardp->usb_event_cause & 0xffff0000) {
                         libertas_send_tx_feedback(priv);
+                        spin_unlock(&priv->adapter->driver_lock);
                         break;
                 }
                 cardp->usb_event_cause = le32_to_cpu(cardp->usb_event_cause) << 3;
@@ -775,7 +776,6 @@ restart:
                 return -1;
         }
 
-#ifdef SUPPORT_BOOT_COMMAND
         cardp->bootcmdresp = 0;
         do {
                 int j = 0;
@@ -796,7 +796,6 @@ restart:
                 }
                 return -1;
         }
-#endif
 
         i = 0;
         priv->adapter->fw_ready = 0;
diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index 785116720bc6..170dfe6809f5 100644
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -12,7 +12,6 @@
 #define USB8388_VID_2   0x05a3
 #define USB8388_PID_2   0x8388
 
-#ifdef SUPPORT_BOOT_COMMAND
 #define BOOT_CMD_FW_BY_USB     0x01
 #define BOOT_CMD_FW_IN_EEPROM  0x02
 #define BOOT_CMD_UPDATE_BOOT2  0x03
@@ -36,7 +35,6 @@ struct bootcmdrespStr
         u8  u8result;
         u8  au8dumy[2];
 };
-#endif /* SUPPORT_BOOT_COMMAND */
 
 /* read callback private data */
 struct read_cb_info {
diff --git a/drivers/net/wireless/libertas/ioctl.c b/drivers/net/wireless/libertas/ioctl.c
index 82b39642423a..a8f76c358992 100644
--- a/drivers/net/wireless/libertas/ioctl.c
+++ b/drivers/net/wireless/libertas/ioctl.c
@@ -27,95 +27,6 @@
 
 #define WAIT_FOR_SCAN_RRESULT_MAX_TIME (10 * HZ)
 
-static int setrxantenna(wlan_private * priv, int mode)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-
-        if (mode != RF_ANTENNA_1 && mode != RF_ANTENNA_2
-            && mode != RF_ANTENNA_AUTO) {
-                return -EINVAL;
-        }
-
-        adapter->rxantennamode = mode;
-
-        lbs_pr_debug(1, "SET RX Antenna mode to 0x%04x\n", adapter->rxantennamode);
-
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                    cmd_act_set_rx,
-                                    cmd_option_waitforrsp, 0,
-                                    &adapter->rxantennamode);
-        return ret;
-}
-
-static int settxantenna(wlan_private * priv, int mode)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-
-        if ((mode != RF_ANTENNA_1) && (mode != RF_ANTENNA_2)
-            && (mode != RF_ANTENNA_AUTO)) {
-                return -EINVAL;
-        }
-
-        adapter->txantennamode = mode;
-
-        lbs_pr_debug(1, "SET TX Antenna mode to 0x%04x\n", adapter->txantennamode);
-
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                    cmd_act_set_tx,
-                                    cmd_option_waitforrsp, 0,
-                                    &adapter->txantennamode);
-
-        return ret;
-}
-
-static int getrxantenna(wlan_private * priv, char *buf)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-
-        // clear it, so we will know if the value
-        // returned below is correct or not.
-        adapter->rxantennamode = 0;
-
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                    cmd_act_get_rx,
-                                    cmd_option_waitforrsp, 0, NULL);
-
-        if (ret) {
-                LEAVE();
-                return ret;
-        }
-
-        lbs_pr_debug(1, "Get Rx Antenna mode:0x%04x\n", adapter->rxantennamode);
-
-        return sprintf(buf, "0x%04x", adapter->rxantennamode) + 1;
-}
-
-static int gettxantenna(wlan_private * priv, char *buf)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-
-        // clear it, so we will know if the value
-        // returned below is correct or not.
-        adapter->txantennamode = 0;
-
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_rf_antenna,
-                                    cmd_act_get_tx,
-                                    cmd_option_waitforrsp, 0, NULL);
-
-        if (ret) {
-                LEAVE();
-                return ret;
-        }
-
-        lbs_pr_debug(1, "Get Tx Antenna mode:0x%04x\n", adapter->txantennamode);
-
-        return sprintf(buf, "0x%04x", adapter->txantennamode) + 1;
-}
-
 static int wlan_set_region(wlan_private * priv, u16 region_code)
 {
         int i;
@@ -144,998 +55,6 @@ static int wlan_set_region(wlan_private * priv, u16 region_code)
         return 0;
 }
 
-/**
- *  @brief Get/Set Firmware wakeup method
- *
- *  @param priv         A pointer to wlan_private structure
- *  @param wrq          A pointer to user data
- *  @return             0--success, otherwise fail
- */
-static int wlan_txcontrol(wlan_private * priv, struct iwreq *wrq)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int data;
-        ENTER();
-
-        if ((int)wrq->u.data.length == 0) {
-                if (copy_to_user
-                    (wrq->u.data.pointer, &adapter->pkttxctrl, sizeof(u32))) {
-                        lbs_pr_alert("copy_to_user failed!\n");
-                        return -EFAULT;
-                }
-        } else {
-                if ((int)wrq->u.data.length > 1) {
-                        lbs_pr_alert("ioctl too many args!\n");
-                        return -EFAULT;
-                }
-                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
-                        lbs_pr_alert("Copy from user failed\n");
-                        return -EFAULT;
-                }
-
-                adapter->pkttxctrl = (u32) data;
-        }
-
-        wrq->u.data.length = 1;
-
-        LEAVE();
-        return 0;
-}
-
-/**
- *  @brief Get/Set NULL Package generation interval
- *
- *  @param priv         A pointer to wlan_private structure
- *  @param wrq          A pointer to user data
- *  @return             0--success, otherwise fail
- */
-static int wlan_null_pkt_interval(wlan_private * priv, struct iwreq *wrq)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int data;
-        ENTER();
-
-        if ((int)wrq->u.data.length == 0) {
-                data = adapter->nullpktinterval;
-
-                if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
-                        lbs_pr_alert( "copy_to_user failed!\n");
-                        return -EFAULT;
-                }
-        } else {
-                if ((int)wrq->u.data.length > 1) {
-                        lbs_pr_alert( "ioctl too many args!\n");
-                        return -EFAULT;
-                }
-                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
-                        lbs_pr_debug(1, "Copy from user failed\n");
-                        return -EFAULT;
-                }
-
-                adapter->nullpktinterval = data;
-        }
-
-        wrq->u.data.length = 1;
-
-        LEAVE();
-        return 0;
-}
-
-static int wlan_get_rxinfo(wlan_private * priv, struct iwreq *wrq)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int data[2];
-        ENTER();
-        data[0] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
-        data[1] = adapter->rxpd_rate;
-        if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 2)) {
-                lbs_pr_debug(1, "Copy to user failed\n");
-                return -EFAULT;
-        }
-        wrq->u.data.length = 2;
-        LEAVE();
-        return 0;
-}
-
-static int wlan_get_snr(wlan_private * priv, struct iwreq *wrq)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-        int data[4];
-
-        ENTER();
-        memset(data, 0, sizeof(data));
-        if (wrq->u.data.length) {
-                if (copy_from_user(data, wrq->u.data.pointer,
-                     min_t(size_t, wrq->u.data.length, 4) * sizeof(int)))
-                        return -EFAULT;
-        }
-        if ((wrq->u.data.length == 0) || (data[0] == 0) || (data[0] == 1)) {
-                if (adapter->connect_status == libertas_connected) {
-                        ret = libertas_prepare_and_send_command(priv,
-                                                    cmd_802_11_rssi,
-                                                    0,
-                                                    cmd_option_waitforrsp,
-                                                    0, NULL);
-
-                        if (ret) {
-                                LEAVE();
-                                return ret;
-                        }
-                }
-        }
-
-        if (wrq->u.data.length == 0) {
-                data[0] = adapter->SNR[TYPE_BEACON][TYPE_NOAVG];
-                data[1] = adapter->SNR[TYPE_BEACON][TYPE_AVG];
-                data[2] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
-                data[3] = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 4))
-                        return -EFAULT;
-                wrq->u.data.length = 4;
-        } else if (data[0] == 0) {
-                data[0] = adapter->SNR[TYPE_BEACON][TYPE_NOAVG];
-                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                        return -EFAULT;
-                wrq->u.data.length = 1;
-        } else if (data[0] == 1) {
-                data[0] = adapter->SNR[TYPE_BEACON][TYPE_AVG];
-                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                        return -EFAULT;
-                wrq->u.data.length = 1;
-        } else if (data[0] == 2) {
-                data[0] = adapter->SNR[TYPE_RXPD][TYPE_NOAVG];
-                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                        return -EFAULT;
-                wrq->u.data.length = 1;
-        } else if (data[0] == 3) {
-                data[0] = adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int)))
-                        return -EFAULT;
-                wrq->u.data.length = 1;
-        } else
-                return -ENOTSUPP;
-
-        LEAVE();
-        return 0;
-}
-
-static int wlan_beacon_interval(wlan_private * priv, struct iwreq *wrq)
-{
-        int data;
-        wlan_adapter *adapter = priv->adapter;
-
-        if (wrq->u.data.length > 0) {
-                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int)))
-                        return -EFAULT;
-
-                lbs_pr_debug(1, "WLAN SET BEACON INTERVAL: %d\n", data);
-                if ((data > MRVDRV_MAX_BEACON_INTERVAL)
-                    || (data < MRVDRV_MIN_BEACON_INTERVAL))
-                        return -ENOTSUPP;
-                adapter->beaconperiod = data;
-        }
-        data = adapter->beaconperiod;
-        if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int)))
-                return -EFAULT;
-
-        wrq->u.data.length = 1;
-
-        return 0;
-}
-
-static int wlan_get_rssi(wlan_private * priv, struct iwreq *wrq)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-        int temp;
-        int data = 0;
-        int *val;
-
-        ENTER();
-        data = SUBCMD_DATA(wrq);
-        if ((data == 0) || (data == 1)) {
-                ret = libertas_prepare_and_send_command(priv,
-                                            cmd_802_11_rssi,
-                                            0, cmd_option_waitforrsp,
-                                            0, NULL);
-                if (ret) {
-                        LEAVE();
-                        return ret;
-                }
-        }
-
-        switch (data) {
-        case 0:
-
-                temp = CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
-                                adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
-                break;
-        case 1:
-                temp = CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_AVG],
-                                adapter->NF[TYPE_BEACON][TYPE_AVG]);
-                break;
-        case 2:
-                temp = CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_NOAVG],
-                                adapter->NF[TYPE_RXPD][TYPE_NOAVG]);
-                break;
-        case 3:
-                temp = CAL_RSSI(adapter->SNR[TYPE_RXPD][TYPE_AVG] / AVG_SCALE,
-                                adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE);
-                break;
-        default:
-                return -ENOTSUPP;
-        }
-        val = (int *)wrq->u.name;
-        *val = temp;
-
-        LEAVE();
-        return 0;
-}
-
-static int wlan_get_nf(wlan_private * priv, struct iwreq *wrq)
-{
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-        int temp;
-        int data = 0;
-        int *val;
-
-        data = SUBCMD_DATA(wrq);
-        if ((data == 0) || (data == 1)) {
-                ret = libertas_prepare_and_send_command(priv,
-                                            cmd_802_11_rssi,
-                                            0, cmd_option_waitforrsp,
-                                            0, NULL);
-
-                if (ret) {
-                        LEAVE();
-                        return ret;
-                }
-        }
-
-        switch (data) {
-        case 0:
-                temp = adapter->NF[TYPE_BEACON][TYPE_NOAVG];
-                break;
-        case 1:
-                temp = adapter->NF[TYPE_BEACON][TYPE_AVG];
-                break;
-        case 2:
-                temp = adapter->NF[TYPE_RXPD][TYPE_NOAVG];
-                break;
-        case 3:
-                temp = adapter->NF[TYPE_RXPD][TYPE_AVG] / AVG_SCALE;
-                break;
-        default:
-                return -ENOTSUPP;
-        }
-
-        temp = CAL_NF(temp);
-
-        lbs_pr_debug(1, "%s: temp = %d\n", __FUNCTION__, temp);
-        val = (int *)wrq->u.name;
-        *val = temp;
-        return 0;
-}
-
-static int wlan_get_txrate_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int *pdata;
-        struct iwreq *wrq = (struct iwreq *)req;
-        int ret = 0;
-        adapter->txrate = 0;
-        lbs_pr_debug(1, "wlan_get_txrate_ioctl\n");
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_tx_rate_query,
-                                    cmd_act_get, cmd_option_waitforrsp,
-                                    0, NULL);
-        if (ret)
-                return ret;
-
-        pdata = (int *)wrq->u.name;
-        *pdata = (int)adapter->txrate;
-        return 0;
-}
-
-static int wlan_get_adhoc_status_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        char status[64];
-        wlan_adapter *adapter = priv->adapter;
-
-        memset(status, 0, sizeof(status));
-
-        switch (adapter->inframode) {
-        case wlan802_11ibss:
-                if (adapter->connect_status == libertas_connected) {
-                        if (adapter->adhoccreate)
-                                memcpy(&status, "AdhocStarted", sizeof(status));
-                        else
-                                memcpy(&status, "AdhocJoined", sizeof(status));
-                } else {
-                        memcpy(&status, "AdhocIdle", sizeof(status));
-                }
-                break;
-        case wlan802_11infrastructure:
-                memcpy(&status, "Inframode", sizeof(status));
-                break;
-        default:
-                memcpy(&status, "AutoUnknownmode", sizeof(status));
-                break;
-        }
-
-        lbs_pr_debug(1, "status = %s\n", status);
-        wrq->u.data.length = strlen(status) + 1;
-
-        if (wrq->u.data.pointer) {
-                if (copy_to_user(wrq->u.data.pointer,
-                                 &status, wrq->u.data.length))
-                        return -EFAULT;
-        }
-
-        LEAVE();
-        return 0;
-}
-
-/**
- *  @brief Set/Get WPA IE
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                  A pointer to ifreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_setwpaie_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        struct iwreq *wrq = (struct iwreq *)req;
-        wlan_adapter *adapter = priv->adapter;
-        int ret = 0;
-
-        ENTER();
-
-        if (wrq->u.data.length) {
-                if (wrq->u.data.length > sizeof(adapter->wpa_ie)) {
-                        lbs_pr_debug(1, "failed to copy WPA IE, too big \n");
-                        return -EFAULT;
-                }
-                if (copy_from_user(adapter->wpa_ie, wrq->u.data.pointer,
-                                   wrq->u.data.length)) {
-                        lbs_pr_debug(1, "failed to copy WPA IE \n");
-                        return -EFAULT;
-                }
-                adapter->wpa_ie_len = wrq->u.data.length;
-                lbs_pr_debug(1, "Set wpa_ie_len=%d IE=%#x\n", adapter->wpa_ie_len,
-                       adapter->wpa_ie[0]);
-                lbs_dbg_hex("wpa_ie", adapter->wpa_ie, adapter->wpa_ie_len);
-                if (adapter->wpa_ie[0] == WPA_IE)
-                        adapter->secinfo.WPAenabled = 1;
-                else if (adapter->wpa_ie[0] == WPA2_IE)
-                        adapter->secinfo.WPA2enabled = 1;
-                else {
-                        adapter->secinfo.WPAenabled = 0;
-                        adapter->secinfo.WPA2enabled = 0;
-                }
-        } else {
-                memset(adapter->wpa_ie, 0, sizeof(adapter->wpa_ie));
-                adapter->wpa_ie_len = wrq->u.data.length;
-                lbs_pr_debug(1, "Reset wpa_ie_len=%d IE=%#x\n",
-                       adapter->wpa_ie_len, adapter->wpa_ie[0]);
-                adapter->secinfo.WPAenabled = 0;
-                adapter->secinfo.WPA2enabled = 0;
-        }
-
-        // enable/disable RSN in firmware if WPA is enabled/disabled
-        // depending on variable adapter->secinfo.WPAenabled is set or not
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_enable_rsn,
-                                    cmd_act_set, cmd_option_waitforrsp,
-                                    0, NULL);
-
-        LEAVE();
-        return ret;
-}
-
-/**
- *  @brief Set Auto prescan
- *  @param priv                 A pointer to wlan_private structure
- *  @param wrq                  A pointer to iwreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_subcmd_setprescan_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        int data;
-        wlan_adapter *adapter = priv->adapter;
-        int *val;
-
-        data = SUBCMD_DATA(wrq);
-        lbs_pr_debug(1, "WLAN_SUBCMD_SET_PRESCAN %d\n", data);
-        adapter->prescan = data;
-
-        val = (int *)wrq->u.name;
-        *val = data;
-        return 0;
-}
-
-static int wlan_set_multiple_dtim_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        struct iwreq *wrq = (struct iwreq *)req;
-        u32 mdtim;
-        int idata;
-        int ret = -EINVAL;
-
-        ENTER();
-
-        idata = SUBCMD_DATA(wrq);
-        mdtim = (u32) idata;
-        if (((mdtim >= MRVDRV_MIN_MULTIPLE_DTIM)
-             && (mdtim <= MRVDRV_MAX_MULTIPLE_DTIM))
-            || (mdtim == MRVDRV_IGNORE_MULTIPLE_DTIM)) {
-                priv->adapter->multipledtim = mdtim;
-                ret = 0;
-        }
-        if (ret)
-                lbs_pr_debug(1, "Invalid parameter, multipledtim not changed.\n");
-
-        LEAVE();
-        return ret;
-}
-
-/**
- *  @brief Set authentication mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                  A pointer to ifreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_setauthalg_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        int alg;
-        struct iwreq *wrq = (struct iwreq *)req;
-        wlan_adapter *adapter = priv->adapter;
-
-        if (wrq->u.data.flags == 0) {
-                //from iwpriv subcmd
-                alg = SUBCMD_DATA(wrq);
-        } else {
-                //from wpa_supplicant subcmd
-                if (copy_from_user(&alg, wrq->u.data.pointer, sizeof(alg))) {
-                        lbs_pr_debug(1, "Copy from user failed\n");
-                        return -EFAULT;
-                }
-        }
-
-        lbs_pr_debug(1, "auth alg is %#x\n", alg);
-
-        switch (alg) {
-        case AUTH_ALG_SHARED_KEY:
-                adapter->secinfo.authmode = wlan802_11authmodeshared;
-                break;
-        case AUTH_ALG_NETWORK_EAP:
-                adapter->secinfo.authmode =
-                    wlan802_11authmodenetworkEAP;
-                break;
-        case AUTH_ALG_OPEN_SYSTEM:
-        default:
-                adapter->secinfo.authmode = wlan802_11authmodeopen;
-                break;
-        }
-        return 0;
-}
-
-/**
- *  @brief Set 802.1x authentication mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                  A pointer to ifreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_set8021xauthalg_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        int alg;
-        struct iwreq *wrq = (struct iwreq *)req;
-
-        if (wrq->u.data.flags == 0) {
-                //from iwpriv subcmd
-                alg = SUBCMD_DATA(wrq);
-        } else {
-                //from wpa_supplicant subcmd
-                if (copy_from_user(&alg, wrq->u.data.pointer, sizeof(int))) {
-                        lbs_pr_debug(1, "Copy from user failed\n");
-                        return -EFAULT;
-                }
-        }
-        lbs_pr_debug(1, "802.1x auth alg is %#x\n", alg);
-        priv->adapter->secinfo.auth1xalg = alg;
-        return 0;
-}
-
-static int wlan_setencryptionmode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        int mode;
-        struct iwreq *wrq = (struct iwreq *)req;
-
-        ENTER();
-
-        if (wrq->u.data.flags == 0) {
-                //from iwpriv subcmd
-                mode = SUBCMD_DATA(wrq);
-        } else {
-                //from wpa_supplicant subcmd
-                if (copy_from_user(&mode, wrq->u.data.pointer, sizeof(int))) {
-                        lbs_pr_debug(1, "Copy from user failed\n");
-                        return -EFAULT;
-                }
-        }
-        lbs_pr_debug(1, "encryption mode is %#x\n", mode);
-        priv->adapter->secinfo.Encryptionmode = mode;
-
-        LEAVE();
-        return 0;
-}
-
-static void adjust_mtu(wlan_private * priv)
-{
-        int mtu_increment = 0;
-
-        if (priv->adapter->linkmode == WLAN_LINKMODE_802_11)
-                mtu_increment += sizeof(struct ieee80211_hdr_4addr);
-
-        if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP)
-                mtu_increment += max(sizeof(struct tx_radiotap_hdr),
-                                     sizeof(struct rx_radiotap_hdr));
-        priv->wlan_dev.netdev->mtu = ETH_FRAME_LEN
-            - sizeof(struct ethhdr)
-            + mtu_increment;
-}
-
-/**
- *  @brief Set Link-Layer Layer mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                  A pointer to ifreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_set_linkmode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        int mode;
-
-        mode = (int)((struct ifreq *)((u8 *) req + 4))->ifr_data;
-
-        switch (mode) {
-        case WLAN_LINKMODE_802_3:
-                priv->adapter->linkmode = mode;
-                break;
-        case WLAN_LINKMODE_802_11:
-                priv->adapter->linkmode = mode;
-                break;
-        default:
-                lbs_pr_info("usb8388-5: invalid link-layer mode (%#x)\n",
-                       mode);
-                return -EINVAL;
-                break;
-        }
-        lbs_pr_debug(1, "usb8388-5: link-layer mode is %#x\n", mode);
-
-        adjust_mtu(priv);
-
-        return 0;
-}
-
-/**
- *  @brief Set Radio header mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                  A pointer to ifreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_set_radiomode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        int mode;
-
-        mode = (int)((struct ifreq *)((u8 *) req + 4))->ifr_data;
-
-        switch (mode) {
-        case WLAN_RADIOMODE_NONE:
-                priv->adapter->radiomode = mode;
-                break;
-        case WLAN_RADIOMODE_RADIOTAP:
-                priv->adapter->radiomode = mode;
-                break;
-        default:
-                lbs_pr_debug(1, "usb8388-5: invalid radio header mode (%#x)\n",
-                       mode);
-                return -EINVAL;
-        }
-        lbs_pr_debug(1, "usb8388-5: radio-header mode is %#x\n", mode);
-
-        adjust_mtu(priv);
-        return 0;
-}
-
-/**
- *  @brief Set Debug header mode
- *  @param priv                 A pointer to wlan_private structure
- *  @param req                  A pointer to ifreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_set_debugmode_ioctl(wlan_private * priv, struct ifreq *req)
-{
-        priv->adapter->debugmode = (int)((struct ifreq *)
-                                         ((u8 *) req + 4))->ifr_data;
-        return 0;
-}
-
-static int wlan_subcmd_getrxantenna_ioctl(wlan_private * priv,
-                                          struct ifreq *req)
-{
-        int len;
-        char buf[8];
-        struct iwreq *wrq = (struct iwreq *)req;
-
-        lbs_pr_debug(1, "WLAN_SUBCMD_GETRXANTENNA\n");
-        len = getrxantenna(priv, buf);
-
-        wrq->u.data.length = len;
-        if (wrq->u.data.pointer) {
-                if (copy_to_user(wrq->u.data.pointer, &buf, len)) {
-                        lbs_pr_debug(1, "CopyToUser failed\n");
-                        return -EFAULT;
-                }
-        }
-
-        return 0;
-}
-
-static int wlan_subcmd_gettxantenna_ioctl(wlan_private * priv,
-                                          struct ifreq *req)
-{
-        int len;
-        char buf[8];
-        struct iwreq *wrq = (struct iwreq *)req;
-
-        lbs_pr_debug(1, "WLAN_SUBCMD_GETTXANTENNA\n");
-        len = gettxantenna(priv, buf);
-
-        wrq->u.data.length = len;
-        if (wrq->u.data.pointer) {
-                if (copy_to_user(wrq->u.data.pointer, &buf, len)) {
-                        lbs_pr_debug(1, "CopyToUser failed\n");
-                        return -EFAULT;
-                }
-        }
-        return 0;
-}
-
-/**
- *  @brief Get the MAC TSF value from the firmware
- *
- *  @param priv         A pointer to wlan_private structure
- *  @param wrq          A pointer to iwreq structure containing buffer
- *                      space to store a TSF value retrieved from the firmware
- *
- *  @return             0 if successful; IOCTL error code otherwise
- */
-static int wlan_get_tsf_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        u64 tsfval;
-        int ret;
-
-        ret = libertas_prepare_and_send_command(priv,
-                                    cmd_get_tsf,
-                                    0, cmd_option_waitforrsp, 0, &tsfval);
-
-        lbs_pr_debug(1, "IOCTL: Get TSF = 0x%016llx\n", tsfval);
-
-        if (ret != 0) {
-                lbs_pr_debug(1, "IOCTL: Get TSF; command exec failed\n");
-                ret = -EFAULT;
-        } else {
-                if (copy_to_user(wrq->u.data.pointer,
-                                 &tsfval,
-                                 min_t(size_t, wrq->u.data.length,
-                                     sizeof(tsfval))) != 0) {
-
-                        lbs_pr_debug(1, "IOCTL: Get TSF; Copy to user failed\n");
-                        ret = -EFAULT;
-                } else {
-                        ret = 0;
-                }
-        }
-        return ret;
-}
-
-/**
- *  @brief Get/Set adapt rate
- *  @param priv                 A pointer to wlan_private structure
- *  @param wrq                  A pointer to iwreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_adapt_rateset(wlan_private * priv, struct iwreq *wrq)
-{
-        int ret;
-        wlan_adapter *adapter = priv->adapter;
-        int data[2];
-
-        memset(data, 0, sizeof(data));
-        if (!wrq->u.data.length) {
-                lbs_pr_debug(1, "Get ADAPT RATE SET\n");
-                ret = libertas_prepare_and_send_command(priv,
-                                            cmd_802_11_rate_adapt_rateset,
-                                            cmd_act_get,
-                                            cmd_option_waitforrsp, 0, NULL);
-                data[0] = adapter->enablehwauto;
-                data[1] = adapter->ratebitmap;
-                if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * 2)) {
-                        lbs_pr_debug(1, "Copy to user failed\n");
-                        return -EFAULT;
-                }
-#define GET_TWO_INT     2
-                wrq->u.data.length = GET_TWO_INT;
-        } else {
-                lbs_pr_debug(1, "Set ADAPT RATE SET\n");
-                if (wrq->u.data.length > 2)
-                        return -EINVAL;
-                if (copy_from_user
-                    (data, wrq->u.data.pointer,
-                     sizeof(int) * wrq->u.data.length)) {
-                        lbs_pr_debug(1, "Copy from user failed\n");
-                        return -EFAULT;
-                }
-
-                adapter->enablehwauto = data[0];
-                adapter->ratebitmap = data[1];
-                ret = libertas_prepare_and_send_command(priv,
-                                            cmd_802_11_rate_adapt_rateset,
-                                            cmd_act_set,
-                                            cmd_option_waitforrsp, 0, NULL);
-        }
-        return ret;
-}
-
-/**
- *  @brief Get/Set inactivity timeout
- *  @param priv                 A pointer to wlan_private structure
- *  @param wrq                  A pointer to iwreq structure
- *  @return                     0 --success, otherwise fail
- */
-static int wlan_inactivity_timeout(wlan_private * priv, struct iwreq *wrq)
-{
-        int ret;
-        int data = 0;
-        u16 timeout = 0;
-
-        ENTER();
-        if (wrq->u.data.length > 1)
-                return -ENOTSUPP;
-
-        if (wrq->u.data.length == 0) {
-                /* Get */
-                ret = libertas_prepare_and_send_command(priv,
-                                            cmd_802_11_inactivity_timeout,
-                                            cmd_act_get,
-                                            cmd_option_waitforrsp, 0,
-                                            &timeout);
-                data = timeout;
-                if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
-                        lbs_pr_debug(1, "Copy to user failed\n");
-                        return -EFAULT;
-                }
-        } else {
-                /* Set */
-                if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
-                        lbs_pr_debug(1, "Copy from user failed\n");
-                        return -EFAULT;
-                }
-
-                timeout = data;
-                ret = libertas_prepare_and_send_command(priv,
-                                            cmd_802_11_inactivity_timeout,
-                                            cmd_act_set,
-                                            cmd_option_waitforrsp, 0,
-                                            &timeout);
-        }
-
-        wrq->u.data.length = 1;
-
-        LEAVE();
-        return ret;
-}
-
-static int wlan_do_getlog_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        int ret;
-        char buf[GETLOG_BUFSIZE - 1];
-        wlan_adapter *adapter = priv->adapter;
-
-        lbs_pr_debug(1, " GET STATS\n");
-
-        ret = libertas_prepare_and_send_command(priv, cmd_802_11_get_log,
-                                    0, cmd_option_waitforrsp, 0, NULL);
-
-        if (ret) {
-                return ret;
-        }
-
-        if (wrq->u.data.pointer) {
-                sprintf(buf, "\n  mcasttxframe %u failed %u retry %u "
-                        "multiretry %u framedup %u "
-                        "rtssuccess %u rtsfailure %u ackfailure %u\n"
-                        "rxfrag %u mcastrxframe %u fcserror %u "
-                        "txframe %u wepundecryptable %u ",
-                        adapter->logmsg.mcasttxframe,
-                        adapter->logmsg.failed,
-                        adapter->logmsg.retry,
-                        adapter->logmsg.multiretry,
-                        adapter->logmsg.framedup,
-                        adapter->logmsg.rtssuccess,
-                        adapter->logmsg.rtsfailure,
-                        adapter->logmsg.ackfailure,
-                        adapter->logmsg.rxfrag,
-                        adapter->logmsg.mcastrxframe,
-                        adapter->logmsg.fcserror,
-                        adapter->logmsg.txframe,
-                        adapter->logmsg.wepundecryptable);
-                wrq->u.data.length = strlen(buf) + 1;
-                if (copy_to_user(wrq->u.data.pointer, buf, wrq->u.data.length)) {
-                        lbs_pr_debug(1, "Copy to user failed\n");
-                        return -EFAULT;
-                }
-        }
-
-        return 0;
-}
-
-static int wlan_scan_type_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        u8 buf[12];
-        u8 *option[] = { "active", "passive", "get", };
-        int i, max_options = (sizeof(option) / sizeof(option[0]));
-        int ret = 0;
-        wlan_adapter *adapter = priv->adapter;
-
-        if (priv->adapter->enable11d) {
-                lbs_pr_debug(1, "11D: Cannot set scantype when 11D enabled\n");
-                return -EFAULT;
-        }
-
-        memset(buf, 0, sizeof(buf));
-
-        if (copy_from_user(buf, wrq->u.data.pointer, min_t(size_t, sizeof(buf),
-                                                         wrq->u.data.length)))
-                return -EFAULT;
-
-        lbs_pr_debug(1, "Scan type Option = %s\n", buf);
-
-        buf[sizeof(buf) - 1] = '\0';
-
-        for (i = 0; i < max_options; i++) {
-                if (!strcmp(buf, option[i]))
-                        break;
-        }
-
-        switch (i) {
-        case 0:
-                adapter->scantype = cmd_scan_type_active;
-                break;
-        case 1:
-                adapter->scantype = cmd_scan_type_passive;
-                break;
-        case 2:
-                wrq->u.data.length = strlen(option[adapter->scantype]) + 1;
-
-                if (copy_to_user(wrq->u.data.pointer,
-                                 option[adapter->scantype],
-                                 wrq->u.data.length)) {
-                        lbs_pr_debug(1, "Copy to user failed\n");
-                        ret = -EFAULT;
-                }
-
-                break;
-        default:
-                lbs_pr_debug(1, "Invalid Scan type Ioctl Option\n");
-                ret = -EINVAL;
-                break;
-        }
-
-        return ret;
-}
-
-static int wlan_scan_mode_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        wlan_adapter *adapter = priv->adapter;
-        u8 buf[12];
-        u8 *option[] = { "bss", "ibss", "any", "get" };
-        int i, max_options = (sizeof(option) / sizeof(option[0]));
-        int ret = 0;
-
-        ENTER();
-
-        memset(buf, 0, sizeof(buf));
-
-        if (copy_from_user(buf, wrq->u.data.pointer, min_t(size_t, sizeof(buf),
-                                                         wrq->u.data.length))) {
-                lbs_pr_debug(1, "Copy from user failed\n");
-                return -EFAULT;
-        }
-
-        lbs_pr_debug(1, "Scan mode Option = %s\n", buf);
-
-        buf[sizeof(buf) - 1] = '\0';
-
-        for (i = 0; i < max_options; i++) {
-                if (!strcmp(buf, option[i]))
-                        break;
-        }
-
-        switch (i) {
-
-        case 0:
-                adapter->scanmode = cmd_bss_type_bss;
-                break;
-        case 1:
-                adapter->scanmode = cmd_bss_type_ibss;
-                break;
-        case 2:
-                adapter->scanmode = cmd_bss_type_any;
-                break;
-        case 3:
-
-                wrq->u.data.length = strlen(option[adapter->scanmode - 1]) + 1;
-
-                lbs_pr_debug(1, "Get Scan mode Option = %s\n",
-                       option[adapter->scanmode - 1]);
-
-                lbs_pr_debug(1, "Scan mode length %d\n", wrq->u.data.length);
-
-                if (copy_to_user(wrq->u.data.pointer,
-                                 option[adapter->scanmode - 1],
-                                 wrq->u.data.length)) {
-                        lbs_pr_debug(1, "Copy to user failed\n");
-                        ret = -EFAULT;
-                }
-                lbs_pr_debug(1, "GET Scan type Option after copy = %s\n",
-                       (char *)wrq->u.data.pointer);
-
-                break;
-
-        default:
-                lbs_pr_debug(1, "Invalid Scan mode Ioctl Option\n");
-                ret = -EINVAL;
-                break;
-        }
-
-        LEAVE();
-        return ret;
-}
-
-/**
- *  @brief Get/Set Adhoc G Rate
- *
- *  @param priv         A pointer to wlan_private structure
- *  @param wrq          A pointer to user data
- *  @return             0--success, otherwise fail
- */
-static int wlan_do_set_grate_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int data, data1;
-        int *val;
-
-        ENTER();
-
-        data1 = SUBCMD_DATA(wrq);
-        switch (data1) {
-        case 0:
-                adapter->adhoc_grate_enabled = 0;
-                break;
-        case 1:
-                adapter->adhoc_grate_enabled = 1;
-                break;
-        case 2:
-                break;
-        default:
-                return -EINVAL;
-        }
-        data = adapter->adhoc_grate_enabled;
-        val = (int *)wrq->u.name;
-        *val = data;
-        LEAVE();
-        return 0;
-}
-
 static inline int hex2int(char c)
 {
         if (c >= '0' && c <= '9')
@@ -1761,6 +680,7 @@ static int wlan_fwt_list_neighbor_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
 {
+        struct iwreq *wrq = (struct iwreq *)req;
         static struct cmd_ds_fwt_access fwt_access;
         int ret;
 
@@ -1776,7 +696,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
                                     (void *)&fwt_access);
 
         if (ret == 0)
-                req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
+                wrq->u.param.value = le32_to_cpu(fwt_access.references);
         else
                 return -EFAULT;
 
@@ -1792,6 +712,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
 {
+        struct iwreq *wrq = (struct iwreq *)req;
         static struct cmd_ds_fwt_access fwt_access;
         int ret;
 
@@ -1807,7 +728,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
                                     (void *)&fwt_access);
 
         if (ret == 0)
-                req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
+                wrq->u.param.value = le32_to_cpu(fwt_access.references);
         else
                 return -EFAULT;
 
@@ -1823,6 +744,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
 {
+        struct iwreq *wrq = (struct iwreq *)req;
         struct cmd_ds_mesh_access mesh_access;
         int ret;
 
@@ -1835,9 +757,8 @@ static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
                                     cmd_option_waitforrsp, 0,
                                     (void *)&mesh_access);
 
-        if (ret == 0) {
-                req->ifr_data = (char *)(le32_to_cpu(mesh_access.data[0]));
-        }
+        if (ret == 0)
+                wrq->u.param.value = le32_to_cpu(mesh_access.data[0]);
         else
                 return -EFAULT;
 
@@ -1898,36 +819,8 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
         lbs_pr_debug(1, "libertas_do_ioctl: ioctl cmd = 0x%x\n", cmd);
         switch (cmd) {
-        case WLANSCAN_TYPE:
-                lbs_pr_debug(1, "Scan type Ioctl\n");
-                ret = wlan_scan_type_ioctl(priv, wrq);
-                break;
-
         case WLAN_SETNONE_GETNONE:      /* set WPA mode on/off ioctl #20 */
                 switch (wrq->u.data.flags) {
-                case WLANDEAUTH:
-                        lbs_pr_debug(1, "Deauth\n");
-                        libertas_send_deauth(priv);
-                        break;
-
-                case WLANADHOCSTOP:
-                        lbs_pr_debug(1, "Adhoc stop\n");
-                        ret = libertas_do_adhocstop_ioctl(priv);
-                        break;
-
-                case WLANRADIOON:
-                        wlan_radio_ioctl(priv, 1);
-                        break;
-
-                case WLANRADIOOFF:
-                        wlan_radio_ioctl(priv, 0);
-                        break;
-                case WLANWLANIDLEON:
-                        libertas_idle_on(priv);
-                        break;
-                case WLANWLANIDLEOFF:
-                        libertas_idle_off(priv);
-                        break;
                 case WLAN_SUBCMD_BT_RESET:      /* bt_reset */
                         wlan_bt_reset_ioctl(priv);
                         break;
@@ -1937,162 +830,19 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                 }               /* End of switch */
                 break;
 
-        case WLANSETWPAIE:
-                ret = wlan_setwpaie_ioctl(priv, req);
-                break;
-        case WLAN_SETINT_GETINT:
-                /* The first 4 bytes of req->ifr_data is sub-ioctl number
-                 * after 4 bytes sits the payload.
-                 */
-                subcmd = (int)req->ifr_data;    //from iwpriv subcmd
-                switch (subcmd) {
-                case WLANNF:
-                        ret = wlan_get_nf(priv, wrq);
-                        break;
-                case WLANRSSI:
-                        ret = wlan_get_rssi(priv, wrq);
-                        break;
-                case WLANENABLE11D:
-                        ret = libertas_cmd_enable_11d(priv, wrq);
-                        break;
-                case WLANADHOCGRATE:
-                        ret = wlan_do_set_grate_ioctl(priv, wrq);
-                        break;
-                case WLAN_SUBCMD_SET_PRESCAN:
-                        ret = wlan_subcmd_setprescan_ioctl(priv, wrq);
-                        break;
-                }
-                break;
-
-        case WLAN_SETONEINT_GETONEINT:
-                switch (wrq->u.data.flags) {
-                case WLAN_BEACON_INTERVAL:
-                        ret = wlan_beacon_interval(priv, wrq);
-                        break;
-
-                case WLAN_LISTENINTRVL:
-                        if (!wrq->u.data.length) {
-                                int data;
-                                lbs_pr_debug(1, "Get locallisteninterval value\n");
-#define GET_ONE_INT     1
-                                data = adapter->locallisteninterval;
-                                if (copy_to_user(wrq->u.data.pointer,
-                                                 &data, sizeof(int))) {
-                                        lbs_pr_debug(1, "Copy to user failed\n");
-                                        return -EFAULT;
-                                }
-
-                                wrq->u.data.length = GET_ONE_INT;
-                        } else {
-                                int data;
-                                if (copy_from_user
-                                    (&data, wrq->u.data.pointer, sizeof(int))) {
-                                        lbs_pr_debug(1, "Copy from user failed\n");
-                                        return -EFAULT;
-                                }
-
-                                lbs_pr_debug(1, "Set locallisteninterval = %d\n",
-                                       data);
-#define MAX_U16_VAL     65535
-                                if (data > MAX_U16_VAL) {
-                                        lbs_pr_debug(1, "Exceeds U16 value\n");
-                                        return -EINVAL;
-                                }
-                                adapter->locallisteninterval = data;
-                        }
-                        break;
-                case WLAN_TXCONTROL:
-                        ret = wlan_txcontrol(priv, wrq);        //adds for txcontrol ioctl
-                        break;
-
-                case WLAN_NULLPKTINTERVAL:
-                        ret = wlan_null_pkt_interval(priv, wrq);
-                        break;
-
-                default:
-                        ret = -EOPNOTSUPP;
-                        break;
-                }
-                break;
-
         case WLAN_SETONEINT_GETNONE:
                 /* The first 4 bytes of req->ifr_data is sub-ioctl number
                  * after 4 bytes sits the payload.
                  */
-                subcmd = wrq->u.data.flags;     //from wpa_supplicant subcmd
-
+                subcmd = wrq->u.data.flags;
                 if (!subcmd)
-                        subcmd = (int)req->ifr_data;    //from iwpriv subcmd
+                        subcmd = (int)wrq->u.param.value;
 
                 switch (subcmd) {
-                case WLAN_SUBCMD_SETRXANTENNA:  /* SETRXANTENNA */
-                        idata = SUBCMD_DATA(wrq);
-                        ret = setrxantenna(priv, idata);
-                        break;
-                case WLAN_SUBCMD_SETTXANTENNA:  /* SETTXANTENNA */
-                        idata = SUBCMD_DATA(wrq);
-                        ret = settxantenna(priv, idata);
-                        break;
-                case WLAN_SET_ATIM_WINDOW:
-                        adapter->atimwindow = SUBCMD_DATA(wrq);
-                        adapter->atimwindow = min_t(__u16, adapter->atimwindow, 50);
-                        break;
-                case WLANSETBCNAVG:
-                        adapter->bcn_avg_factor = SUBCMD_DATA(wrq);
-                        if (adapter->bcn_avg_factor == 0)
-                                adapter->bcn_avg_factor =
-                                    DEFAULT_BCN_AVG_FACTOR;
-                        if (adapter->bcn_avg_factor > DEFAULT_BCN_AVG_FACTOR)
-                                adapter->bcn_avg_factor =
-                                    DEFAULT_BCN_AVG_FACTOR;
-                        break;
-                case WLANSETDATAAVG:
-                        adapter->data_avg_factor = SUBCMD_DATA(wrq);
-                        if (adapter->data_avg_factor == 0)
-                                adapter->data_avg_factor =
-                                    DEFAULT_DATA_AVG_FACTOR;
-                        if (adapter->data_avg_factor > DEFAULT_DATA_AVG_FACTOR)
-                                adapter->data_avg_factor =
-                                    DEFAULT_DATA_AVG_FACTOR;
-                        break;
                 case WLANSETREGION:
                         idata = SUBCMD_DATA(wrq);
                         ret = wlan_set_region(priv, (u16) idata);
                         break;
-
-                case WLAN_SET_LISTEN_INTERVAL:
-                        idata = SUBCMD_DATA(wrq);
-                        adapter->listeninterval = (u16) idata;
-                        break;
-
-                case WLAN_SET_MULTIPLE_DTIM:
-                        ret = wlan_set_multiple_dtim_ioctl(priv, req);
-                        break;
-
-                case WLANSETAUTHALG:
-                        ret = wlan_setauthalg_ioctl(priv, req);
-                        break;
-
-                case WLANSET8021XAUTHALG:
-                        ret = wlan_set8021xauthalg_ioctl(priv, req);
-                        break;
-
-                case WLANSETENCRYPTIONMODE:
-                        ret = wlan_setencryptionmode_ioctl(priv, req);
-                        break;
-
-                case WLAN_SET_LINKMODE:
-                        ret = wlan_set_linkmode_ioctl(priv, req);
-                        break;
-
-                case WLAN_SET_RADIOMODE:
-                        ret = wlan_set_radiomode_ioctl(priv, req);
-                        break;
-
-                case WLAN_SET_DEBUGMODE:
-                        ret = wlan_set_debugmode_ioctl(priv, req);
-                        break;
-
                 case WLAN_SUBCMD_MESH_SET_TTL:
                         idata = SUBCMD_DATA(wrq);
                         ret = wlan_mesh_set_ttl_ioctl(priv, idata);
@@ -2105,38 +855,8 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
                 break;
 
-        case WLAN_SETNONE_GETTWELVE_CHAR:       /* Get Antenna settings */
-                /*
-                 * We've not used IW_PRIV_TYPE_FIXED so sub-ioctl number is
-                 * in flags of iwreq structure, otherwise it will be in
-                 * mode member of iwreq structure.
-                 */
-                switch ((int)wrq->u.data.flags) {
-                case WLAN_SUBCMD_GETRXANTENNA:  /* Get Rx Antenna */
-                        ret = wlan_subcmd_getrxantenna_ioctl(priv, req);
-                        break;
-
-                case WLAN_SUBCMD_GETTXANTENNA:  /* Get Tx Antenna */
-                        ret = wlan_subcmd_gettxantenna_ioctl(priv, req);
-                        break;
-
-                case WLAN_GET_TSF:
-                        ret = wlan_get_tsf_ioctl(priv, wrq);
-                        break;
-                }
-                break;
-
         case WLAN_SET128CHAR_GET128CHAR:
                 switch ((int)wrq->u.data.flags) {
-
-                case WLANSCAN_MODE:
-                        lbs_pr_debug(1, "Scan mode Ioctl\n");
-                        ret = wlan_scan_mode_ioctl(priv, wrq);
-                        break;
-
-                case WLAN_GET_ADHOC_STATUS:
-                        ret = wlan_get_adhoc_status_ioctl(priv, wrq);
-                        break;
                 case WLAN_SUBCMD_BT_ADD:
                         ret = wlan_bt_add_ioctl(priv, req);
                         break;
@@ -2168,41 +888,11 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                 break;
 
         case WLAN_SETNONE_GETONEINT:
-                switch ((int)req->ifr_data) {
-                case WLANGETBCNAVG:
-                        pdata = (int *)wrq->u.name;
-                        *pdata = (int)adapter->bcn_avg_factor;
-                        break;
-
+                switch (wrq->u.param.value) {
                 case WLANGETREGION:
                         pdata = (int *)wrq->u.name;
                         *pdata = (int)adapter->regioncode;
                         break;
-
-                case WLAN_GET_LISTEN_INTERVAL:
-                        pdata = (int *)wrq->u.name;
-                        *pdata = (int)adapter->listeninterval;
-                        break;
-
-                case WLAN_GET_LINKMODE:
-                        req->ifr_data = (char *)((u32) adapter->linkmode);
-                        break;
-
-                case WLAN_GET_RADIOMODE:
-                        req->ifr_data = (char *)((u32) adapter->radiomode);
-                        break;
-
-                case WLAN_GET_DEBUGMODE:
-                        req->ifr_data = (char *)((u32) adapter->debugmode);
-                        break;
-
-                case WLAN_GET_MULTIPLE_DTIM:
-                        pdata = (int *)wrq->u.name;
-                        *pdata = (int)adapter->multipledtim;
-                        break;
-                case WLAN_GET_TX_RATE:
-                        ret = wlan_get_txrate_ioctl(priv, req);
-                        break;
                 case WLAN_SUBCMD_FWT_CLEANUP:   /* fwt_cleanup */
                         ret = wlan_fwt_cleanup_ioctl(priv, req);
                         break;
@@ -2222,196 +912,8 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
                 break;
 
-        case WLANGETLOG:
-                ret = wlan_do_getlog_ioctl(priv, wrq);
-                break;
-
         case WLAN_SET_GET_SIXTEEN_INT:
                 switch ((int)wrq->u.data.flags) {
-                case WLAN_TPCCFG:
-                        {
-                                int data[5];
-                                struct cmd_ds_802_11_tpc_cfg cfg;
-                                memset(&cfg, 0, sizeof(cfg));
-                                if ((wrq->u.data.length > 1)
-                                    && (wrq->u.data.length != 5))
-                                        return -1;
-
-                                if (wrq->u.data.length == 0) {
-                                        cfg.action =
-                                            cpu_to_le16
-                                            (cmd_act_get);
-                                } else {
-                                        if (copy_from_user
-                                            (data, wrq->u.data.pointer,
-                                             sizeof(int) * 5)) {
-                                                lbs_pr_debug(1,
-                                                       "Copy from user failed\n");
-                                                return -EFAULT;
-                                        }
-
-                                        cfg.action =
-                                            cpu_to_le16
-                                            (cmd_act_set);
-                                        cfg.enable = data[0];
-                                        cfg.usesnr = data[1];
-                                        cfg.P0 = data[2];
-                                        cfg.P1 = data[3];
-                                        cfg.P2 = data[4];
-                                }
-
-                                ret =
-                                    libertas_prepare_and_send_command(priv,
-                                                          cmd_802_11_tpc_cfg,
-                                                          0,
-                                                          cmd_option_waitforrsp,
-                                                          0, (void *)&cfg);
-
-                                data[0] = cfg.enable;
-                                data[1] = cfg.usesnr;
-                                data[2] = cfg.P0;
-                                data[3] = cfg.P1;
-                                data[4] = cfg.P2;
-                                if (copy_to_user
-                                    (wrq->u.data.pointer, data,
-                                     sizeof(int) * 5)) {
-                                        lbs_pr_debug(1, "Copy to user failed\n");
-                                        return -EFAULT;
-                                }
-
-                                wrq->u.data.length = 5;
-                        }
-                        break;
-
-                case WLAN_POWERCFG:
-                        {
-                                int data[4];
-                                struct cmd_ds_802_11_pwr_cfg cfg;
-                                memset(&cfg, 0, sizeof(cfg));
-                                if ((wrq->u.data.length > 1)
-                                    && (wrq->u.data.length != 4))
-                                        return -1;
-                                if (wrq->u.data.length == 0) {
-                                        cfg.action =
-                                            cpu_to_le16
-                                            (cmd_act_get);
-                                } else {
-                                        if (copy_from_user
-                                            (data, wrq->u.data.pointer,
-                                             sizeof(int) * 4)) {
-                                                lbs_pr_debug(1,
-                                                       "Copy from user failed\n");
-                                                return -EFAULT;
-                                        }
-
-                                        cfg.action =
-                                            cpu_to_le16
-                                            (cmd_act_set);
-                                        cfg.enable = data[0];
-                                        cfg.PA_P0 = data[1];
-                                        cfg.PA_P1 = data[2];
-                                        cfg.PA_P2 = data[3];
-                                }
-                                ret =
-                                    libertas_prepare_and_send_command(priv,
-                                                          cmd_802_11_pwr_cfg,
-                                                          0,
-                                                          cmd_option_waitforrsp,
-                                                          0, (void *)&cfg);
-                                data[0] = cfg.enable;
-                                data[1] = cfg.PA_P0;
-                                data[2] = cfg.PA_P1;
-                                data[3] = cfg.PA_P2;
-                                if (copy_to_user
-                                    (wrq->u.data.pointer, data,
-                                     sizeof(int) * 4)) {
-                                        lbs_pr_debug(1, "Copy to user failed\n");
-                                        return -EFAULT;
-                                }
-
-                                wrq->u.data.length = 4;
-                        }
-                        break;
-                case WLAN_AUTO_FREQ_SET:
-                        {
-                                int data[3];
-                                struct cmd_ds_802_11_afc afc;
-                                memset(&afc, 0, sizeof(afc));
-                                if (wrq->u.data.length != 3)
-                                        return -1;
-                                if (copy_from_user
-                                    (data, wrq->u.data.pointer,
-                                     sizeof(int) * 3)) {
-                                        lbs_pr_debug(1, "Copy from user failed\n");
-                                        return -EFAULT;
-                                }
-                                afc.afc_auto = data[0];
-
-                                if (afc.afc_auto != 0) {
-                                        afc.threshold = data[1];
-                                        afc.period = data[2];
-                                } else {
-                                        afc.timing_offset = data[1];
-                                        afc.carrier_offset = data[2];
-                                }
-                                ret =
-                                    libertas_prepare_and_send_command(priv,
-                                                          cmd_802_11_set_afc,
-                                                          0,
-                                                          cmd_option_waitforrsp,
-                                                          0, (void *)&afc);
-                        }
-                        break;
-                case WLAN_AUTO_FREQ_GET:
-                        {
-                                int data[3];
-                                struct cmd_ds_802_11_afc afc;
-                                memset(&afc, 0, sizeof(afc));
-                                ret =
-                                    libertas_prepare_and_send_command(priv,
-                                                          cmd_802_11_get_afc,
-                                                          0,
-                                                          cmd_option_waitforrsp,
-                                                          0, (void *)&afc);
-                                data[0] = afc.afc_auto;
-                                data[1] = afc.timing_offset;
-                                data[2] = afc.carrier_offset;
-                                if (copy_to_user
-                                    (wrq->u.data.pointer, data,
-                                     sizeof(int) * 3)) {
-                                        lbs_pr_debug(1, "Copy to user failed\n");
-                                        return -EFAULT;
-                                }
-
-                                wrq->u.data.length = 3;
-                        }
-                        break;
-                case WLAN_SCANPROBES:
-                        {
-                                int data;
-                                if (wrq->u.data.length > 0) {
-                                        if (copy_from_user
-                                            (&data, wrq->u.data.pointer,
-                                             sizeof(int))) {
-                                                lbs_pr_debug(1,
-                                                       "Copy from user failed\n");
-                                                return -EFAULT;
-                                        }
-
-                                        adapter->scanprobes = data;
-                                } else {
-                                        data = adapter->scanprobes;
-                                        if (copy_to_user
-                                            (wrq->u.data.pointer, &data,
-                                             sizeof(int))) {
-                                                lbs_pr_debug(1,
-                                                       "Copy to user failed\n");
-                                                return -EFAULT;
-                                        }
-                                }
-                                wrq->u.data.length = 1;
-                        }
-                        break;
                 case WLAN_LED_GPIO_CTRL:
                         {
                                 int i;
@@ -2475,17 +977,6 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                                 wrq->u.data.length = gpio->header.len;
                         }
                         break;
-                case WLAN_ADAPT_RATESET:
-                        ret = wlan_adapt_rateset(priv, wrq);
-                        break;
-                case WLAN_INACTIVITY_TIMEOUT:
-                        ret = wlan_inactivity_timeout(priv, wrq);
-                        break;
-                case WLANSNR:
-                        ret = wlan_get_snr(priv, wrq);
-                        break;
-                case WLAN_GET_RXINFO:
-                        ret = wlan_get_rxinfo(priv, wrq);
                 }
                 break;
 
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 11682cbe752b..d4926b83e145 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -15,6 +15,8 @@
 #include "join.h"
 #include "dev.h"
 
+#define AD_HOC_CAP_PRIVACY_ON 1
+
 /**
  *  @brief This function finds out the common rates between rate1 and rate2.
  *
@@ -85,7 +87,7 @@ int libertas_send_deauth(wlan_private * priv)
         wlan_adapter *adapter = priv->adapter;
         int ret = 0;
 
-        if (adapter->inframode == wlan802_11infrastructure &&
+        if (adapter->mode == IW_MODE_INFRA &&
             adapter->connect_status == libertas_connected)
                 ret = libertas_send_deauthentication(priv);
         else
@@ -94,20 +96,6 @@ int libertas_send_deauth(wlan_private * priv)
         return ret;
 }
 
-int libertas_do_adhocstop_ioctl(wlan_private * priv)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int ret = 0;
-
-        if (adapter->inframode == wlan802_11ibss &&
-            adapter->connect_status == libertas_connected)
-                ret = libertas_stop_adhoc_network(priv);
-        else
-                ret = -ENOTSUPP;
-
-        return ret;
-}
-
 /**
  *  @brief Associate to a specific BSS discovered in a scan
  *
@@ -207,8 +195,7 @@ int libertas_join_adhoc_network(wlan_private * priv, struct bss_descriptor * pbs
         /* check if the requested SSID is already joined */
         if (adapter->curbssparams.ssid.ssidlength
             && !libertas_SSID_cmp(&pbssdesc->ssid, &adapter->curbssparams.ssid)
-            && (adapter->curbssparams.bssdescriptor.inframode ==
-                wlan802_11ibss)) {
+            && (adapter->mode == IW_MODE_ADHOC)) {
 
         lbs_pr_debug(1,
                        "ADHOC_J_CMD: New ad-hoc SSID is the same as current, "
@@ -261,130 +248,6 @@ int libertas_send_deauthentication(wlan_private * priv)
 }
 
 /**
- *  @brief Set Idle Off
- *
- *  @param priv         A pointer to wlan_private structure
- *  @return             0 --success, otherwise fail
- */
-int libertas_idle_off(wlan_private * priv)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int ret = 0;
-        const u8 zeromac[] = { 0, 0, 0, 0, 0, 0 };
-        int i;
-
-        ENTER();
-
-        if (adapter->connect_status == libertas_disconnected) {
-                if (adapter->inframode == wlan802_11infrastructure) {
-                        if (memcmp(adapter->previousbssid, zeromac,
-                                   sizeof(zeromac)) != 0) {
-
-                                lbs_pr_debug(1, "Previous SSID = %s\n",
-                                       adapter->previousssid.ssid);
-                                lbs_pr_debug(1, "Previous BSSID = "
-                                       "%02x:%02x:%02x:%02x:%02x:%02x:\n",
-                                       adapter->previousbssid[0],
-                                       adapter->previousbssid[1],
-                                       adapter->previousbssid[2],
-                                       adapter->previousbssid[3],
-                                       adapter->previousbssid[4],
-                                       adapter->previousbssid[5]);
-
-                                i = libertas_find_SSID_in_list(adapter,
-                                                   &adapter->previousssid,
-                                                   adapter->previousbssid,
-                                                   adapter->inframode);
-
-                                if (i < 0) {
-                                        libertas_send_specific_BSSID_scan(priv,
-                                                              adapter->
-                                                              previousbssid,
-                                                              1);
-                                        i = libertas_find_SSID_in_list(adapter,
-                                                           &adapter->
-                                                           previousssid,
-                                                           adapter->
-                                                           previousbssid,
-                                                           adapter->
-                                                           inframode);
-                                }
-
-                                if (i < 0) {
-                                        /* If the BSSID could not be found, try just the SSID */
-                                        i = libertas_find_SSID_in_list(adapter,
-                                                           &adapter->
-                                                           previousssid, NULL,
-                                                           adapter->
-                                                           inframode);
-                                }
-
-                                if (i < 0) {
-                                        libertas_send_specific_SSID_scan(priv,
-                                                             &adapter->
-                                                             previousssid,
-                                                             1);
-                                        i = libertas_find_SSID_in_list(adapter,
-                                                           &adapter->
-                                                           previousssid, NULL,
-                                                           adapter->
-                                                           inframode);
-                                }
-
-                                if (i >= 0) {
-                                        ret =
-                                            wlan_associate(priv,
-                                                           &adapter->
-                                                           scantable[i]);
-                                }
-                        }
-                } else if (adapter->inframode == wlan802_11ibss) {
-                        ret = libertas_prepare_and_send_command(priv,
-                                                    cmd_802_11_ad_hoc_start,
-                                                    0,
-                                                    cmd_option_waitforrsp,
-                                                    0, &adapter->previousssid);
-                }
-        }
-        /* else it is connected */
-
-        lbs_pr_debug(1, "\nwlanidle is off");
-        LEAVE();
-        return ret;
-}
-
-/**
- *  @brief Set Idle On
- *
- *  @param priv         A pointer to wlan_private structure
- *  @return             0 --success, otherwise fail
- */
-int libertas_idle_on(wlan_private * priv)
-{
-        wlan_adapter *adapter = priv->adapter;
-        int ret = 0;
-
-        if (adapter->connect_status == libertas_connected) {
-                if (adapter->inframode == wlan802_11infrastructure) {
-                        lbs_pr_debug(1, "Previous SSID = %s\n",
-                               adapter->previousssid.ssid);
-                        memmove(&adapter->previousssid,
-                                &adapter->curbssparams.ssid,
-                                sizeof(struct WLAN_802_11_SSID));
-                        libertas_send_deauth(priv);
-
-                } else if (adapter->inframode == wlan802_11ibss) {
-                        ret = libertas_stop_adhoc_network(priv);
-                }
-
-        }
-
-        lbs_pr_debug(1, "\nwlanidle is on");
-
-        return ret;
-}
-
-/**
  *  @brief This function prepares command of authenticate.
  *
  *  @param priv      A pointer to wlan_private structure
@@ -398,22 +261,39 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
                                  void *pdata_buf)
 {
         wlan_adapter *adapter = priv->adapter;
-        struct cmd_ds_802_11_authenticate *pauthenticate =
-            &cmd->params.auth;
+        struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;
+        int ret = -1;
         u8 *bssid = pdata_buf;
 
         cmd->command = cpu_to_le16(cmd_802_11_authenticate);
-        cmd->size =
-            cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)
-                             + S_DS_GEN);
+        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_authenticate)
+                                + S_DS_GEN);
+
+        /* translate auth mode to 802.11 defined wire value */
+        switch (adapter->secinfo.auth_mode) {
+        case IW_AUTH_ALG_OPEN_SYSTEM:
+                pauthenticate->authtype = 0x00;
+                break;
+        case IW_AUTH_ALG_SHARED_KEY:
+                pauthenticate->authtype = 0x01;
+                break;
+        case IW_AUTH_ALG_LEAP:
+                pauthenticate->authtype = 0x80;
+                break;
+        default:
+                lbs_pr_debug(1, "AUTH_CMD: invalid auth alg 0x%X\n",
+                             adapter->secinfo.auth_mode);
+                goto out;
+        }
 
-        pauthenticate->authtype = adapter->secinfo.authmode;
         memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
 
         lbs_pr_debug(1, "AUTH_CMD: Bssid is : %x:%x:%x:%x:%x:%x\n",
                bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
+        ret = 0;
 
-        return 0;
+out:
+        return ret;
 }
 
 int libertas_cmd_80211_deauthenticate(wlan_private * priv,
@@ -550,7 +430,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
         lbs_pr_debug(1, "ASSOC_CMD: rates->header.len = %d\n", rates->header.len);
 
         /* set IBSS field */
-        if (pbssdesc->inframode == wlan802_11infrastructure) {
+        if (pbssdesc->mode == IW_MODE_INFRA) {
 #define CAPINFO_ESS_MODE 1
                 passo->capinfo.ess = CAPINFO_ESS_MODE;
         }
@@ -624,7 +504,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
 
         /* set the BSS type */
         adhs->bsstype = cmd_bss_type_ibss;
-        pbssdesc->inframode = wlan802_11ibss;
+        pbssdesc->mode = IW_MODE_ADHOC;
         adhs->beaconperiod = adapter->beaconperiod;
 
         /* set Physical param set */
@@ -666,15 +546,12 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
         adhs->probedelay = cpu_to_le16(cmd_scan_probe_delay_time);
 
         /* set up privacy in adapter->scantable[i] */
-        if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) {
-
-#define AD_HOC_CAP_PRIVACY_ON 1
-                lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus set, privacy to WEP\n");
+        if (adapter->secinfo.wep_enabled) {
+                lbs_pr_debug(1, "ADHOC_S_CMD: WEP enabled, setting privacy on\n");
                 pbssdesc->privacy = wlan802_11privfilter8021xWEP;
                 adhs->cap.privacy = AD_HOC_CAP_PRIVACY_ON;
         } else {
-                lbs_pr_debug(1, "ADHOC_S_CMD: WEPstatus NOT set, Setting "
-                       "privacy to ACCEPT ALL\n");
+                lbs_pr_debug(1, "ADHOC_S_CMD: WEP disabled, setting privacy off\n");
                 pbssdesc->privacy = wlan802_11privfilteracceptall;
         }
 
@@ -786,9 +663,6 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
                padhocjoin->bssdescriptor.BSSID[5],
                padhocjoin->bssdescriptor.SSID);
 
-        lbs_pr_debug(1, "ADHOC_J_CMD: Data Rate = %x\n",
-               (u32) padhocjoin->bssdescriptor.datarates);
-
         /* failtimeout */
         padhocjoin->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
 
@@ -832,7 +706,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
         padhocjoin->bssdescriptor.ssparamset.ibssparamset.atimwindow =
             cpu_to_le16(pbssdesc->atimwindow);
 
-        if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled) {
+        if (adapter->secinfo.wep_enabled) {
                 padhocjoin->bssdescriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON;
         }
 
diff --git a/drivers/net/wireless/libertas/join.h b/drivers/net/wireless/libertas/join.h
index 8efa2455af9a..115f5a8ba346 100644
--- a/drivers/net/wireless/libertas/join.h
+++ b/drivers/net/wireless/libertas/join.h
@@ -1,6 +1,3 @@
-/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
-
 /**
   * Interface for the wlan infrastructure and adhoc join routines
   *
@@ -40,10 +37,6 @@ extern int libertas_ret_80211_disassociate(wlan_private * priv,
 extern int libertas_ret_80211_associate(wlan_private * priv,
                                      struct cmd_ds_command *resp);
 
-extern int libertas_idle_on(wlan_private * priv);
-extern int libertas_idle_off(wlan_private * priv);
-
-extern int libertas_do_adhocstop_ioctl(wlan_private * priv);
 extern int libertas_reassociation_thread(void *data);
 
 struct WLAN_802_11_SSID;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index dcbf102a057e..b9b25ce65919 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -21,6 +21,13 @@
 #include "debugfs.h"
 #include "assoc.h"
 
+#define DRIVER_RELEASE_VERSION "320.p0"
+const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
+#ifdef  DEBUG
+    "-dbg"
+#endif
+    "";
+
 #ifdef ENABLE_PM
 static struct pm_dev *wlan_pm_dev = NULL;
 #endif
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 7e3f78f092dc..d17924f764e5 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -210,7 +210,7 @@ int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *skb)
                 goto done;
         }
 
-        lbs_pr_debug(1, "RX Data: skb->len - sizeof(RxPd) = %d - %d = %d\n",
+        lbs_pr_debug(1, "RX Data: skb->len - sizeof(RxPd) = %d - %zd = %zd\n",
                skb->len, sizeof(struct rxpd), skb->len - sizeof(struct rxpd));
 
         lbs_dbg_hex("RX Data: Dest", p_rx_pkt->eth803_hdr.dest_addr,
@@ -364,7 +364,7 @@ static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb)
                 priv->stats.rx_errors++;
         }
 
-        lbs_pr_debug(1, "RX Data: skb->len - sizeof(RxPd) = %d - %d = %d\n",
+        lbs_pr_debug(1, "RX Data: skb->len - sizeof(RxPd) = %d - %zd = %zd\n",
                skb->len, sizeof(struct rxpd), skb->len - sizeof(struct rxpd));
 
         /* create the exported radio header */
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index e18706238951..3c0b1a2a1727 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -1,6 +1,3 @@
-/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
-
 /**
   * Functions implementing wlan scan IOCTL and firmware command APIs
   *
@@ -87,118 +84,95 @@
  *
  *  @return        Index in scantable, or error code if negative
  */
-static int is_network_compatible(wlan_adapter * adapter, int index, int mode)
+static int is_network_compatible(wlan_adapter * adapter, int index, u8 mode)
 {
         ENTER();
 
-        if (adapter->scantable[index].inframode == mode) {
-                if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+        if (adapter->scantable[index].mode == mode) {
+                if (   !adapter->secinfo.wep_enabled
                     && !adapter->secinfo.WPAenabled
                     && !adapter->secinfo.WPA2enabled
-                    && adapter->scantable[index].wpa_supplicant.wpa_ie[0] !=
-                    WPA_IE
-                    && adapter->scantable[index].wpa2_supplicant.wpa_ie[0] !=
-                    WPA2_IE && adapter->secinfo.Encryptionmode == CIPHER_NONE
+                    && adapter->scantable[index].wpa_ie[0] != WPA_IE
+                    && adapter->scantable[index].rsn_ie[0] != WPA2_IE
                     && !adapter->scantable[index].privacy) {
                         /* no security */
                         LEAVE();
                         return index;
-                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPenabled
+                } else if (   adapter->secinfo.wep_enabled
                            && !adapter->secinfo.WPAenabled
                            && !adapter->secinfo.WPA2enabled
                            && adapter->scantable[index].privacy) {
                         /* static WEP enabled */
                         LEAVE();
                         return index;
-                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                } else if (   !adapter->secinfo.wep_enabled
                            && adapter->secinfo.WPAenabled
                            && !adapter->secinfo.WPA2enabled
-                           && (adapter->scantable[index].wpa_supplicant.
-                               wpa_ie[0]
-                               == WPA_IE)
+                           && (adapter->scantable[index].wpa_ie[0] == WPA_IE)
                            /* privacy bit may NOT be set in some APs like LinkSys WRT54G
                               && adapter->scantable[index].privacy */
                     ) {
                         /* WPA enabled */
-            lbs_pr_debug(1,
+                        lbs_pr_debug(1,
                                "is_network_compatible() WPA: index=%d wpa_ie=%#x "
-                               "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x "
+                               "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s "
                                "privacy=%#x\n", index,
-                               adapter->scantable[index].wpa_supplicant.
-                               wpa_ie[0],
-                               adapter->scantable[index].wpa2_supplicant.
-                               wpa_ie[0],
-                               (adapter->secinfo.WEPstatus ==
-                                wlan802_11WEPenabled) ? "e" : "d",
-                               (adapter->secinfo.WPAenabled) ? "e" : "d",
-                               (adapter->secinfo.WPA2enabled) ? "e" : "d",
-                               adapter->secinfo.Encryptionmode,
+                               adapter->scantable[index].wpa_ie[0],
+                               adapter->scantable[index].rsn_ie[0],
+                               adapter->secinfo.wep_enabled ? "e" : "d",
+                               adapter->secinfo.WPAenabled ? "e" : "d",
+                               adapter->secinfo.WPA2enabled ? "e" : "d",
                                adapter->scantable[index].privacy);
                         LEAVE();
                         return index;
-                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                } else if (   !adapter->secinfo.wep_enabled
                            && !adapter->secinfo.WPAenabled
                            && adapter->secinfo.WPA2enabled
-                           && (adapter->scantable[index].wpa2_supplicant.
-                               wpa_ie[0]
-                               == WPA2_IE)
+                           && (adapter->scantable[index].rsn_ie[0] == WPA2_IE)
                            /* privacy bit may NOT be set in some APs like LinkSys WRT54G
                               && adapter->scantable[index].privacy */
                     ) {
                         /* WPA2 enabled */
-            lbs_pr_debug(1,
+                        lbs_pr_debug(1,
                                "is_network_compatible() WPA2: index=%d wpa_ie=%#x "
-                               "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x "
+                               "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s "
                                "privacy=%#x\n", index,
-                               adapter->scantable[index].wpa_supplicant.
-                               wpa_ie[0],
-                               adapter->scantable[index].wpa2_supplicant.
-                               wpa_ie[0],
-                               (adapter->secinfo.WEPstatus ==
-                                wlan802_11WEPenabled) ? "e" : "d",
-                               (adapter->secinfo.WPAenabled) ? "e" : "d",
-                               (adapter->secinfo.WPA2enabled) ? "e" : "d",
-                               adapter->secinfo.Encryptionmode,
+                               adapter->scantable[index].wpa_ie[0],
+                               adapter->scantable[index].rsn_ie[0],
+                               adapter->secinfo.wep_enabled ? "e" : "d",
+                               adapter->secinfo.WPAenabled ? "e" : "d",
+                               adapter->secinfo.WPA2enabled ? "e" : "d",
                                adapter->scantable[index].privacy);
                         LEAVE();
                         return index;
-                } else if (adapter->secinfo.WEPstatus == wlan802_11WEPdisabled
+                } else if (   !adapter->secinfo.wep_enabled
                            && !adapter->secinfo.WPAenabled
                            && !adapter->secinfo.WPA2enabled
-                           && (adapter->scantable[index].wpa_supplicant.
-                               wpa_ie[0]
-                               != WPA_IE)
-                           && (adapter->scantable[index].wpa2_supplicant.
-                               wpa_ie[0]
-                               != WPA2_IE)
-                           && adapter->secinfo.Encryptionmode != CIPHER_NONE
+                           && (adapter->scantable[index].wpa_ie[0] != WPA_IE)
+                           && (adapter->scantable[index].rsn_ie[0] != WPA2_IE)
                            && adapter->scantable[index].privacy) {
                         /* dynamic WEP enabled */
-            lbs_pr_debug(1,
+                        lbs_pr_debug(1,
                                "is_network_compatible() dynamic WEP: index=%d "
-                               "wpa_ie=%#x wpa2_ie=%#x Encmode=%#x privacy=%#x\n",
+                               "wpa_ie=%#x wpa2_ie=%#x privacy=%#x\n",
                                index,
-                               adapter->scantable[index].wpa_supplicant.
-                               wpa_ie[0],
-                               adapter->scantable[index].wpa2_supplicant.
-                               wpa_ie[0], adapter->secinfo.Encryptionmode,
+                               adapter->scantable[index].wpa_ie[0],
+                               adapter->scantable[index].rsn_ie[0],
                                adapter->scantable[index].privacy);
                         LEAVE();
                         return index;
                 }
 
                 /* security doesn't match */
-        lbs_pr_debug(1,
+                lbs_pr_debug(1,
                        "is_network_compatible() FAILED: index=%d wpa_ie=%#x "
-                       "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s Encmode=%#x privacy=%#x\n",
+                       "wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s privacy=%#x\n",
                        index,
-                       adapter->scantable[index].wpa_supplicant.wpa_ie[0],
-                       adapter->scantable[index].wpa2_supplicant.wpa_ie[0],
-                       (adapter->secinfo.WEPstatus ==
-                        wlan802_11WEPenabled) ? "e" : "d",
-                       (adapter->secinfo.WPAenabled) ? "e" : "d",
-                       (adapter->secinfo.WPA2enabled) ? "e" : "d",
-                       adapter->secinfo.Encryptionmode,
+                       adapter->scantable[index].wpa_ie[0],
+                       adapter->scantable[index].rsn_ie[0],
+                       adapter->secinfo.wep_enabled ? "e" : "d",
+                       adapter->secinfo.WPAenabled ? "e" : "d",
+                       adapter->secinfo.WPA2enabled ? "e" : "d",
                        adapter->scantable[index].privacy);
                 LEAVE();
                 return -ECONNREFUSED;
@@ -924,8 +898,6 @@ static int InterpretBSSDescriptionWithIE(struct bss_descriptor * pBSSEntry,
         u8 founddatarateie;
         int bytesleftforcurrentbeacon;
 
-        struct WPA_SUPPLICANT *pwpa_supplicant;
-        struct WPA_SUPPLICANT *pwpa2_supplicant;
         struct IE_WPA *pIe;
         const u8 oui01[4] = { 0x00, 0x50, 0xf2, 0x01 };
 
@@ -962,9 +934,6 @@ static int InterpretBSSDescriptionWithIE(struct bss_descriptor * pBSSEntry,
 
         bytesleftforcurrentbeacon = beaconsize;
 
-        pwpa_supplicant = &pBSSEntry->wpa_supplicant;
-        pwpa2_supplicant = &pBSSEntry->wpa2_supplicant;
-
         memcpy(pBSSEntry->macaddress, pcurrentptr, ETH_ALEN);
         lbs_pr_debug(1, "InterpretIE: AP MAC Addr-%x:%x:%x:%x:%x:%x\n",
                pBSSEntry->macaddress[0], pBSSEntry->macaddress[1],
@@ -1027,9 +996,9 @@ static int InterpretBSSDescriptionWithIE(struct bss_descriptor * pBSSEntry,
         }
 
         if (pcap->ibss == 1) {
-                pBSSEntry->inframode = wlan802_11ibss;
+                pBSSEntry->mode = IW_MODE_ADHOC;
         } else {
-                pBSSEntry->inframode = wlan802_11infrastructure;
+                pBSSEntry->mode = IW_MODE_INFRA;
         }
 
         /* process variable IE */
@@ -1116,7 +1085,7 @@ static int InterpretBSSDescriptionWithIE(struct bss_descriptor * pBSSEntry,
                             sizeof(pcountryinfo->countrycode)
                             || pcountryinfo->len > 254) {
                                 lbs_pr_debug(1, "InterpretIE: 11D- Err "
-                                       "CountryInfo len =%d min=%d max=254\n",
+                                       "CountryInfo len =%d min=%zd max=254\n",
                                        pcountryinfo->len,
                                        sizeof(pcountryinfo->countrycode));
                                 LEAVE();
@@ -1160,27 +1129,27 @@ static int InterpretBSSDescriptionWithIE(struct bss_descriptor * pBSSEntry,
 #define IE_ID_LEN_FIELDS_BYTES 2
                         pIe = (struct IE_WPA *)pcurrentptr;
 
-                        if (!memcmp(pIe->oui, oui01, sizeof(oui01))) {
-                                pwpa_supplicant->wpa_ie_len
-                                    = min_t(size_t, elemlen + IE_ID_LEN_FIELDS_BYTES,
-                                          sizeof(pwpa_supplicant->wpa_ie));
-                                memcpy(pwpa_supplicant->wpa_ie,
-                                       pcurrentptr,
-                                       pwpa_supplicant->wpa_ie_len);
-                                lbs_dbg_hex("InterpretIE: Resp WPA_IE",
-                                        pwpa_supplicant->wpa_ie, elemlen);
-                        }
+                        if (memcmp(pIe->oui, oui01, sizeof(oui01)))
+                                break;
+
+                        pBSSEntry->wpa_ie_len = min_t(size_t,
+                                elemlen + IE_ID_LEN_FIELDS_BYTES,
+                                sizeof(pBSSEntry->wpa_ie));
+                        memcpy(pBSSEntry->wpa_ie, pcurrentptr,
+                                pBSSEntry->wpa_ie_len);
+                        lbs_dbg_hex("InterpretIE: Resp WPA_IE",
+                                pBSSEntry->wpa_ie, elemlen);
                         break;
                 case WPA2_IE:
                         pIe = (struct IE_WPA *)pcurrentptr;
-                        pwpa2_supplicant->wpa_ie_len
-                            = min_t(size_t, elemlen + IE_ID_LEN_FIELDS_BYTES,
-                                  sizeof(pwpa2_supplicant->wpa_ie));
-                        memcpy(pwpa2_supplicant->wpa_ie,
-                               pcurrentptr, pwpa2_supplicant->wpa_ie_len);
 
+                        pBSSEntry->rsn_ie_len = min_t(size_t,
+                                elemlen + IE_ID_LEN_FIELDS_BYTES,
+                                sizeof(pBSSEntry->rsn_ie));
+                        memcpy(pBSSEntry->rsn_ie, pcurrentptr,
+                                pBSSEntry->rsn_ie_len);
                         lbs_dbg_hex("InterpretIE: Resp WPA2_IE",
-                                pwpa2_supplicant->wpa_ie, elemlen);
+                                pBSSEntry->rsn_ie, elemlen);
                         break;
                 case TIM:
                         break;
@@ -1227,7 +1196,7 @@ int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1, struct WLAN_802_11_SSID *s
  *
  *  @return         index in BSSID list, or error return code (< 0)
  */
-int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, int mode)
+int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, u8 mode)
 {
         int ret = -ENETUNREACH;
         int i;
@@ -1247,8 +1216,8 @@ int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, int mode)
         for (i = 0; ret < 0 && i < adapter->numinscantable; i++) {
                 if (!memcmp(adapter->scantable[i].macaddress, bssid, ETH_ALEN)) {
                         switch (mode) {
-                        case wlan802_11infrastructure:
-                        case wlan802_11ibss:
+                        case IW_MODE_INFRA:
+                        case IW_MODE_ADHOC:
                                 ret = is_network_compatible(adapter, i, mode);
                                 break;
                         default:
@@ -1272,7 +1241,7 @@ int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, int mode)
  *  @return         index in BSSID list
  */
 int libertas_find_SSID_in_list(wlan_adapter * adapter,
-                   struct WLAN_802_11_SSID *ssid, u8 * bssid, int mode)
+                   struct WLAN_802_11_SSID *ssid, u8 * bssid, u8 mode)
 {
         int net = -ENETUNREACH;
         u8 bestrssi = 0;
@@ -1287,8 +1256,8 @@ int libertas_find_SSID_in_list(wlan_adapter * adapter,
                      !memcmp(adapter->scantable[i].
                              macaddress, bssid, ETH_ALEN))) {
                         switch (mode) {
-                        case wlan802_11infrastructure:
-                        case wlan802_11ibss:
+                        case IW_MODE_INFRA:
+                        case IW_MODE_ADHOC:
                                 j = is_network_compatible(adapter, i, mode);
 
                                 if (j >= 0) {
@@ -1311,7 +1280,7 @@ int libertas_find_SSID_in_list(wlan_adapter * adapter,
                                         }
                                 }
                                 break;
-                        case wlan802_11autounknown:
+                        case IW_MODE_AUTO:
                         default:
                                 if (SCAN_RSSI(adapter->scantable[i].rssi)
                                     > bestrssi) {
@@ -1338,8 +1307,7 @@ int libertas_find_SSID_in_list(wlan_adapter * adapter,
  *
  *  @return         index in BSSID list
  */
-int libertas_find_best_SSID_in_list(wlan_adapter * adapter,
-                                    enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode)
+int libertas_find_best_SSID_in_list(wlan_adapter * adapter, u8 mode)
 {
         int bestnet = -ENETUNREACH;
         u8 bestrssi = 0;
@@ -1351,8 +1319,8 @@ int libertas_find_best_SSID_in_list(wlan_adapter * adapter,
 
         for (i = 0; i < adapter->numinscantable; i++) {
                 switch (mode) {
-                case wlan802_11infrastructure:
-                case wlan802_11ibss:
+                case IW_MODE_INFRA:
+                case IW_MODE_ADHOC:
                         if (is_network_compatible(adapter, i, mode) >= 0) {
                                 if (SCAN_RSSI(adapter->scantable[i].rssi) >
                                     bestrssi) {
@@ -1363,7 +1331,7 @@ int libertas_find_best_SSID_in_list(wlan_adapter * adapter,
                                 }
                         }
                         break;
-                case wlan802_11autounknown:
+                case IW_MODE_AUTO:
                 default:
                         if (SCAN_RSSI(adapter->scantable[i].rssi) > bestrssi) {
                                 bestrssi =
@@ -1388,8 +1356,7 @@ int libertas_find_best_SSID_in_list(wlan_adapter * adapter,
  */
 int libertas_find_best_network_SSID(wlan_private * priv,
                                     struct WLAN_802_11_SSID *pSSID,
-                                    enum WLAN_802_11_NETWORK_INFRASTRUCTURE preferred_mode,
-                                    enum WLAN_802_11_NETWORK_INFRASTRUCTURE *out_mode)
+                                    u8 preferred_mode, u8 *out_mode)
 {
         wlan_adapter *adapter = priv->adapter;
         int ret = 0;
@@ -1414,7 +1381,7 @@ int libertas_find_best_network_SSID(wlan_private * priv,
         preqbssid = &adapter->scantable[i];
         memcpy(pSSID, &preqbssid->ssid,
                sizeof(struct WLAN_802_11_SSID));
-        *out_mode = preqbssid->inframode;
+        *out_mode = preqbssid->mode;
 
         if (!pSSID->ssidlength) {
                 ret = -1;
@@ -1584,7 +1551,7 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
         for (i = 0; i < adapter->numinscantable; i++) {
                 if ((current_ev + MAX_SCAN_CELL_SIZE) >= end_buf) {
                         lbs_pr_debug(1, "i=%d break out: current_ev=%p end_buf=%p "
-                               "MAX_SCAN_CELL_SIZE=%d\n",
+                               "MAX_SCAN_CELL_SIZE=%zd\n",
                                i, current_ev, end_buf, MAX_SCAN_CELL_SIZE);
                         break;
                 }
@@ -1632,7 +1599,7 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
 
                 //Add mode
                 iwe.cmd = SIOCGIWMODE;
-                iwe.u.mode = adapter->scantable[i].inframode + 1;
+                iwe.u.mode = adapter->scantable[i].mode;
                 iwe.len = IW_EV_UINT_LEN;
                 current_ev =
                     iwe_stream_add_event(current_ev, end_buf, &iwe, iwe.len);
@@ -1666,7 +1633,7 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
                         iwe.u.qual.noise =
                             CAL_NF(adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
                 }
-                if ((adapter->inframode == wlan802_11ibss) &&
+                if ((adapter->mode == IW_MODE_ADHOC) &&
                     !libertas_SSID_cmp(&adapter->curbssparams.ssid,
                              &adapter->scantable[i].ssid)
                     && adapter->adhoccreate) {
@@ -1731,7 +1698,7 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
                                                  end_buf, &iwe, iwe.len);
 
                 }
-                if ((adapter->scantable[i].inframode == wlan802_11ibss)
+                if ((adapter->scantable[i].mode == IW_MODE_ADHOC)
                     && !libertas_SSID_cmp(&adapter->curbssparams.ssid,
                                 &adapter->scantable[i].ssid)
                     && adapter->adhoccreate) {
@@ -1745,30 +1712,24 @@ int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
                 /* Add new value to event */
                 current_val = current_ev + IW_EV_LCP_LEN;
 
-                if (adapter->scantable[i].wpa2_supplicant.wpa_ie[0] == WPA2_IE) {
+                if (adapter->scantable[i].rsn_ie[0] == WPA2_IE) {
                         memset(&iwe, 0, sizeof(iwe));
                         memset(buf, 0, sizeof(buf));
-                        memcpy(buf, adapter->scantable[i].
-                                                wpa2_supplicant.wpa_ie,
-                                        adapter->scantable[i].wpa2_supplicant.
-                                                wpa_ie_len);
+                        memcpy(buf, adapter->scantable[i].rsn_ie,
+                                        adapter->scantable[i].rsn_ie_len);
                         iwe.cmd = IWEVGENIE;
-                        iwe.u.data.length = adapter->scantable[i].
-                                        wpa2_supplicant.wpa_ie_len;
+                        iwe.u.data.length = adapter->scantable[i].rsn_ie_len;
                         iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
                         current_ev = iwe_stream_add_point(current_ev, end_buf,
                                         &iwe, buf);
                 }
-                if (adapter->scantable[i].wpa_supplicant.wpa_ie[0] == WPA_IE) {
+                if (adapter->scantable[i].wpa_ie[0] == WPA_IE) {
                         memset(&iwe, 0, sizeof(iwe));
                         memset(buf, 0, sizeof(buf));
-                        memcpy(buf, adapter->scantable[i].
-                                                wpa_supplicant.wpa_ie,
-                                        adapter->scantable[i].wpa_supplicant.
-                                                wpa_ie_len);
+                        memcpy(buf, adapter->scantable[i].wpa_ie,
+                                        adapter->scantable[i].wpa_ie_len);
                         iwe.cmd = IWEVGENIE;
-                        iwe.u.data.length = adapter->scantable[i].
-                                        wpa_supplicant.wpa_ie_len;
+                        iwe.u.data.length = adapter->scantable[i].wpa_ie_len;
                         iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
                         current_ev = iwe_stream_add_point(current_ev, end_buf,
                                         &iwe, buf);
diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
index d93aa7fa44fd..405f4f0fe575 100644
--- a/drivers/net/wireless/libertas/scan.h
+++ b/drivers/net/wireless/libertas/scan.h
@@ -1,6 +1,3 @@
-/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
-
 /**
   * Interface for the wlan network scan routines
   *
@@ -10,6 +7,7 @@
 #ifndef _WLAN_SCAN_H
 #define _WLAN_SCAN_H
 
+#include <net/ieee80211.h>
 #include "hostcmd.h"
 
 /**
@@ -155,7 +153,7 @@ struct bss_descriptor {
 
         u32 atimwindow;
 
-        enum WLAN_802_11_NETWORK_INFRASTRUCTURE inframode;
+        u8 mode;
         u8 libertas_supported_rates[WLAN_SUPPORTED_RATES];
 
         int extra_ie;
@@ -170,22 +168,22 @@ struct bss_descriptor {
 
         struct ieeetypes_countryinfofullset countryinfo;
 
-        struct WPA_SUPPLICANT wpa_supplicant;
-        struct WPA_SUPPLICANT wpa2_supplicant;
-
+        u8 wpa_ie[MAX_WPA_IE_LEN];
+        size_t wpa_ie_len;
+        u8 rsn_ie[MAX_WPA_IE_LEN];
+        size_t rsn_ie_len;
 };
 
 extern int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1,
                    struct WLAN_802_11_SSID *ssid2);
 extern int libertas_find_SSID_in_list(wlan_adapter * adapter, struct WLAN_802_11_SSID *ssid,
-                          u8 * bssid, int mode);
-int libertas_find_best_SSID_in_list(wlan_adapter * adapter, enum WLAN_802_11_NETWORK_INFRASTRUCTURE mode);
-extern int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, int mode);
+                          u8 * bssid, u8 mode);
+int libertas_find_best_SSID_in_list(wlan_adapter * adapter, u8 mode);
+extern int libertas_find_BSSID_in_list(wlan_adapter * adapter, u8 * bssid, u8 mode);
 
 int libertas_find_best_network_SSID(wlan_private * priv,
                         struct WLAN_802_11_SSID *pSSID,
-                        enum WLAN_802_11_NETWORK_INFRASTRUCTURE preferred_mode,
-                        enum WLAN_802_11_NETWORK_INFRASTRUCTURE *out_mode);
+                        u8 preferred_mode, u8 *out_mode);
 
 extern int libertas_send_specific_SSID_scan(wlan_private * priv,
                                 struct WLAN_802_11_SSID *prequestedssid,
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 82d06223043e..d4b13478c9a7 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -78,7 +78,7 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
                          min_t(unsigned int, skb->len, 100));
 
         if (!skb->len || (skb->len > MRVDRV_ETH_TX_PACKET_BUFFER_SIZE)) {
-                lbs_pr_debug(1, "Tx error: Bad skb length %d : %d\n",
+                lbs_pr_debug(1, "Tx error: Bad skb length %d : %zd\n",
                        skb->len, MRVDRV_ETH_TX_PACKET_BUFFER_SIZE);
                 ret = -1;
                 goto done;
diff --git a/drivers/net/wireless/libertas/version.h b/drivers/net/wireless/libertas/version.h
index e86f65ae79b8..8b137891791f 100644
--- a/drivers/net/wireless/libertas/version.h
+++ b/drivers/net/wireless/libertas/version.h
@@ -1,8 +1 @@
-#define DRIVER_RELEASE_VERSION "320.p0"
-const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
-#ifdef  DEBUG
-    "-dbg"
-#endif
-    "";
-
 
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 4a52336bc0f6..69f52b6e59c8 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -17,7 +17,6 @@
 #include "defs.h"
 #include "dev.h"
 #include "join.h"
-#include "version.h"
 #include "wext.h"
 #include "assoc.h"
 
@@ -233,7 +232,7 @@ static int changeadhocchannel(wlan_private * priv, int channel)
 
                 // find out the BSSID that matches the current SSID
                 i = libertas_find_SSID_in_list(adapter, &curadhocssid, NULL,
-                                   wlan802_11ibss);
+                                   IW_MODE_ADHOC);
 
                 if (i >= 0) {
                         lbs_pr_debug(1, "SSID found at %d in List,"
@@ -316,13 +315,11 @@ static int get_active_data_rates(wlan_adapter * adapter,
         ENTER();
 
         if (adapter->connect_status != libertas_connected) {
-                if (adapter->inframode == wlan802_11infrastructure) {
-                        //Infra. mode
+                if (adapter->mode == IW_MODE_INFRA) {
                         lbs_pr_debug(1, "Infra\n");
                         k = copyrates(rates, k, libertas_supported_rates,
                                       sizeof(libertas_supported_rates));
                 } else {
-                        //ad-hoc mode
                         lbs_pr_debug(1, "Adhoc G\n");
                         k = copyrates(rates, k, libertas_adhoc_rates_g,
                                       sizeof(libertas_adhoc_rates_g));
@@ -586,20 +583,7 @@ static int wlan_get_mode(struct net_device *dev,
 
         ENTER();
 
-        switch (adapter->inframode) {
-        case wlan802_11ibss:
-                *uwrq = IW_MODE_ADHOC;
-                break;
-
-        case wlan802_11infrastructure:
-                *uwrq = IW_MODE_INFRA;
-                break;
-
-        default:
-        case wlan802_11autounknown:
-                *uwrq = IW_MODE_AUTO;
-                break;
-        }
+        *uwrq = adapter->mode;
 
         LEAVE();
         return 0;
@@ -1002,149 +986,18 @@ static const struct iw_priv_args wlan_private_args[] = {
         /*
          * { cmd, set_args, get_args, name }
          */
-        {
-         WLANSCAN_TYPE,
-         IW_PRIV_TYPE_CHAR | 8,
-         IW_PRIV_TYPE_CHAR | 8,
-         "scantype"},
-
-        {
-         WLAN_SETINT_GETINT,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         ""},
-        {
-         WLANNF,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "getNF"},
-        {
-         WLANRSSI,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "getRSSI"},
-        {
-         WLANENABLE11D,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "enable11d"},
-        {
-         WLANADHOCGRATE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "adhocgrate"},
-
-        {
-         WLAN_SUBCMD_SET_PRESCAN,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "prescan"},
-        {
-         WLAN_SETONEINT_GETONEINT,
-         IW_PRIV_TYPE_INT | 1,
-         IW_PRIV_TYPE_INT | 1,
-         ""},
-        {
-         WLAN_BEACON_INTERVAL,
-         IW_PRIV_TYPE_INT | 1,
-         IW_PRIV_TYPE_INT | 1,
-         "bcninterval"},
-        {
-         WLAN_LISTENINTRVL,
-         IW_PRIV_TYPE_INT | 1,
-         IW_PRIV_TYPE_INT | 1,
-         "lolisteninter"},
-        {
-         WLAN_TXCONTROL,
-         IW_PRIV_TYPE_INT | 1,
-         IW_PRIV_TYPE_INT | 1,
-         "txcontrol"},
-        {
-         WLAN_NULLPKTINTERVAL,
-         IW_PRIV_TYPE_INT | 1,
-         IW_PRIV_TYPE_INT | 1,
-         "psnullinterval"},
         /* Using iwpriv sub-command feature */
         {
          WLAN_SETONEINT_GETNONE,        /* IOCTL: 24 */
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
          IW_PRIV_TYPE_NONE,
          ""},
-
-        {
-         WLAN_SUBCMD_SETRXANTENNA,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "setrxant"},
-        {
-         WLAN_SUBCMD_SETTXANTENNA,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "settxant"},
-        {
-         WLANSETAUTHALG,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "authalgs",
-         },
-        {
-         WLANSET8021XAUTHALG,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "8021xauthalgs",
-         },
-        {
-         WLANSETENCRYPTIONMODE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "encryptionmode",
-         },
         {
          WLANSETREGION,
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
          IW_PRIV_TYPE_NONE,
          "setregioncode"},
         {
-         WLAN_SET_LISTEN_INTERVAL,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "setlisteninter"},
-        {
-         WLAN_SET_MULTIPLE_DTIM,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "setmultipledtim"},
-        {
-         WLAN_SET_ATIM_WINDOW,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "atimwindow"},
-        {
-         WLANSETBCNAVG,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "setbcnavg"},
-        {
-         WLANSETDATAAVG,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "setdataavg"},
-        {
-         WLAN_SET_LINKMODE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "linkmode"},
-        {
-         WLAN_SET_RADIOMODE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "radiomode"},
-        {
-         WLAN_SET_DEBUGMODE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         IW_PRIV_TYPE_NONE,
-         "debugmode"},
-        {
          WLAN_SUBCMD_MESH_SET_TTL,
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
          IW_PRIV_TYPE_NONE,
@@ -1160,41 +1013,6 @@ static const struct iw_priv_args wlan_private_args[] = {
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
          "getregioncode"},
         {
-         WLAN_GET_LISTEN_INTERVAL,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "getlisteninter"},
-        {
-         WLAN_GET_MULTIPLE_DTIM,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "getmultipledtim"},
-        {
-         WLAN_GET_TX_RATE,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "gettxrate"},
-        {
-         WLANGETBCNAVG,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "getbcnavg"},
-        {
-         WLAN_GET_LINKMODE,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "get_linkmode"},
-        {
-         WLAN_GET_RADIOMODE,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "get_radiomode"},
-        {
-         WLAN_GET_DEBUGMODE,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-         "get_debugmode"},
-        {
          WLAN_SUBCMD_FWT_CLEANUP,
          IW_PRIV_TYPE_NONE,
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
@@ -1210,61 +1028,11 @@ static const struct iw_priv_args wlan_private_args[] = {
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
          "mesh_get_ttl"},
         {
-         WLAN_SETNONE_GETTWELVE_CHAR,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_CHAR | 12,
-         ""},
-        {
-         WLAN_SUBCMD_GETRXANTENNA,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_CHAR | 12,
-         "getrxant"},
-        {
-         WLAN_SUBCMD_GETTXANTENNA,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_CHAR | 12,
-         "gettxant"},
-        {
-         WLAN_GET_TSF,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_CHAR | 12,
-         "gettsf"},
-        {
          WLAN_SETNONE_GETNONE,
          IW_PRIV_TYPE_NONE,
          IW_PRIV_TYPE_NONE,
          ""},
         {
-         WLANDEAUTH,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_NONE,
-         "deauth"},
-        {
-         WLANADHOCSTOP,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_NONE,
-         "adhocstop"},
-        {
-         WLANRADIOON,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_NONE,
-         "radioon"},
-        {
-         WLANRADIOOFF,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_NONE,
-         "radiooff"},
-        {
-         WLANWLANIDLEON,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_NONE,
-         "wlanidle-on"},
-        {
-         WLANWLANIDLEOFF,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_NONE,
-         "wlanidle-off"},
-        {
          WLAN_SUBCMD_FWT_RESET,
          IW_PRIV_TYPE_NONE,
          IW_PRIV_TYPE_NONE,
@@ -1327,90 +1095,15 @@ static const struct iw_priv_args wlan_private_args[] = {
          IW_PRIV_TYPE_CHAR | 128,
          "fwt_list_route"},
         {
-         WLANSCAN_MODE,
-         IW_PRIV_TYPE_CHAR | 128,
-         IW_PRIV_TYPE_CHAR | 128,
-         "scanmode"},
-        {
-         WLAN_GET_ADHOC_STATUS,
-         IW_PRIV_TYPE_CHAR | 128,
-         IW_PRIV_TYPE_CHAR | 128,
-         "getadhocstatus"},
-        {
-         WLAN_SETNONE_GETWORDCHAR,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_CHAR | 128,
-         ""},
-        {
-         WLANSETWPAIE,
-         IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 24,
-         IW_PRIV_TYPE_NONE,
-         "setwpaie"},
-        {
-         WLANGETLOG,
-         IW_PRIV_TYPE_NONE,
-         IW_PRIV_TYPE_CHAR | GETLOG_BUFSIZE,
-         "getlog"},
-        {
          WLAN_SET_GET_SIXTEEN_INT,
          IW_PRIV_TYPE_INT | 16,
          IW_PRIV_TYPE_INT | 16,
          ""},
         {
-         WLAN_TPCCFG,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "tpccfg"},
-        {
-         WLAN_POWERCFG,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "powercfg"},
-        {
-         WLAN_AUTO_FREQ_SET,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "setafc"},
-        {
-         WLAN_AUTO_FREQ_GET,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "getafc"},
-        {
-         WLAN_SCANPROBES,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "scanprobes"},
-        {
          WLAN_LED_GPIO_CTRL,
          IW_PRIV_TYPE_INT | 16,
          IW_PRIV_TYPE_INT | 16,
          "ledgpio"},
-        {
-         WLAN_ADAPT_RATESET,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "rateadapt"},
-        {
-         WLAN_INACTIVITY_TIMEOUT,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "inactivityto"},
-        {
-         WLANSNR,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "getSNR"},
-        {
-         WLAN_GET_RATE,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "getrate"},
-        {
-         WLAN_GET_RXINFO,
-         IW_PRIV_TYPE_INT | 16,
-         IW_PRIV_TYPE_INT | 16,
-         "getrxinfo"},
 };
 
 static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
@@ -1434,7 +1127,7 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
 
         ENTER();
 
-        priv->wstats.status = adapter->inframode;
+        priv->wstats.status = adapter->mode;
 
         /* If we're not associated, all quality values are meaningless */
         if (adapter->connect_status != libertas_connected)
@@ -1568,13 +1261,12 @@ static int wlan_set_freq(struct net_device *dev, struct iw_request_info *info,
                 if (!cfp) {
                         rc = -EINVAL;
                 } else {
-                        if (adapter->inframode == wlan802_11ibss) {
+                        if (adapter->mode == IW_MODE_ADHOC) {
                                 rc = changeadhocchannel(priv, channel);
                                 /*  If station is WEP enabled, send the
                                  *  command to set WEP in firmware
                                  */
-                                if (adapter->secinfo.WEPstatus ==
-                                    wlan802_11WEPenabled) {
+                                if (adapter->secinfo.wep_enabled) {
                                         lbs_pr_debug(1, "set_freq: WEP enabled\n");
                                         ret = libertas_prepare_and_send_command(priv,
                                                                     cmd_802_11_set_wep,
@@ -1716,49 +1408,31 @@ static int wlan_set_mode(struct net_device *dev,
         wlan_private *priv = dev->priv;
         wlan_adapter *adapter = priv->adapter;
         struct assoc_request * assoc_req;
-        enum WLAN_802_11_NETWORK_INFRASTRUCTURE new_mode;
 
         ENTER();
 
-        switch (*uwrq) {
-        case IW_MODE_ADHOC:
-                lbs_pr_debug(1, "Wanted mode is ad-hoc: current datarate=%#x\n",
-                       adapter->datarate);
-                new_mode = wlan802_11ibss;
-                adapter->adhocchannel = DEFAULT_AD_HOC_CHANNEL;
-                break;
-
-        case IW_MODE_INFRA:
-                lbs_pr_debug(1, "Wanted mode is Infrastructure\n");
-                new_mode = wlan802_11infrastructure;
-                break;
-
-        case IW_MODE_AUTO:
-                lbs_pr_debug(1, "Wanted mode is Auto\n");
-                new_mode = wlan802_11autounknown;
-                break;
-
-        default:
-                lbs_pr_debug(1, "Wanted mode is Unknown: 0x%x\n", *uwrq);
-                return -EINVAL;
+        if (   (*uwrq != IW_MODE_ADHOC)
+            && (*uwrq != IW_MODE_INFRA)
+            && (*uwrq != IW_MODE_AUTO)) {
+                lbs_pr_debug(1, "Invalid mode: 0x%x\n", *uwrq);
+                ret = -EINVAL;
+                goto out;
         }
 
         mutex_lock(&adapter->lock);
         assoc_req = wlan_get_association_request(adapter);
         if (!assoc_req) {
                 ret = -ENOMEM;
+                wlan_cancel_association_work(priv);
         } else {
-                assoc_req->mode = new_mode;
-        }
-
-        if (ret == 0) {
+                assoc_req->mode = *uwrq;
                 set_bit(ASSOC_FLAG_MODE, &assoc_req->flags);
                 wlan_postpone_association_work(priv);
-        } else {
-                wlan_cancel_association_work(priv);
+                lbs_pr_debug(1, "Switching to mode: 0x%x\n", *uwrq);
         }
         mutex_unlock(&adapter->lock);
 
+out:
         LEAVE();
         return ret;
 }
@@ -1789,13 +1463,13 @@ static int wlan_get_encode(struct net_device *dev,
         dwrq->flags = 0;
 
         /* Authentication method */
-        switch (adapter->secinfo.authmode) {
-        case wlan802_11authmodeopen:
+        switch (adapter->secinfo.auth_mode) {
+        case IW_AUTH_ALG_OPEN_SYSTEM:
                 dwrq->flags = IW_ENCODE_OPEN;
                 break;
 
-        case wlan802_11authmodeshared:
-        case wlan802_11authmodenetworkEAP:
+        case IW_AUTH_ALG_SHARED_KEY:
+        case IW_AUTH_ALG_LEAP:
                 dwrq->flags = IW_ENCODE_RESTRICTED;
                 break;
         default:
@@ -1803,8 +1477,9 @@ static int wlan_get_encode(struct net_device *dev,
                 break;
         }
 
-        if ((adapter->secinfo.WEPstatus == wlan802_11WEPenabled)
-            || adapter->secinfo.WPAenabled || adapter->secinfo.WPA2enabled) {
+        if (   adapter->secinfo.wep_enabled
+            || adapter->secinfo.WPAenabled
+            || adapter->secinfo.WPA2enabled) {
                 dwrq->flags &= ~IW_ENCODE_DISABLED;
         } else {
                 dwrq->flags |= IW_ENCODE_DISABLED;
@@ -1818,8 +1493,7 @@ static int wlan_get_encode(struct net_device *dev,
         if (index < 0)
                 index = adapter->wep_tx_keyidx;
 
-        if ((adapter->wep_keys[index].len) &&
-            (adapter->secinfo.WEPstatus == wlan802_11WEPenabled)) {
+        if ((adapter->wep_keys[index].len) && adapter->secinfo.wep_enabled) {
                 memcpy(extra, adapter->wep_keys[index].key,
                        adapter->wep_keys[index].len);
                 dwrq->length = adapter->wep_keys[index].len;
@@ -1903,7 +1577,7 @@ static int wlan_set_wep_key(struct assoc_request *assoc_req,
                 assoc_req->wep_tx_keyidx = index;
         }
 
-        assoc_req->secinfo.WEPstatus = wlan802_11WEPenabled;
+        assoc_req->secinfo.wep_enabled = 1;
 
         LEAVE();
         return 0;
@@ -1932,10 +1606,10 @@ static void disable_wep(struct assoc_request *assoc_req)
         int i;
 
         /* Set Open System auth mode */
-        assoc_req->secinfo.authmode = wlan802_11authmodeopen;
+        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
 
         /* Clear WEP keys and mark WEP as disabled */
-        assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
+        assoc_req->secinfo.wep_enabled = 0;
         for (i = 0; i < 4; i++)
                 assoc_req->wep_keys[i].len = 0;
 
@@ -1987,8 +1661,7 @@ static int wlan_set_encode(struct net_device *dev,
         /* If WEP isn't enabled, or if there is no key data but a valid
          * index, set the TX key.
          */
-        if ((assoc_req->secinfo.WEPstatus != wlan802_11WEPenabled)
-            || (dwrq->length == 0 && !is_default))
+        if (!assoc_req->secinfo.wep_enabled || (dwrq->length == 0 && !is_default))
                 set_tx_key = 1;
 
         ret = wlan_set_wep_key(assoc_req, extra, dwrq->length, index, set_tx_key);
@@ -2001,9 +1674,9 @@ static int wlan_set_encode(struct net_device *dev,
                 set_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags);
 
         if (dwrq->flags & IW_ENCODE_RESTRICTED) {
-                assoc_req->secinfo.authmode = wlan802_11authmodeshared;
+                assoc_req->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
         } else if (dwrq->flags & IW_ENCODE_OPEN) {
-                assoc_req->secinfo.authmode = wlan802_11authmodeopen;
+                assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
         }
 
 out:
@@ -2056,30 +1729,31 @@ static int wlan_get_encodeext(struct net_device *dev,
 
         if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY &&
             ext->alg != IW_ENCODE_ALG_WEP) {
-                if (index != 0 || adapter->inframode != wlan802_11infrastructure)
+                if (index != 0 || adapter->mode != IW_MODE_INFRA)
                         goto out;
         }
 
         dwrq->flags = index + 1;
         memset(ext, 0, sizeof(*ext));
 
-        if ((adapter->secinfo.WEPstatus == wlan802_11WEPdisabled)
-            && !adapter->secinfo.WPAenabled && !adapter->secinfo.WPA2enabled) {
+        if (   !adapter->secinfo.wep_enabled
+            && !adapter->secinfo.WPAenabled
+            && !adapter->secinfo.WPA2enabled) {
                 ext->alg = IW_ENCODE_ALG_NONE;
                 ext->key_len = 0;
                 dwrq->flags |= IW_ENCODE_DISABLED;
         } else {
                 u8 *key = NULL;
 
-                if ((adapter->secinfo.WEPstatus == wlan802_11WEPenabled)
+                if (   adapter->secinfo.wep_enabled
                     && !adapter->secinfo.WPAenabled
                     && !adapter->secinfo.WPA2enabled) {
                         ext->alg = IW_ENCODE_ALG_WEP;
                         ext->key_len = adapter->wep_keys[index].len;
                         key = &adapter->wep_keys[index].key[0];
-                } else if ((adapter->secinfo.WEPstatus == wlan802_11WEPdisabled) &&
-                           (adapter->secinfo.WPAenabled ||
-                            adapter->secinfo.WPA2enabled)) {
+                } else if (   !adapter->secinfo.wep_enabled
+                           && (adapter->secinfo.WPAenabled ||
+                               adapter->secinfo.WPA2enabled)) {
                         /* WPA */
                         ext->alg = IW_ENCODE_ALG_TKIP;
                         ext->key_len = 0;
@@ -2149,7 +1823,7 @@ static int wlan_set_encodeext(struct net_device *dev,
                 /* If WEP isn't enabled, or if there is no key data but a valid
                  * index, or if the set-TX-key flag was passed, set the TX key.
                  */
-                if ((assoc_req->secinfo.WEPstatus != wlan802_11WEPenabled)
+                if (   !assoc_req->secinfo.wep_enabled
                     || (dwrq->length == 0 && !is_default)
                     || (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY))
                         set_tx_key = 1;
@@ -2161,11 +1835,9 @@ static int wlan_set_encodeext(struct net_device *dev,
                         goto out;
 
                 if (dwrq->flags & IW_ENCODE_RESTRICTED) {
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodeshared;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
                 } else if (dwrq->flags & IW_ENCODE_OPEN) {
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodeopen;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
                 }
 
                 /* Mark the various WEP bits as modified */
@@ -2350,15 +2022,13 @@ static int wlan_set_auth(struct net_device *dev,
                 }
                 if (dwrq->value & IW_AUTH_WPA_VERSION_WPA) {
                         assoc_req->secinfo.WPAenabled = 1;
-                        assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodeopen;
+                        assoc_req->secinfo.wep_enabled = 0;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
                 }
                 if (dwrq->value & IW_AUTH_WPA_VERSION_WPA2) {
                         assoc_req->secinfo.WPA2enabled = 1;
-                        assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodeopen;
+                        assoc_req->secinfo.wep_enabled = 0;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
                 }
                 updated = 1;
                 break;
@@ -2376,14 +2046,11 @@ static int wlan_set_auth(struct net_device *dev,
 
         case IW_AUTH_80211_AUTH_ALG:
                 if (dwrq->value & IW_AUTH_ALG_SHARED_KEY) {
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodeshared;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_SHARED_KEY;
                 } else if (dwrq->value & IW_AUTH_ALG_OPEN_SYSTEM) {
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodeopen;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
                 } else if (dwrq->value & IW_AUTH_ALG_LEAP) {
-                        assoc_req->secinfo.authmode =
-                            wlan802_11authmodenetworkEAP;
+                        assoc_req->secinfo.auth_mode = IW_AUTH_ALG_LEAP;
                 } else {
                         ret = -EINVAL;
                 }
@@ -2396,9 +2063,8 @@ static int wlan_set_auth(struct net_device *dev,
                             !assoc_req->secinfo.WPA2enabled) {
                                 assoc_req->secinfo.WPAenabled = 1;
                                 assoc_req->secinfo.WPA2enabled = 1;
-                                assoc_req->secinfo.WEPstatus = wlan802_11WEPdisabled;
-                                assoc_req->secinfo.authmode =
-                                    wlan802_11authmodeopen;
+                                assoc_req->secinfo.wep_enabled = 0;
+                                assoc_req->secinfo.auth_mode = IW_AUTH_ALG_OPEN_SYSTEM;
                         }
                 } else {
                         assoc_req->secinfo.WPAenabled = 0;
@@ -2455,19 +2121,7 @@ static int wlan_get_auth(struct net_device *dev,
                 break;
 
         case IW_AUTH_80211_AUTH_ALG:
-                switch (adapter->secinfo.authmode) {
-                case wlan802_11authmodeshared:
-                        dwrq->value = IW_AUTH_ALG_SHARED_KEY;
-                        break;
-                case wlan802_11authmodeopen:
-                        dwrq->value = IW_AUTH_ALG_OPEN_SYSTEM;
-                        break;
-                case wlan802_11authmodenetworkEAP:
-                        dwrq->value = IW_AUTH_ALG_LEAP;
-                        break;
-                default:
-                        break;
-                }
+                dwrq->value = adapter->secinfo.auth_mode;
                 break;
 
         case IW_AUTH_WPA_ENABLED:
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
index 39f367c38d90..15cfaaf0797f 100644
--- a/drivers/net/wireless/libertas/wext.h
+++ b/drivers/net/wireless/libertas/wext.h
@@ -10,88 +10,22 @@
 /** PRIVATE CMD ID */
 #define WLANIOCTL                       SIOCIWFIRSTPRIV
 
-#define WLANSETWPAIE                    (WLANIOCTL + 0)
-
-#define WLAN_SETINT_GETINT              (WLANIOCTL + 7)
-#define WLANNF                                  1
-#define WLANRSSI                                2
-#define WLANENABLE11D                           5
-#define WLANADHOCGRATE                          6
-#define WLAN_SUBCMD_SET_PRESCAN                 11
-
 #define WLAN_SETNONE_GETNONE            (WLANIOCTL + 8)
-#define WLANDEAUTH                              1
-#define WLANRADIOON                             2
-#define WLANRADIOOFF                            3
-#define WLANREMOVEADHOCAES                      4
-#define WLANADHOCSTOP                           5
-#define WLANCIPHERTEST                          6
-#define WLANCRYPTOTEST                          7
-
-#define WLANWLANIDLEON                          10
-#define WLANWLANIDLEOFF                         11
 #define WLAN_SUBCMD_BT_RESET                    13
 #define WLAN_SUBCMD_FWT_RESET                   14
 
-#define WLANGETLOG                      (WLANIOCTL + 9)
-#define GETLOG_BUFSIZE  300
-
-#define WLANSCAN_TYPE                   (WLANIOCTL + 11)
-
 #define WLAN_SETNONE_GETONEINT          (WLANIOCTL + 15)
 #define WLANGETREGION                           1
-#define WLAN_GET_LISTEN_INTERVAL                2
-#define WLAN_GET_MULTIPLE_DTIM                  3
-#define WLAN_GET_TX_RATE                        4
-#define WLANGETBCNAVG                           5
 
-#define WLAN_GET_LINKMODE                       6
-#define WLAN_GET_RADIOMODE                      7
-#define WLAN_GET_DEBUGMODE                      8
 #define WLAN_SUBCMD_FWT_CLEANUP                 15
 #define WLAN_SUBCMD_FWT_TIME                    16
 #define WLAN_SUBCMD_MESH_GET_TTL                17
 
-#define WLANREGCFRDWR                   (WLANIOCTL + 18)
-
-#define WLAN_SETNONE_GETTWELVE_CHAR (WLANIOCTL + 19)
-#define WLAN_SUBCMD_GETRXANTENNA    1
-#define WLAN_SUBCMD_GETTXANTENNA    2
-#define WLAN_GET_TSF                3
-
-#define WLAN_SETNONE_GETWORDCHAR        (WLANIOCTL + 21)
-#define WLANGETADHOCAES                         1
-
-#define WLAN_SETONEINT_GETONEINT        (WLANIOCTL + 23)
-#define WLAN_BEACON_INTERVAL                    1
-#define WLAN_LISTENINTRVL                       4
-
-#define WLAN_TXCONTROL                          6
-#define WLAN_NULLPKTINTERVAL                    7
-
 #define WLAN_SETONEINT_GETNONE          (WLANIOCTL + 24)
-#define WLAN_SUBCMD_SETRXANTENNA                1
-#define WLAN_SUBCMD_SETTXANTENNA                2
-#define WLANSETAUTHALG                          5
-#define WLANSET8021XAUTHALG                     6
-#define WLANSETENCRYPTIONMODE                   7
 #define WLANSETREGION                           8
-#define WLAN_SET_LISTEN_INTERVAL                9
-
-#define WLAN_SET_MULTIPLE_DTIM                  10
-#define WLAN_SET_ATIM_WINDOW                    11
-#define WLANSETBCNAVG                           13
-#define WLANSETDATAAVG                          14
-#define WLAN_SET_LINKMODE                       15
-#define WLAN_SET_RADIOMODE                      16
-#define WLAN_SET_DEBUGMODE                      17
 #define WLAN_SUBCMD_MESH_SET_TTL                18
 
 #define WLAN_SET128CHAR_GET128CHAR      (WLANIOCTL + 25)
-#define WLANSCAN_MODE                           6
-
-#define WLAN_GET_ADHOC_STATUS                   9
-
 #define WLAN_SUBCMD_BT_ADD                      18
 #define WLAN_SUBCMD_BT_DEL                      19
 #define WLAN_SUBCMD_BT_LIST                     20
@@ -103,27 +37,8 @@
 #define WLAN_SUBCMD_FWT_LIST_ROUTE                      26
 
 #define WLAN_SET_GET_SIXTEEN_INT       (WLANIOCTL + 29)
-#define WLAN_TPCCFG                             1
-#define WLAN_POWERCFG                           2
-
-#define WLAN_AUTO_FREQ_SET                      3
-#define WLAN_AUTO_FREQ_GET                      4
 #define WLAN_LED_GPIO_CTRL                      5
-#define WLAN_SCANPROBES                         6
-#define WLAN_ADAPT_RATESET                      8
-#define WLAN_INACTIVITY_TIMEOUT                 9
-#define WLANSNR                                 10
-#define WLAN_GET_RATE                           11
-#define WLAN_GET_RXINFO                         12
-
-#define WLANCMD52RDWR                   (WLANIOCTL + 30)
-#define WLANCMD53RDWR                   (WLANIOCTL + 31)
-#define CMD53BUFLEN                             32
 
-#define REG_MAC                                 0x19
-#define REG_BBP                                 0x1a
-#define REG_RF                                  0x1b
-#define REG_EEPROM                              0x59
 #define WLAN_LINKMODE_802_3                     0
 #define WLAN_LINKMODE_802_11                    2
 #define WLAN_RADIOMODE_NONE                     0
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 841b3c136ad9..283be4a70524 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -3054,7 +3054,7 @@ static const iw_handler prism54_handler[] = {
         (iw_handler) prism54_set_wap,   /* SIOCSIWAP */
         (iw_handler) prism54_get_wap,   /* SIOCGIWAP */
         (iw_handler) NULL,      /* -- hole -- */
-        (iw_handler) NULL,      /* SIOCGIWAPLIST depreciated */
+        (iw_handler) NULL,      /* SIOCGIWAPLIST deprecated */
         (iw_handler) prism54_set_scan,  /* SIOCSIWSCAN */
         (iw_handler) prism54_get_scan,  /* SIOCGIWSCAN */
         (iw_handler) prism54_set_essid, /* SIOCSIWESSID */
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index a037b11dac9d..084795355b74 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -115,7 +115,7 @@ isl_upload_firmware(islpci_private *priv)
                             ISL38XX_MEMORY_WINDOW_SIZE : fw_len;
                         u32 __iomem *dev_fw_ptr = device_base + ISL38XX_DIRECT_MEM_WIN;
 
-                        /* set the cards base address for writting the data */
+                        /* set the card's base address for writing the data */
                         isl38xx_w32_flush(device_base, reg,
                                           ISL38XX_DIR_MEM_BASE_REG);
                         wmb();  /* be paranoid */
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 67b867f837ca..5740d4d4267c 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -176,7 +176,7 @@ psa_write(struct net_device *	dev,
   volatile u_char __iomem *verify = lp->mem + PSA_ADDR +
     (psaoff(0, psa_comp_number) << 1);
 
-  /* Authorize writting to PSA */
+  /* Authorize writing to PSA */
   hacr_write(base, HACR_PWR_STAT | HACR_ROM_WEN);
 
   while(n-- > 0)
@@ -1676,7 +1676,7 @@ wv_set_frequency(u_long		base,	/* i/o port of the card */
       fee_write(base, 0x60,
                 dac, 2);
 
-      /* We now should verify here that the EEprom writting was ok */
+      /* We now should verify here that the EEprom writing was ok */
 
       /* ReRead the first area */
       fee_read(base, 0x00,
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 4d1c4905c749..4b9de0093a7b 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -120,7 +120,7 @@
  * the Wavelan itself (NCR -> AT&T -> Lucent).
  *
  * All started with Anders Klemets <klemets@paul.rutgers.edu>,
- * writting a Wavelan ISA driver for the MACH microkernel. Girish
+ * writing a Wavelan ISA driver for the MACH microkernel. Girish
  * Welling <welling@paul.rutgers.edu> had also worked on it.
  * Keith Moore modify this for the Pcmcia hardware.
  * 
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index e04cffc8adf3..8459549d0cee 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -40,6 +40,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x0df6, 0x9075), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
@@ -67,8 +68,11 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0baf, 0x0121), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
         /* "Driverless" devices that need ejecting */
         { USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
+        { USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER },
         {}
 };
 
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 3f4a7cf9efea..f2a90a7fa2d6 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -109,7 +109,6 @@ static int gx_fix;
 /* These identify the driver base version and may not be removed. */
 static char version[] __devinitdata =
 KERN_INFO DRV_NAME ".c:v1.05  1/09/2001  Written by Donald Becker <becker@scyld.com>\n"
-KERN_INFO "  http://www.scyld.com/network/yellowfin.html\n"
 KERN_INFO "  (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 78c2e6e4b42e..edd6de995726 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -26,6 +26,7 @@
 #include <linux/profile.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
  
 #include "oprofile_stats.h"
 #include "event_buffer.h"
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 21c4c299b3d6..5b86ee5c1eeb 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -38,7 +38,6 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 
 #include <asm/byteorder.h>
 #include <asm/pdc.h>
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 36c6a1bfe558..f46c69e4ed82 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -6,6 +6,7 @@
 #
 
 menu "Parallel port support"
+        depends on HAS_IOMEM
 
 config PARPORT
         tristate "Parallel port support"
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 316c06f4423c..8b7d84eca05d 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -201,7 +201,7 @@ static int parport_config(struct pcmcia_device *link)
 
     p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
                               link->irq.AssignedIRQ, PARPORT_DMA_NONE,
-                              NULL);
+                              &link->dev);
     if (p == NULL) {
         printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at "
                "0x%3x, irq %u failed\n", link->io.BasePort1,
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index e5b0a544de40..77726fc49766 100644
--- a/drivers/parport/parport_mfc3.c
+++ b/drivers/parport/parport_mfc3.c
@@ -356,6 +356,7 @@ static int __init parport_mfc3_init(void)
                                 if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt, IRQF_SHARED, p->name, &pp_mfc3_ops))
                                         goto out_irq;
                 }
+                p->dev = &z->dev;
 
                 this_port[pias++] = p;
                 printk(KERN_INFO "%s: Multiface III port using irq\n", p->name);
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 3de2623afa13..7bfbad57879d 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -51,8 +51,10 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/dma-mapping.h>
 #include <linux/pci.h>
 #include <linux/pnp.h>
+#include <linux/platform_device.h>
 #include <linux/sysctl.h>
 
 #include <asm/io.h>
@@ -620,6 +622,7 @@ static size_t parport_pc_fifo_write_block_dma (struct parport *port,
         unsigned long dmaflag;
         size_t left = length;
         const struct parport_pc_private *priv = port->physport->private_data;
+        struct device *dev = port->physport->dev;
         dma_addr_t dma_addr, dma_handle;
         size_t maxlen = 0x10000; /* max 64k per DMA transfer */
         unsigned long start = (unsigned long) buf;
@@ -631,8 +634,8 @@ dump_parport_state ("enter fifo_write_block_dma", port);
                 if ((start ^ end) & ~0xffffUL)
                         maxlen = 0x10000 - (start & 0xffff);
 
-                dma_addr = dma_handle = pci_map_single(priv->dev, (void *)buf, length,
-                                                       PCI_DMA_TODEVICE);
+                dma_addr = dma_handle = dma_map_single(dev, (void *)buf, length,
+                                                       DMA_TO_DEVICE);
         } else {
                 /* above 16 MB we use a bounce buffer as ISA-DMA is not possible */
                 maxlen   = PAGE_SIZE;          /* sizeof(priv->dma_buf) */
@@ -728,9 +731,9 @@ dump_parport_state ("enter fifo_write_block_dma", port);
 
         /* Turn off DMA mode */
         frob_econtrol (port, 1<<3, 0);
-        
+
         if (dma_handle)
-                pci_unmap_single(priv->dev, dma_handle, length, PCI_DMA_TODEVICE);
+                dma_unmap_single(dev, dma_handle, length, DMA_TO_DEVICE);
 
 dump_parport_state ("leave fifo_write_block_dma", port);
         return length - left;
@@ -2146,7 +2149,7 @@ static DEFINE_SPINLOCK(ports_lock);
 struct parport *parport_pc_probe_port (unsigned long int base,
                                        unsigned long int base_hi,
                                        int irq, int dma,
-                                       struct pci_dev *dev)
+                                       struct device *dev)
 {
         struct parport_pc_private *priv;
         struct parport_operations *ops;
@@ -2155,6 +2158,17 @@ struct parport *parport_pc_probe_port (unsigned long int base,
         struct resource *base_res;
         struct resource *ECR_res = NULL;
         struct resource *EPP_res = NULL;
+        struct platform_device *pdev = NULL;
+
+        if (!dev) {
+                /* We need a physical device to attach to, but none was
+                 * provided. Create our own. */
+                pdev = platform_device_register_simple("parport_pc",
+                                                       base, NULL, 0);
+                if (IS_ERR(pdev))
+                        return NULL;
+                dev = &pdev->dev;
+        }
 
         ops = kmalloc(sizeof (struct parport_operations), GFP_KERNEL);
         if (!ops)
@@ -2180,9 +2194,10 @@ struct parport *parport_pc_probe_port (unsigned long int base,
         priv->fifo_depth = 0;
         priv->dma_buf = NULL;
         priv->dma_handle = 0;
-        priv->dev = dev;
         INIT_LIST_HEAD(&priv->list);
         priv->port = p;
+
+        p->dev = dev;
         p->base_hi = base_hi;
         p->modes = PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT;
         p->private_data = priv;
@@ -2305,9 +2320,10 @@ struct parport *parport_pc_probe_port (unsigned long int base,
                                 p->dma = PARPORT_DMA_NONE;
                         } else {
                                 priv->dma_buf =
-                                  pci_alloc_consistent(priv->dev,
+                                  dma_alloc_coherent(dev,
                                                        PAGE_SIZE,
-                                                       &priv->dma_handle);
+                                                       &priv->dma_handle,
+                                                       GFP_KERNEL);
                                 if (! priv->dma_buf) {
                                         printk (KERN_WARNING "%s: "
                                                 "cannot get buffer for DMA, "
@@ -2356,6 +2372,8 @@ out3:
 out2:
         kfree (ops);
 out1:
+        if (pdev)
+                platform_device_unregister(pdev);
         return NULL;
 }
 
@@ -2383,7 +2401,7 @@ void parport_pc_unregister_port (struct parport *p)
                 release_region(p->base_hi, 3);
 #if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA)
         if (priv->dma_buf)
-                pci_free_consistent(priv->dev, PAGE_SIZE,
+                dma_free_coherent(p->physport->dev, PAGE_SIZE,
                                     priv->dma_buf,
                                     priv->dma_handle);
 #endif
@@ -2489,7 +2507,7 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq,
          */
         release_resource(base_res);
         if (parport_pc_probe_port (ite8872_lpt, ite8872_lpthi,
-                                   irq, PARPORT_DMA_NONE, NULL)) {
+                                   irq, PARPORT_DMA_NONE, &pdev->dev)) {
                 printk (KERN_INFO
                         "parport_pc: ITE 8872 parallel port: io=0x%X",
                         ite8872_lpt);
@@ -2672,7 +2690,7 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
         }
 
         /* finally, do the probe with values obtained */
-        if (parport_pc_probe_port (port1, port2, irq, dma, NULL)) {
+        if (parport_pc_probe_port (port1, port2, irq, dma, &pdev->dev)) {
                 printk (KERN_INFO
                         "parport_pc: VIA parallel port: io=0x%X", port1);
                 if (irq != PARPORT_IRQ_NONE)
@@ -2970,7 +2988,7 @@ static int parport_pc_pci_probe (struct pci_dev *dev,
                         parport_pc_pci_tbl[i + last_sio].device, io_lo, io_hi);
                 data->ports[count] =
                         parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,
-                                               PARPORT_DMA_NONE, dev);
+                                               PARPORT_DMA_NONE, &dev->dev);
                 if (data->ports[count])
                         count++;
         }
@@ -3077,8 +3095,8 @@ static int parport_pc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id
         } else
                 dma = PARPORT_DMA_NONE;
 
-        printk(KERN_INFO "parport: PnPBIOS parport detected.\n");
-        if (!(pdata = parport_pc_probe_port (io_lo, io_hi, irq, dma, NULL)))
+        dev_info(&dev->dev, "reported by %s\n", dev->protocol->name);
+        if (!(pdata = parport_pc_probe_port (io_lo, io_hi, irq, dma, &dev->dev)))
                 return -ENODEV;
 
         pnp_set_drvdata(dev,pdata);
@@ -3103,6 +3121,21 @@ static struct pnp_driver parport_pc_pnp_driver = {
 };
 
 
+static int __devinit parport_pc_platform_probe(struct platform_device *pdev)
+{
+        /* Always succeed, the actual probing is done in
+         * parport_pc_probe_port(). */
+        return 0;
+}
+
+static struct platform_driver parport_pc_platform_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "parport_pc",
+        },
+        .probe          = parport_pc_platform_probe,
+};
+
 /* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */
 static int __devinit __attribute__((unused))
 parport_pc_find_isa_ports (int autoirq, int autodma)
@@ -3378,9 +3411,15 @@ __setup("parport_init_mode=",parport_init_mode_setup);
 
 static int __init parport_pc_init(void)
 {
+        int err;
+
         if (parse_parport_params())
                 return -EINVAL;
 
+        err = platform_driver_register(&parport_pc_platform_driver);
+        if (err)
+                return err;
+
         if (io[0]) {
                 int i;
                 /* Only probe the ports we were given. */
@@ -3405,6 +3444,7 @@ static void __exit parport_pc_exit(void)
                 pci_unregister_driver (&parport_pc_pci_driver);
         if (pnp_registered_parport)
                 pnp_unregister_driver (&parport_pc_pnp_driver);
+        platform_driver_unregister(&parport_pc_platform_driver);
 
         spin_lock(&ports_lock);
         while (!list_empty(&ports_list)) {
@@ -3413,6 +3453,9 @@ static void __exit parport_pc_exit(void)
                 priv = list_entry(ports_list.next,
                                   struct parport_pc_private, list);
                 port = priv->port;
+                if (port->dev && port->dev->bus == &platform_bus_type)
+                        platform_device_unregister(
+                                to_platform_device(port->dev));
                 spin_unlock(&ports_lock);
                 parport_pc_unregister_port(port);
                 spin_lock(&ports_lock);
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 78c0a269a2ba..90ea3b8b99b0 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -305,7 +305,7 @@ static int __devinit parport_register (struct pci_dev *dev,
                 dev_dbg(&dev->dev, "PCI parallel port detected: I/O at "
                         "%#lx(%#lx)\n", io_lo, io_hi);
                 port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,
-                                              PARPORT_DMA_NONE, dev);
+                                              PARPORT_DMA_NONE, &dev->dev);
                 if (port) {
                         priv->port[priv->num_par++] = port;
                         success = 1;
@@ -392,6 +392,7 @@ static int parport_serial_pci_suspend(struct pci_dev *dev, pm_message_t state)
 static int parport_serial_pci_resume(struct pci_dev *dev)
 {
         struct parport_serial_private *priv = pci_get_drvdata(dev);
+        int err;
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -399,7 +400,12 @@ static int parport_serial_pci_resume(struct pci_dev *dev)
         /*
          * The device may have been disabled.  Re-enable it.
          */
-        pci_enable_device(dev);
+        err = pci_enable_device(dev);
+        if (err) {
+                printk(KERN_ERR "parport_serial: %s: error enabling "
+                        "device for resume (%d)\n", pci_name(dev), err);
+                return err;
+        }
 
         if (priv->serial)
                 pciserial_resume_ports(priv->serial);
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 400bb90084cf..d27019c2f860 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -322,6 +322,7 @@ static int __devinit init_one_port(struct sbus_dev *sdev)
                 goto out_free_ops;
 
         p->size = size;
+        p->dev = &sdev->ofdev.dev;
 
         if ((err = request_irq(p->irq, parport_sunbpp_interrupt,
                                IRQF_SHARED, p->name, p)) != 0) {
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index fd9129e424f9..cd66442acfee 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -365,6 +365,11 @@ void parport_announce_port (struct parport *port)
         parport_daisy_init(port);
 #endif
 
+        if (!port->dev)
+                printk(KERN_WARNING "%s: fix this legacy "
+                                "no-device port driver!\n",
+                                port->name);
+
         parport_proc_register(port);
         mutex_lock(&registration_lock);
         spin_lock_irq(&parportlist_lock);
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index 40c79b03c7ef..fa5c0197d571 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -40,7 +40,6 @@
 #include <linux/pci_hotplug.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include "acpiphp.h"
 
 #define MY_NAME "acpiphp"
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index fca978fb158e..9ef4e989afc4 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -46,7 +46,6 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 #include "../pci.h"
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 59392946c2bd..0316eeaaeb29 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -34,7 +34,6 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/wait.h>
-#include <linux/smp_lock.h>
 #include "../pci.h"
 #include "../../../arch/i386/pci/pci.h" /* for struct irq_routing_table */
 #include "ibmphp.h"
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
index f55ac3885cb3..d06ccb69e411 100644
--- a/drivers/pci/hotplug/ibmphp_hpc.c
+++ b/drivers/pci/hotplug/ibmphp_hpc.c
@@ -32,9 +32,9 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
 
 #include "ibmphp.h"
 
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 63f3bd1eecc4..bd433ef6bfc6 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -34,7 +34,6 @@
 #include <linux/sysfs.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mount.h>
 #include <linux/namei.h>
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index 6c5be3ff578c..df076064a3e0 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -129,8 +129,9 @@ struct kobj_type ktype_dlpar_io = {
 };
 
 struct kset dlpar_io_kset = {
-        .subsys = &pci_hotplug_slots_subsys,
-        .kobj = {.name = DLPAR_KOBJ_NAME, .ktype=&ktype_dlpar_io,},
+        .kobj = {.name = DLPAR_KOBJ_NAME,
+                 .ktype = &ktype_dlpar_io,
+                 .parent = &pci_hotplug_slots_subsys.kobj},
         .ktype = &ktype_dlpar_io,
 };
 
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 847936fe327e..458c08ef2654 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -29,7 +29,6 @@
 #include <linux/pci_hotplug.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <asm/eeh.h>       /* for eeh_add_device() */
 #include <asm/rtas.h>           /* rtas_call */
@@ -170,10 +169,10 @@ static int get_children_props(struct device_node *dn, const int **drc_indexes,
 {
         const int *indexes, *names, *types, *domains;
 
-        indexes = get_property(dn, "ibm,drc-indexes", NULL);
-        names = get_property(dn, "ibm,drc-names", NULL);
-        types = get_property(dn, "ibm,drc-types", NULL);
-        domains = get_property(dn, "ibm,drc-power-domains", NULL);
+        indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
+        names = of_get_property(dn, "ibm,drc-names", NULL);
+        types = of_get_property(dn, "ibm,drc-types", NULL);
+        domains = of_get_property(dn, "ibm,drc-power-domains", NULL);
 
         if (!indexes || !names || !types || !domains) {
                 /* Slot does not have dynamically-removable children */
@@ -206,7 +205,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
         char *name_tmp, *type_tmp;
         int i, rc;
 
-        my_index = get_property(dn, "ibm,my-drc-index", NULL);
+        my_index = of_get_property(dn, "ibm,my-drc-index", NULL);
         if (!my_index) {
                 /* Node isn't DLPAR/hotplug capable */
                 return -EINVAL;
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 78cf0711d1fa..ef07c36bccf7 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -249,19 +249,19 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot,
 
 
         if (rc == PCI_SLOT_ALREADY_UP) {
-                dev_dbg(slot->pci_bus->self, "is already active\n");
+                dev_dbg(&slot->pci_bus->self->dev, "is already active\n");
                 return 1; /* return 1 to user */
         }
 
         if (rc == PCI_L1_ERR) {
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "L1 failure %d with message: %s",
                         resp.resp_sub_errno, resp.resp_l1_msg);
                 return -EPERM;
         }
 
         if (rc) {
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "insert failed with error %d sub-error %d\n",
                         rc, resp.resp_sub_errno);
                 return -EIO;
@@ -287,25 +287,25 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) &&
             (rc == PCI_SLOT_ALREADY_DOWN)) {
-                dev_dbg(slot->pci_bus->self, "Slot %s already inactive\n");
+                dev_dbg(&slot->pci_bus->self->dev, "Slot %s already inactive\n", slot->physical_path);
                 return 1; /* return 1 to user */
         }
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) {
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "Cannot remove last 33MHz card\n");
                 return -EPERM;
         }
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "L1 failure %d with message \n%s\n",
                         resp.resp_sub_errno, resp.resp_l1_msg);
                 return -EPERM;
         }
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) {
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "remove failed with error %d sub-error %d\n",
                         rc, resp.resp_sub_errno);
                 return -EIO;
@@ -317,12 +317,12 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
         if ((action == PCI_REQ_SLOT_DISABLE) && !rc) {
                 pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot->pci_bus);
                 pcibus_info->pbi_enabled_devices &= ~(1 << device_num);
-                dev_dbg(slot->pci_bus->self, "remove successful\n");
+                dev_dbg(&slot->pci_bus->self->dev, "remove successful\n");
                 return 0;
         }
 
         if ((action == PCI_REQ_SLOT_DISABLE) && rc) {
-                dev_dbg(slot->pci_bus->self,"remove failed rc = %d\n", rc);
+                dev_dbg(&slot->pci_bus->self->dev,"remove failed rc = %d\n", rc);
         }
 
         return rc;
@@ -375,7 +375,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
         num_funcs = pci_scan_slot(slot->pci_bus,
                                   PCI_DEVFN(slot->device_num + 1, 0));
         if (!num_funcs) {
-                dev_dbg(slot->pci_bus->self, "no device in slot\n");
+                dev_dbg(&slot->pci_bus->self->dev, "no device in slot\n");
                 mutex_unlock(&sn_hotplug_mutex);
                 return -ENODEV;
         }
@@ -427,7 +427,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                 phandle = PCI_CONTROLLER(slot->pci_bus)->acpi_handle;
 
                 if (acpi_bus_get_device(phandle, &pdevice)) {
-                        dev_dbg(slot->pci_bus->self,
+                        dev_dbg(&slot->pci_bus->self->dev,
                                 "no parent device, assuming NULL\n");
                         pdevice = NULL;
                 }
@@ -479,10 +479,10 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
         mutex_unlock(&sn_hotplug_mutex);
 
         if (rc == 0)
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "insert operation successful\n");
         else
-                dev_dbg(slot->pci_bus->self,
+                dev_dbg(&slot->pci_bus->self->dev,
                         "insert operation failed rc = %d\n", rc);
 
         return rc;
@@ -659,16 +659,16 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)
                 if (rc)
                         goto register_err;
         }
-        dev_dbg(pci_bus->self, "Registered bus with hotplug\n");
+        dev_dbg(&pci_bus->self->dev, "Registered bus with hotplug\n");
         return rc;
 
 register_err:
-        dev_dbg(pci_bus->self, "bus failed to register with err = %d\n",
+        dev_dbg(&pci_bus->self->dev, "bus failed to register with err = %d\n",
                 rc);
 
 alloc_err:
         if (rc == -ENOMEM)
-                dev_dbg(pci_bus->self, "Memory allocation error\n");
+                dev_dbg(&pci_bus->self->dev, "Memory allocation error\n");
 
         /* destroy THIS element */
         if (bss_hotplug_slot)
@@ -701,10 +701,10 @@ static int sn_pci_hotplug_init(void)
 
                 rc = sn_pci_bus_valid(pci_bus);
                 if (rc != 1) {
-                        dev_dbg(pci_bus->self, "not a valid hotplug bus\n");
+                        dev_dbg(&pci_bus->self->dev, "not a valid hotplug bus\n");
                         continue;
                 }
-                dev_dbg(pci_bus->self, "valid hotplug bus\n");
+                dev_dbg(&pci_bus->self->dev, "valid hotplug bus\n");
 
                 rc = sn_hotplug_slot_register(pci_bus);
                 if (!rc) {
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 2c94d44279a3..d2fc35598cdd 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/workqueue.h>
 #include "../pci.h"
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 9e1321d0d5e6..d9cbd586ae4b 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/msi.h>
@@ -550,8 +549,10 @@ static int msi_free_irqs(struct pci_dev* dev)
 {
         struct msi_desc *entry, *tmp;
 
-        list_for_each_entry(entry, &dev->msi_list, list)
-                BUG_ON(irq_has_action(entry->irq));
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                if (entry->irq)
+                        BUG_ON(irq_has_action(entry->irq));
+        }
 
         arch_teardown_msi_irqs(dev);
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 3bb7739d26a5..8e58ea3d95c0 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -119,7 +119,7 @@ static inline int pci_create_newid_file(struct pci_driver *drv)
  * system is in its list of supported devices.  Returns the matching
  * pci_device_id structure or %NULL if there is no match.
  *
- * Depreciated, don't use this as it will not catch any dynamic ids
+ * Deprecated, don't use this as it will not catch any dynamic ids
  * that a driver might want to check for.
  */
 const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index bf655dbaf8e2..5cca394d5999 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -8,6 +8,7 @@
 #ifndef _AERDRV_H_
 #define _AERDRV_H_
 
+#include <linux/workqueue.h>
 #include <linux/pcieport_if.h>
 #include <linux/aer.h>
 
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index ed87aa59f0b1..0425a7b7350d 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 147d86f8edbf..6ccc2e95930a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -875,6 +875,7 @@ static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_sb600_sata);
 
 /*
  *      Serverworks CSB5 IDE does not fully support native mode
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index fda06941e730..383107ba4bd3 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -175,6 +175,7 @@ static int __init mst_pcmcia_init(void)
         if (!mst_pcmcia_device)
                 return -ENOMEM;
 
+        mst_pcmcia_device->dev.uevent_suppress = 0;
         mst_pcmcia_device->dev.platform_data = &mst_pcmcia_ops;
 
         ret = platform_device_add(mst_pcmcia_device);
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index b7b9e149c5b9..a2daa3f531b2 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -261,6 +261,7 @@ static int __init sharpsl_pcmcia_init(void)
         if (!sharpsl_pcmcia_device)
                 return -ENOMEM;
 
+        sharpsl_pcmcia_device->dev.uevent_suppress = 0;
         sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops;
         sharpsl_pcmcia_device->dev.parent = platform_scoop_config->devs[0].dev;
 
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index c5143201419a..1959cef8e9de 100644
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Plug and Play support"
+        depends on HAS_IOMEM
 
 config PNP
         bool "Plug and Play support"
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index aec83ec5ea23..3e20b1cc7778 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/dma-mapping.h>
 
 #include "base.h"
 
@@ -22,6 +23,14 @@ static LIST_HEAD(pnp_protocols);
 LIST_HEAD(pnp_global);
 DEFINE_SPINLOCK(pnp_lock);
 
+/*
+ * ACPI or PNPBIOS should tell us about all platform devices, so we can
+ * skip some blind probes.  ISAPNP typically enumerates only plug-in ISA
+ * devices, not built-in things like COM ports.
+ */
+int pnp_platform_devices;
+EXPORT_SYMBOL(pnp_platform_devices);
+
 void *pnp_alloc(long size)
 {
         void *result;
@@ -114,6 +123,8 @@ int __pnp_add_device(struct pnp_dev *dev)
         int ret;
         pnp_fixup_device(dev);
         dev->dev.bus = &pnp_bus_type;
+        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
         dev->dev.release = &pnp_release_device;
         dev->status = PNP_READY;
         spin_lock(&pnp_lock);
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 62eda5d59024..a00548799e98 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.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
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
- 
+
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 #include <acpi/acpi_bus.h>
@@ -82,7 +82,7 @@ static void __init pnpidacpi_to_pnpid(char *id, char *str)
 static int pnpacpi_get_resources(struct pnp_dev * dev, struct pnp_resource_table * res)
 {
         acpi_status status;
-        status = pnpacpi_parse_allocated_resource((acpi_handle)dev->data, 
+        status = pnpacpi_parse_allocated_resource((acpi_handle)dev->data,
                 &dev->res);
         return ACPI_FAILURE(status) ? -ENODEV : 0;
 }
@@ -112,9 +112,9 @@ static int pnpacpi_set_resources(struct pnp_dev * dev, struct pnp_resource_table
 static int pnpacpi_disable_resources(struct pnp_dev *dev)
 {
         acpi_status status;
-        
+
         /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
-        status = acpi_evaluate_object((acpi_handle)dev->data, 
+        status = acpi_evaluate_object((acpi_handle)dev->data,
                 "_DIS", NULL, NULL);
         return ACPI_FAILURE(status) ? -ENODEV : 0;
 }
@@ -167,7 +167,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 strncpy(dev->name, acpi_device_bid(device), sizeof(dev->name));
 
         dev->number = num;
-        
+
         /* set the initial values for the PnP device */
         dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
@@ -185,14 +185,14 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         }
 
         if(dev->capabilities & PNP_CONFIGURABLE) {
-                status = pnpacpi_parse_resource_option_data(device->handle, 
+                status = pnpacpi_parse_resource_option_data(device->handle,
                         dev);
                 if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
                         pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s", dev_id->id);
                         goto err1;
                 }
         }
-        
+
         /* parse compatible ids */
         if (device->flags.compatible_ids) {
                 struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
@@ -236,6 +236,42 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
         return AE_OK;
 }
 
+static int __init acpi_pnp_match(struct device *dev, void *_pnp)
+{
+        struct acpi_device      *acpi = to_acpi_device(dev);
+        struct pnp_dev          *pnp = _pnp;
+
+        /* true means it matched */
+        return acpi->flags.hardware_id
+                && !acpi_get_physical_device(acpi->handle)
+                && compare_pnp_id(pnp->id, acpi->pnp.hardware_id);
+}
+
+static int __init acpi_pnp_find_device(struct device *dev, acpi_handle *handle)
+{
+        struct device           *adev;
+        struct acpi_device      *acpi;
+
+        adev = bus_find_device(&acpi_bus_type, NULL,
+                        to_pnp_dev(dev),
+                        acpi_pnp_match);
+        if (!adev)
+                return -ENODEV;
+
+        acpi = to_acpi_device(adev);
+        *handle = acpi->handle;
+        put_device(adev);
+        return 0;
+}
+
+/* complete initialization of a PNPACPI device includes having
+ * pnpdev->dev.archdata.acpi_handle point to its ACPI sibling.
+ */
+static struct acpi_bus_type __initdata acpi_pnp_bus = {
+        .bus = &pnp_bus_type,
+        .find_device = acpi_pnp_find_device,
+};
+
 int pnpacpi_disabled __initdata;
 static int __init pnpacpi_init(void)
 {
@@ -245,8 +281,11 @@ static int __init pnpacpi_init(void)
         }
         pnp_info("PnP ACPI init");
         pnp_register_protocol(&pnpacpi_protocol);
+        register_acpi_bus_type(&acpi_pnp_bus);
         acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL);
         pnp_info("PnP ACPI: found %d devices", num);
+        unregister_acpi_bus_type(&acpi_pnp_bus);
+        pnp_platform_devices = 1;
         return 0;
 }
 subsys_initcall(pnpacpi_init);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 95738dbd5d45..3a201b77b963 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -62,6 +62,7 @@
 #include <linux/delay.h>
 #include <linux/acpi.h>
 #include <linux/freezer.h>
+#include <linux/kthread.h>
 
 #include <asm/page.h>
 #include <asm/desc.h>
@@ -159,9 +160,7 @@ static int pnp_dock_thread(void * unused)
 {
         static struct pnp_docking_station_info now;
         int docked = -1, d = 0;
-        daemonize("kpnpbiosd");
-        allow_signal(SIGKILL);
-        while(!unloading && !signal_pending(current))
+        while (!unloading)
         {
                 int status;
                 
@@ -170,11 +169,8 @@ static int pnp_dock_thread(void * unused)
                  */
                 msleep_interruptible(2000);
 
-                if(signal_pending(current)) {
-                        if (try_to_freeze())
-                                continue;
-                        break;
-                }
+                if (try_to_freeze())
+                        continue;
 
                 status = pnp_bios_dock_station_info(&now);
 
@@ -574,6 +570,7 @@ static int __init pnpbios_init(void)
         /* scan for pnpbios devices */
         build_devlist();
 
+        pnp_platform_devices = 1;
         return 0;
 }
 
@@ -581,6 +578,7 @@ subsys_initcall(pnpbios_init);
 
 static int __init pnpbios_thread_init(void)
 {
+        struct task_struct *task;
 #if defined(CONFIG_PPC_MERGE)
         if (check_legacy_ioport(PNPBIOS_BASE))
                 return 0;
@@ -589,7 +587,8 @@ static int __init pnpbios_thread_init(void)
                 return 0;
 #ifdef CONFIG_HOTPLUG
         init_completion(&unload_sem);
-        if (kernel_thread(pnp_dock_thread, NULL, CLONE_KERNEL) > 0)
+        task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
+        if (!IS_ERR(task))
                 unloading = 0;
 #endif
         return 0;
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index e97ecefe8584..277df50c89ae 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/pnp.h>
+#include <linux/io.h>
 #include "base.h"
 
 
@@ -106,6 +107,34 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
         return;
 }
 
+static void quirk_smc_enable(struct pnp_dev *dev)
+{
+        unsigned int firbase;
+
+        if (!dev->active || !pnp_port_valid(dev, 1))
+                return;
+
+        /*
+         * On the HP/Compaq nw8240 (and probably other similar machines),
+         * there is an SMCF010 device with two I/O port regions:
+         *
+         *      0x3e8-0x3ef SIR
+         *      0x100-0x10f FIR
+         *
+         * _STA reports the device is enabled, but in fact, the BIOS
+         * neglects to enable the FIR range.  Fortunately, it does fully
+         * enable the device if we call _SRS.
+         */
+        firbase = pnp_port_start(dev, 1);
+        if (inb(firbase + 0x7 /* IRCC_MASTER */) == 0xff) {
+                pnp_err("%s (%s) enabled but not responding, disabling and "
+                        "re-enabling", dev->dev.bus_id, pnp_dev_name(dev));
+                pnp_disable_dev(dev);
+                pnp_activate_dev(dev);
+        }
+}
+
+
 /*
  *  PnP Quirks
  *  Cards or devices that need some tweaking due to incomplete resource info
@@ -126,6 +155,7 @@ static struct pnp_fixup pnp_fixups[] = {
         { "CTL0043", quirk_sb16audio_resources },
         { "CTL0044", quirk_sb16audio_resources },
         { "CTL0045", quirk_sb16audio_resources },
+        { "SMCf010", quirk_smc_enable },
         { "" }
 };
 
diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c
index 7d7cab1d91b4..ec2d36a1bc67 100644
--- a/drivers/ps3/vuart.c
+++ b/drivers/ps3/vuart.c
@@ -886,12 +886,12 @@ static int ps3_vuart_probe(struct device *_dev)
 
         if (++vuart_bus_priv.use_count == 1) {
 
-                result = ps3_alloc_vuart_irq(PS3_BINDING_CPU_ANY,
+                result = ps3_vuart_irq_setup(PS3_BINDING_CPU_ANY,
                         (void*)&vuart_bus_priv.bmp.status, &vuart_bus_priv.virq);
 
                 if (result) {
                         dev_dbg(&dev->core,
-                                "%s:%d: ps3_alloc_vuart_irq failed (%d)\n",
+                                "%s:%d: ps3_vuart_irq_setup failed (%d)\n",
                                 __func__, __LINE__, result);
                         result = -EPERM;
                         goto fail_alloc_irq;
@@ -937,7 +937,7 @@ static int ps3_vuart_probe(struct device *_dev)
 fail_probe:
         ps3_vuart_set_interrupt_mask(dev, 0);
 fail_request_irq:
-        ps3_free_vuart_irq(vuart_bus_priv.virq);
+        ps3_vuart_irq_destroy(vuart_bus_priv.virq);
         vuart_bus_priv.virq = NO_IRQ;
 fail_alloc_irq:
         --vuart_bus_priv.use_count;
@@ -975,7 +975,7 @@ static int ps3_vuart_remove(struct device *_dev)
         if (--vuart_bus_priv.use_count == 0) {
                 BUG();
                 free_irq(vuart_bus_priv.virq, &vuart_bus_priv);
-                ps3_free_vuart_irq(vuart_bus_priv.virq);
+                ps3_vuart_irq_destroy(vuart_bus_priv.virq);
                 vuart_bus_priv.virq = NO_IRQ;
         }
 
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index ef1eae98ba44..4e4c10a7fd3a 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Real Time Clock"
+        depends on !S390
 
 config RTC_LIB
         tristate
@@ -21,21 +22,31 @@ config RTC_CLASS
           will be called rtc-class.
 
 config RTC_HCTOSYS
-        bool "Set system time from RTC on startup"
+        bool "Set system time from RTC on startup and resume"
         depends on RTC_CLASS = y
         default y
         help
-          If you say yes here, the system time will be set using
-          the value read from the specified RTC device. This is useful
-          in order to avoid unnecessary fsck runs.
+          If you say yes here, the system time (wall clock) will be set using
+          the value read from a specified RTC device. This is useful to avoid
+          unnecessary fsck runs at boot time, and to network better.
 
 config RTC_HCTOSYS_DEVICE
-        string "The RTC to read the time from"
+        string "RTC used to set the system time"
         depends on RTC_HCTOSYS = y
         default "rtc0"
         help
-          The RTC device that will be used as the source for
-          the system time, usually rtc0.
+          The RTC device that will be used to (re)initialize the system
+          clock, usually rtc0.  Initialization is done when the system
+          starts up, and when it resumes from a low power state.
+
+          This clock should be battery-backed, so that it reads the correct
+          time when the system boots from a power-off state.  Otherwise, your
+          system will need an external clock source (like an NTP server).
+
+          If the clock you specify here is not battery backed, it may still
+          be useful to reinitialize system time when resuming from system
+          sleep states.  Do not specify an RTC here unless it stays powered
+          during all this system's supported sleep states.
 
 config RTC_DEBUG
         bool "RTC debug support"
@@ -48,7 +59,7 @@ comment "RTC interfaces"
         depends on RTC_CLASS
 
 config RTC_INTF_SYSFS
-        tristate "sysfs"
+        boolean "/sys/class/rtc/rtcN (sysfs)"
         depends on RTC_CLASS && SYSFS
         default RTC_CLASS
         help
@@ -59,7 +70,7 @@ config RTC_INTF_SYSFS
           will be called rtc-sysfs.
 
 config RTC_INTF_PROC
-        tristate "proc"
+        boolean "/proc/driver/rtc (procfs for rtc0)"
         depends on RTC_CLASS && PROC_FS
         default RTC_CLASS
         help
@@ -71,7 +82,7 @@ config RTC_INTF_PROC
           will be called rtc-proc.
 
 config RTC_INTF_DEV
-        tristate "dev"
+        boolean "/dev/rtcN (character devices)"
         depends on RTC_CLASS
         default RTC_CLASS
         help
@@ -88,48 +99,30 @@ config RTC_INTF_DEV_UIE_EMUL
         bool "RTC UIE emulation on dev interface"
         depends on RTC_INTF_DEV
         help
-          Provides an emulation for RTC_UIE if the underlaying rtc chip
+          Provides an emulation for RTC_UIE if the underlying rtc chip
           driver does not expose RTC_UIE ioctls.  Those requests generate
           once-per-second update interrupts, used for synchronization.
 
-comment "RTC drivers"
+config RTC_DRV_TEST
+        tristate "Test driver/device"
         depends on RTC_CLASS
-
-# this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
-# requires <asm/mc146818rtc.h> defining CMOS_READ/CMOS_WRITE, and a
-# global rtc_lock ... it's not yet just another platform_device.
-
-config RTC_DRV_CMOS
-        tristate "PC-style 'CMOS' real time clock"
-        depends on RTC_CLASS && (X86 || ALPHA || ARM26 || ARM \
-                || M32R || ATARI || POWERPC)
-        help
-          Say "yes" here to get direct support for the real time clock
-          found in every PC or ACPI-based system, and some other boards.
-          Specifically the original MC146818, compatibles like those in
-          PC south bridges, the DS12887 or M48T86, some multifunction
-          or LPC bus chips, and so on.
-
-          Your system will need to define the platform device used by
-          this driver, otherwise it won't be accessible.  This means
-          you can safely enable this driver if you don't know whether
-          or not your board has this kind of hardware.
-
-          This driver can also be built as a module. If so, the module
-          will be called rtc-cmos.
-
-config RTC_DRV_X1205
-        tristate "Xicor/Intersil X1205"
-        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
-          Xicor/Intersil X1205 RTC chip.
+          RTC test driver. It's a software RTC which can be
+          used to test the RTC subsystem APIs. It gets
+          the time from the system clock.
+          You want this driver only if you are doing development
+          on the RTC subsystem. Please read the source code
+          for further details.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-x1205.
+          will be called rtc-test.
+
+comment "I2C RTC drivers"
+        depends on RTC_CLASS
 
 config RTC_DRV_DS1307
-        tristate "Dallas/Maxim DS1307 and similar I2C RTC chips"
+        tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00"
         depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for various compatible RTC
@@ -146,53 +139,55 @@ config RTC_DRV_DS1307
           This driver can also be built as a module. If so, the module
           will be called rtc-ds1307.
 
-config RTC_DRV_DS1553
-        tristate "Dallas DS1553"
-        depends on RTC_CLASS
+config RTC_DRV_DS1672
+        tristate "Dallas/Maxim DS1672"
+        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
-          Dallas DS1553 timekeeping chip.
+          Dallas/Maxim DS1672 timekeeping chip.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-ds1553.
+          will be called rtc-ds1672.
 
-config RTC_DRV_ISL1208
-        tristate "Intersil 1208"
+config RTC_DRV_MAX6900
+        tristate "Maxim 6900"
         depends on RTC_CLASS && I2C
         help
-          If you say yes here you get support for the
-          Intersil 1208 RTC chip.
+          If you say yes here you will get support for the
+          Maxim MAX6900 I2C RTC chip.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-isl1208.
+          will be called rtc-max6900.
 
-config RTC_DRV_DS1672
-        tristate "Dallas/Maxim DS1672"
+config RTC_DRV_RS5C372
+        tristate "Ricoh RS5C372A/B"
         depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
-          Dallas/Maxim DS1672 timekeeping chip.
+          Ricoh RS5C372A and RS5C372B RTC chips.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-ds1672.
+          will be called rtc-rs5c372.
 
-config RTC_DRV_DS1742
-        tristate "Dallas DS1742/1743"
-        depends on RTC_CLASS
+config RTC_DRV_ISL1208
+        tristate "Intersil 1208"
+        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the
-          Dallas DS1742/1743 timekeeping chip.
+          Intersil 1208 RTC chip.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-ds1742.
+          will be called rtc-isl1208.
 
-config RTC_DRV_OMAP
-        tristate "TI OMAP1"
-        depends on RTC_CLASS && ( \
-                ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 )
+config RTC_DRV_X1205
+        tristate "Xicor/Intersil X1205"
+        depends on RTC_CLASS && I2C
         help
-          Say "yes" here to support the real time clock on TI OMAP1 chips.
-          This driver can also be built as a module called rtc-omap.
+          If you say yes here you get support for the
+          Xicor/Intersil X1205 RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-x1205.
 
 config RTC_DRV_PCF8563
         tristate "Philips PCF8563/Epson RTC8564"
@@ -207,16 +202,20 @@ config RTC_DRV_PCF8563
 
 config RTC_DRV_PCF8583
         tristate "Philips PCF8583"
-        depends on RTC_CLASS && I2C && ARCH_RPC
+        depends on RTC_CLASS && I2C
         help
           If you say yes here you get support for the Philips PCF8583
-          RTC chip found on Acorn RiscPCs.  This driver supports the
+          RTC chip found on Acorn RiscPCs. This driver supports the
           platform specific method of retrieving the current year from
-          the RTC's SRAM.
+          the RTC's SRAM. It will work on other platforms with the same
+          chip, but the year will probably have to be tweaked.
 
           This driver can also be built as a module. If so, the module
           will be called rtc-pcf8583.
 
+comment "SPI RTC drivers"
+        depends on RTC_CLASS
+
 config RTC_DRV_RS5C348
         tristate "Ricoh RS5C348A/B"
         depends on RTC_CLASS && SPI
@@ -227,15 +226,92 @@ config RTC_DRV_RS5C348
           This driver can also be built as a module. If so, the module
           will be called rtc-rs5c348.
 
-config RTC_DRV_RS5C372
-        tristate "Ricoh RS5C372A/B"
-        depends on RTC_CLASS && I2C
+config RTC_DRV_MAX6902
+        tristate "Maxim 6902"
+        depends on RTC_CLASS && SPI
+        help
+          If you say yes here you will get support for the
+          Maxim MAX6902 SPI RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-max6902.
+
+comment "Platform RTC drivers"
+        depends on RTC_CLASS
+
+# this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
+# requires <asm/mc146818rtc.h> defining CMOS_READ/CMOS_WRITE, and a
+# global rtc_lock ... it's not yet just another platform_device.
+
+config RTC_DRV_CMOS
+        tristate "PC-style 'CMOS'"
+        depends on RTC_CLASS && (X86 || ALPHA || ARM26 || ARM \
+                || M32R || ATARI || POWERPC || MIPS)
+        help
+          Say "yes" here to get direct support for the real time clock
+          found in every PC or ACPI-based system, and some other boards.
+          Specifically the original MC146818, compatibles like those in
+          PC south bridges, the DS12887 or M48T86, some multifunction
+          or LPC bus chips, and so on.
+
+          Your system will need to define the platform device used by
+          this driver, otherwise it won't be accessible.  This means
+          you can safely enable this driver if you don't know whether
+          or not your board has this kind of hardware.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-cmos.
+
+config RTC_DRV_DS1553
+        tristate "Dallas DS1553"
+        depends on RTC_CLASS
         help
           If you say yes here you get support for the
-          Ricoh RS5C372A and RS5C372B RTC chips.
+          Dallas DS1553 timekeeping chip.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-rs5c372.
+          will be called rtc-ds1553.
+
+config RTC_DRV_DS1742
+        tristate "Dallas DS1742/1743"
+        depends on RTC_CLASS
+        help
+          If you say yes here you get support for the
+          Dallas DS1742/1743 timekeeping chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ds1742.
+
+config RTC_DRV_M48T86
+        tristate "ST M48T86/Dallas DS12887"
+        depends on RTC_CLASS
+        help
+          If you say Y here you will get support for the
+          ST M48T86 and Dallas DS12887 RTC chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-m48t86.
+
+config RTC_DRV_V3020
+        tristate "EM Microelectronic V3020"
+        depends on RTC_CLASS
+        help
+          If you say yes here you will get support for the
+          EM Microelectronic v3020 RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-v3020.
+
+comment "on-CPU RTC drivers"
+        depends on RTC_CLASS
+
+config RTC_DRV_OMAP
+        tristate "TI OMAP1"
+        depends on RTC_CLASS && ( \
+                ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 )
+        help
+          Say "yes" here to support the real time clock on TI OMAP1 chips.
+          This driver can also be built as a module called rtc-omap.
 
 config RTC_DRV_S3C
         tristate "Samsung S3C series SoC RTC"
@@ -253,16 +329,6 @@ config RTC_DRV_S3C
           This driver can also be build as a module. If so, the module
           will be called rtc-s3c.
 
-config RTC_DRV_M48T86
-        tristate "ST M48T86/Dallas DS12887"
-        depends on RTC_CLASS
-        help
-          If you say Y here you will get support for the
-          ST M48T86 and Dallas DS12887 RTC chips.
-
-          This driver can also be built as a module. If so, the module
-          will be called rtc-m48t86.
-
 config RTC_DRV_EP93XX
         tristate "Cirrus Logic EP93XX"
         depends on RTC_CLASS && ARCH_EP93XX
@@ -308,7 +374,7 @@ config RTC_DRV_PL031
         depends on RTC_CLASS && ARM_AMBA
         help
           If you say Y here you will get access to ARM AMBA
-          PrimeCell PL031 UART found on certain ARM SOCs.
+          PrimeCell PL031 RTC found on certain ARM SOCs.
 
           To compile this driver as a module, choose M here: the
           module will be called rtc-pl031.
@@ -319,41 +385,6 @@ config RTC_DRV_AT91RM9200
         help
           Driver for the Atmel AT91RM9200's internal RTC (Realtime Clock).
 
-config RTC_DRV_TEST
-        tristate "Test driver/device"
-        depends on RTC_CLASS
-        help
-          If you say yes here you get support for the
-          RTC test driver. It's a software RTC which can be
-          used to test the RTC subsystem APIs. It gets
-          the time from the system clock.
-          You want this driver only if you are doing development
-          on the RTC subsystem. Please read the source code
-          for further details.
-
-          This driver can also be built as a module. If so, the module
-          will be called rtc-test.
-
-config RTC_DRV_MAX6902
-        tristate "Maxim 6902"
-        depends on RTC_CLASS && SPI
-        help
-          If you say yes here you will get support for the
-          Maxim MAX6902 spi RTC chip.
-
-          This driver can also be built as a module. If so, the module
-          will be called rtc-max6902.
-
-config RTC_DRV_V3020
-        tristate "EM Microelectronic V3020"
-        depends on RTC_CLASS
-        help
-          If you say yes here you will get support for the
-          EM Microelectronic v3020 RTC chip.
-
-          This driver can also be built as a module. If so, the module
-          will be called rtc-v3020.
-
 config RTC_DRV_BFIN
         tristate "Blackfin On-Chip RTC"
         depends on RTC_CLASS && BFIN
@@ -364,4 +395,10 @@ config RTC_DRV_BFIN
           This driver can also be built as a module. If so, the module
           will be called rtc-bfin.
 
+config RTC_DRV_RS5C313
+        tristate "Ricoh RS5C313"
+        depends on RTC_CLASS && SH_LANDISK
+        help
+          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
+
 endmenu
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 9218cf28d6ed..a1afbc236073 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -11,9 +11,9 @@ obj-$(CONFIG_RTC_HCTOSYS)	+= hctosys.o
 obj-$(CONFIG_RTC_CLASS)         += rtc-core.o
 rtc-core-y                      := class.o interface.o
 
-obj-$(CONFIG_RTC_INTF_SYSFS)    += rtc-sysfs.o
-obj-$(CONFIG_RTC_INTF_PROC)     += rtc-proc.o
-obj-$(CONFIG_RTC_INTF_DEV)      += rtc-dev.o
+rtc-core-$(CONFIG_RTC_INTF_DEV) += rtc-dev.o
+rtc-core-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o
+rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
 
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
 obj-$(CONFIG_RTC_DRV_X1205)     += rtc-x1205.o
@@ -30,10 +30,12 @@ obj-$(CONFIG_RTC_DRV_S3C)	+= rtc-s3c.o
 obj-$(CONFIG_RTC_DRV_RS5C348)   += rtc-rs5c348.o
 obj-$(CONFIG_RTC_DRV_M48T86)    += rtc-m48t86.o
 obj-$(CONFIG_RTC_DRV_DS1553)    += rtc-ds1553.o
+obj-$(CONFIG_RTC_DRV_RS5C313)   += rtc-rs5c313.o
 obj-$(CONFIG_RTC_DRV_EP93XX)    += rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_SA1100)    += rtc-sa1100.o
 obj-$(CONFIG_RTC_DRV_VR41XX)    += rtc-vr41xx.o
 obj-$(CONFIG_RTC_DRV_PL031)     += rtc-pl031.o
+obj-$(CONFIG_RTC_DRV_MAX6900)   += rtc-max6900.o
 obj-$(CONFIG_RTC_DRV_MAX6902)   += rtc-max6902.o
 obj-$(CONFIG_RTC_DRV_V3020)     += rtc-v3020.o
 obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 04aaa6347234..8b3cd31d6a61 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -16,19 +16,94 @@
 #include <linux/kdev_t.h>
 #include <linux/idr.h>
 
+#include "rtc-core.h"
+
+
 static DEFINE_IDR(rtc_idr);
 static DEFINE_MUTEX(idr_lock);
 struct class *rtc_class;
 
-static void rtc_device_release(struct class_device *class_dev)
+static void rtc_device_release(struct device *dev)
 {
-        struct rtc_device *rtc = to_rtc_device(class_dev);
+        struct rtc_device *rtc = to_rtc_device(dev);
         mutex_lock(&idr_lock);
         idr_remove(&rtc_idr, rtc->id);
         mutex_unlock(&idr_lock);
         kfree(rtc);
 }
 
+#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
+
+/*
+ * On suspend(), measure the delta between one RTC and the
+ * system's wall clock; restore it on resume().
+ */
+
+static struct timespec  delta;
+static time_t           oldtime;
+
+static int rtc_suspend(struct device *dev, pm_message_t mesg)
+{
+        struct rtc_device       *rtc = to_rtc_device(dev);
+        struct rtc_time         tm;
+
+        if (strncmp(rtc->dev.bus_id,
+                                CONFIG_RTC_HCTOSYS_DEVICE,
+                                BUS_ID_SIZE) != 0)
+                return 0;
+
+        rtc_read_time(rtc, &tm);
+        rtc_tm_to_time(&tm, &oldtime);
+
+        /* RTC precision is 1 second; adjust delta for avg 1/2 sec err */
+        set_normalized_timespec(&delta,
+                                xtime.tv_sec - oldtime,
+                                xtime.tv_nsec - (NSEC_PER_SEC >> 1));
+
+        return 0;
+}
+
+static int rtc_resume(struct device *dev)
+{
+        struct rtc_device       *rtc = to_rtc_device(dev);
+        struct rtc_time         tm;
+        time_t                  newtime;
+        struct timespec         time;
+
+        if (strncmp(rtc->dev.bus_id,
+                                CONFIG_RTC_HCTOSYS_DEVICE,
+                                BUS_ID_SIZE) != 0)
+                return 0;
+
+        rtc_read_time(rtc, &tm);
+        if (rtc_valid_tm(&tm) != 0) {
+                pr_debug("%s:  bogus resume time\n", rtc->dev.bus_id);
+                return 0;
+        }
+        rtc_tm_to_time(&tm, &newtime);
+        if (newtime <= oldtime) {
+                if (newtime < oldtime)
+                        pr_debug("%s:  time travel!\n", rtc->dev.bus_id);
+                return 0;
+        }
+
+        /* restore wall clock using delta against this RTC;
+         * adjust again for avg 1/2 second RTC sampling error
+         */
+        set_normalized_timespec(&time,
+                                newtime + delta.tv_sec,
+                                (NSEC_PER_SEC >> 1) + delta.tv_nsec);
+        do_settimeofday(&time);
+
+        return 0;
+}
+
+#else
+#define rtc_suspend     NULL
+#define rtc_resume      NULL
+#endif
+
+
 /**
  * rtc_device_register - register w/ RTC class
  * @dev: the device to register
@@ -70,23 +145,29 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc->ops = ops;
         rtc->owner = owner;
         rtc->max_user_freq = 64;
-        rtc->class_dev.dev = dev;
-        rtc->class_dev.class = rtc_class;
-        rtc->class_dev.release = rtc_device_release;
+        rtc->dev.parent = dev;
+        rtc->dev.class = rtc_class;
+        rtc->dev.release = rtc_device_release;
 
         mutex_init(&rtc->ops_lock);
         spin_lock_init(&rtc->irq_lock);
         spin_lock_init(&rtc->irq_task_lock);
 
         strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
-        snprintf(rtc->class_dev.class_id, BUS_ID_SIZE, "rtc%d", id);
+        snprintf(rtc->dev.bus_id, BUS_ID_SIZE, "rtc%d", id);
 
-        err = class_device_register(&rtc->class_dev);
+        rtc_dev_prepare(rtc);
+
+        err = device_register(&rtc->dev);
         if (err)
                 goto exit_kfree;
 
+        rtc_dev_add_device(rtc);
+        rtc_sysfs_add_device(rtc);
+        rtc_proc_add_device(rtc);
+
         dev_info(dev, "rtc core: registered %s as %s\n",
-                        rtc->name, rtc->class_dev.class_id);
+                        rtc->name, rtc->dev.bus_id);
 
         return rtc;
 
@@ -113,26 +194,22 @@ EXPORT_SYMBOL_GPL(rtc_device_register);
  */
 void rtc_device_unregister(struct rtc_device *rtc)
 {
-        if (class_device_get(&rtc->class_dev) != NULL) {
+        if (get_device(&rtc->dev) != NULL) {
                 mutex_lock(&rtc->ops_lock);
                 /* remove innards of this RTC, then disable it, before
                  * letting any rtc_class_open() users access it again
                  */
-                class_device_unregister(&rtc->class_dev);
+                rtc_sysfs_del_device(rtc);
+                rtc_dev_del_device(rtc);
+                rtc_proc_del_device(rtc);
+                device_unregister(&rtc->dev);
                 rtc->ops = NULL;
                 mutex_unlock(&rtc->ops_lock);
-                class_device_put(&rtc->class_dev);
+                put_device(&rtc->dev);
         }
 }
 EXPORT_SYMBOL_GPL(rtc_device_unregister);
 
-int rtc_interface_register(struct class_interface *intf)
-{
-        intf->class = rtc_class;
-        return class_interface_register(intf);
-}
-EXPORT_SYMBOL_GPL(rtc_interface_register);
-
 static int __init rtc_init(void)
 {
         rtc_class = class_create(THIS_MODULE, "rtc");
@@ -140,11 +217,16 @@ static int __init rtc_init(void)
                 printk(KERN_ERR "%s: couldn't create class\n", __FILE__);
                 return PTR_ERR(rtc_class);
         }
+        rtc_class->suspend = rtc_suspend;
+        rtc_class->resume = rtc_resume;
+        rtc_dev_init();
+        rtc_sysfs_init(rtc_class);
         return 0;
 }
 
 static void __exit rtc_exit(void)
 {
+        rtc_dev_exit();
         class_destroy(rtc_class);
 }
 
diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
index d02fe9a0001f..178527252c6a 100644
--- a/drivers/rtc/hctosys.c
+++ b/drivers/rtc/hctosys.c
@@ -26,15 +26,15 @@ static int __init rtc_hctosys(void)
 {
         int err;
         struct rtc_time tm;
-        struct class_device *class_dev = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+        struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
 
-        if (class_dev == NULL) {
+        if (rtc == NULL) {
                 printk("%s: unable to open rtc device (%s)\n",
                         __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
                 return -ENODEV;
         }
 
-        err = rtc_read_time(class_dev, &tm);
+        err = rtc_read_time(rtc, &tm);
         if (err == 0) {
                 err = rtc_valid_tm(&tm);
                 if (err == 0) {
@@ -46,7 +46,7 @@ static int __init rtc_hctosys(void)
 
                         do_settimeofday(&tv);
 
-                        dev_info(class_dev->dev,
+                        dev_info(rtc->dev.parent,
                                 "setting the system clock to "
                                 "%d-%02d-%02d %02d:%02d:%02d (%u)\n",
                                 tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
@@ -54,14 +54,14 @@ static int __init rtc_hctosys(void)
                                 (unsigned int) tv.tv_sec);
                 }
                 else
-                        dev_err(class_dev->dev,
+                        dev_err(rtc->dev.parent,
                                 "hctosys: invalid date/time\n");
         }
         else
-                dev_err(class_dev->dev,
+                dev_err(rtc->dev.parent,
                         "hctosys: unable to read the hardware clock\n");
 
-        rtc_class_close(class_dev);
+        rtc_class_close(rtc);
 
         return 0;
 }
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index ef40df0f169d..ad66c6ecf365 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -13,10 +13,9 @@
 
 #include <linux/rtc.h>
 
-int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm)
+int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm)
 {
         int err;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         err = mutex_lock_interruptible(&rtc->ops_lock);
         if (err)
@@ -28,7 +27,7 @@ int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm)
                 err = -EINVAL;
         else {
                 memset(tm, 0, sizeof(struct rtc_time));
-                err = rtc->ops->read_time(class_dev->dev, tm);
+                err = rtc->ops->read_time(rtc->dev.parent, tm);
         }
 
         mutex_unlock(&rtc->ops_lock);
@@ -36,10 +35,9 @@ int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm)
 }
 EXPORT_SYMBOL_GPL(rtc_read_time);
 
-int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm)
+int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
 {
         int err;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         err = rtc_valid_tm(tm);
         if (err != 0)
@@ -54,17 +52,16 @@ int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm)
         else if (!rtc->ops->set_time)
                 err = -EINVAL;
         else
-                err = rtc->ops->set_time(class_dev->dev, tm);
+                err = rtc->ops->set_time(rtc->dev.parent, tm);
 
         mutex_unlock(&rtc->ops_lock);
         return err;
 }
 EXPORT_SYMBOL_GPL(rtc_set_time);
 
-int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
+int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
 {
         int err;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         err = mutex_lock_interruptible(&rtc->ops_lock);
         if (err)
@@ -73,11 +70,11 @@ int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
         if (!rtc->ops)
                 err = -ENODEV;
         else if (rtc->ops->set_mmss)
-                err = rtc->ops->set_mmss(class_dev->dev, secs);
+                err = rtc->ops->set_mmss(rtc->dev.parent, secs);
         else if (rtc->ops->read_time && rtc->ops->set_time) {
                 struct rtc_time new, old;
 
-                err = rtc->ops->read_time(class_dev->dev, &old);
+                err = rtc->ops->read_time(rtc->dev.parent, &old);
                 if (err == 0) {
                         rtc_time_to_tm(secs, &new);
 
@@ -89,7 +86,8 @@ int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
                          */
                         if (!((old.tm_hour == 23 && old.tm_min == 59) ||
                                 (new.tm_hour == 23 && new.tm_min == 59)))
-                                err = rtc->ops->set_time(class_dev->dev, &new);
+                                err = rtc->ops->set_time(rtc->dev.parent,
+                                                &new);
                 }
         }
         else
@@ -101,10 +99,9 @@ int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
 }
 EXPORT_SYMBOL_GPL(rtc_set_mmss);
 
-int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
+int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 {
         int err;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         err = mutex_lock_interruptible(&rtc->ops_lock);
         if (err)
@@ -116,7 +113,7 @@ int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
                 err = -EINVAL;
         else {
                 memset(alarm, 0, sizeof(struct rtc_wkalrm));
-                err = rtc->ops->read_alarm(class_dev->dev, alarm);
+                err = rtc->ops->read_alarm(rtc->dev.parent, alarm);
         }
 
         mutex_unlock(&rtc->ops_lock);
@@ -124,10 +121,13 @@ int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
 }
 EXPORT_SYMBOL_GPL(rtc_read_alarm);
 
-int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
+int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 {
         int err;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
+
+        err = rtc_valid_tm(&alarm->time);
+        if (err != 0)
+                return err;
 
         err = mutex_lock_interruptible(&rtc->ops_lock);
         if (err)
@@ -138,7 +138,7 @@ int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
         else if (!rtc->ops->set_alarm)
                 err = -EINVAL;
         else
-                err = rtc->ops->set_alarm(class_dev->dev, alarm);
+                err = rtc->ops->set_alarm(rtc->dev.parent, alarm);
 
         mutex_unlock(&rtc->ops_lock);
         return err;
@@ -147,16 +147,14 @@ EXPORT_SYMBOL_GPL(rtc_set_alarm);
 
 /**
  * rtc_update_irq - report RTC periodic, alarm, and/or update irqs
- * @class_dev: the rtc's class device
+ * @rtc: the rtc device
  * @num: how many irqs are being reported (usually one)
  * @events: mask of RTC_IRQF with one or more of RTC_PF, RTC_AF, RTC_UF
  * Context: in_interrupt(), irqs blocked
  */
-void rtc_update_irq(struct class_device *class_dev,
+void rtc_update_irq(struct rtc_device *rtc,
                 unsigned long num, unsigned long events)
 {
-        struct rtc_device *rtc = to_rtc_device(class_dev);
-
         spin_lock(&rtc->irq_lock);
         rtc->irq_data = (rtc->irq_data + (num << 8)) | events;
         spin_unlock(&rtc->irq_lock);
@@ -171,40 +169,43 @@ void rtc_update_irq(struct class_device *class_dev,
 }
 EXPORT_SYMBOL_GPL(rtc_update_irq);
 
-struct class_device *rtc_class_open(char *name)
+struct rtc_device *rtc_class_open(char *name)
 {
-        struct class_device *class_dev = NULL,
-                                *class_dev_tmp;
+        struct device *dev;
+        struct rtc_device *rtc = NULL;
 
         down(&rtc_class->sem);
-        list_for_each_entry(class_dev_tmp, &rtc_class->children, node) {
-                if (strncmp(class_dev_tmp->class_id, name, BUS_ID_SIZE) == 0) {
-                        class_dev = class_device_get(class_dev_tmp);
+        list_for_each_entry(dev, &rtc_class->devices, node) {
+                if (strncmp(dev->bus_id, name, BUS_ID_SIZE) == 0) {
+                        dev = get_device(dev);
+                        if (dev)
+                                rtc = to_rtc_device(dev);
                         break;
                 }
         }
 
-        if (class_dev) {
-                if (!try_module_get(to_rtc_device(class_dev)->owner))
-                        class_dev = NULL;
+        if (rtc) {
+                if (!try_module_get(rtc->owner)) {
+                        put_device(dev);
+                        rtc = NULL;
+                }
         }
         up(&rtc_class->sem);
 
-        return class_dev;
+        return rtc;
 }
 EXPORT_SYMBOL_GPL(rtc_class_open);
 
-void rtc_class_close(struct class_device *class_dev)
+void rtc_class_close(struct rtc_device *rtc)
 {
-        module_put(to_rtc_device(class_dev)->owner);
-        class_device_put(class_dev);
+        module_put(rtc->owner);
+        put_device(&rtc->dev);
 }
 EXPORT_SYMBOL_GPL(rtc_class_close);
 
-int rtc_irq_register(struct class_device *class_dev, struct rtc_task *task)
+int rtc_irq_register(struct rtc_device *rtc, struct rtc_task *task)
 {
         int retval = -EBUSY;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         if (task == NULL || task->func == NULL)
                 return -EINVAL;
@@ -220,9 +221,8 @@ int rtc_irq_register(struct class_device *class_dev, struct rtc_task *task)
 }
 EXPORT_SYMBOL_GPL(rtc_irq_register);
 
-void rtc_irq_unregister(struct class_device *class_dev, struct rtc_task *task)
+void rtc_irq_unregister(struct rtc_device *rtc, struct rtc_task *task)
 {
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         spin_lock_irq(&rtc->irq_task_lock);
         if (rtc->irq_task == task)
@@ -231,11 +231,10 @@ void rtc_irq_unregister(struct class_device *class_dev, struct rtc_task *task)
 }
 EXPORT_SYMBOL_GPL(rtc_irq_unregister);
 
-int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int enabled)
+int rtc_irq_set_state(struct rtc_device *rtc, struct rtc_task *task, int enabled)
 {
         int err = 0;
         unsigned long flags;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         if (rtc->ops->irq_set_state == NULL)
                 return -ENXIO;
@@ -246,17 +245,16 @@ int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int
         spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
 
         if (err == 0)
-                err = rtc->ops->irq_set_state(class_dev->dev, enabled);
+                err = rtc->ops->irq_set_state(rtc->dev.parent, enabled);
 
         return err;
 }
 EXPORT_SYMBOL_GPL(rtc_irq_set_state);
 
-int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int freq)
+int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq)
 {
         int err = 0;
         unsigned long flags;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
 
         if (rtc->ops->irq_set_freq == NULL)
                 return -ENXIO;
@@ -267,7 +265,7 @@ int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int
         spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
 
         if (err == 0) {
-                err = rtc->ops->irq_set_freq(class_dev->dev, freq);
+                err = rtc->ops->irq_set_freq(rtc->dev.parent, freq);
                 if (err == 0)
                         rtc->irq_freq = freq;
         }
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index ac0e68e2f025..33795e5a5595 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -263,7 +263,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
 
                 at91_sys_write(AT91_RTC_SCCR, rtsr);    /* clear status reg */
 
-                rtc_update_irq(&rtc->class_dev, 1, events);
+                rtc_update_irq(rtc, 1, events);
 
                 pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__,
                         events >> 8, events & 0x000000FF);
@@ -348,21 +348,10 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
 
 /* AT91RM9200 RTC Power management control */
 
-static struct timespec at91_rtc_delta;
 static u32 at91_rtc_imr;
 
 static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct rtc_time tm;
-        struct timespec time;
-
-        time.tv_nsec = 0;
-
-        /* calculate time delta for suspend */
-        at91_rtc_readtime(&pdev->dev, &tm);
-        rtc_tm_to_time(&tm, &time.tv_sec);
-        save_time_delta(&at91_rtc_delta, &time);
-
         /* this IRQ is shared with DBGU and other hardware which isn't
          * necessarily doing PM like we are...
          */
@@ -374,36 +363,17 @@ static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
                 else
                         at91_sys_write(AT91_RTC_IDR, at91_rtc_imr);
         }
-
-        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
-                1900 + tm.tm_year, tm.tm_mon, tm.tm_mday,
-                tm.tm_hour, tm.tm_min, tm.tm_sec);
-
         return 0;
 }
 
 static int at91_rtc_resume(struct platform_device *pdev)
 {
-        struct rtc_time tm;
-        struct timespec time;
-
-        time.tv_nsec = 0;
-
-        at91_rtc_readtime(&pdev->dev, &tm);
-        rtc_tm_to_time(&tm, &time.tv_sec);
-        restore_time_delta(&at91_rtc_delta, &time);
-
         if (at91_rtc_imr) {
                 if (device_may_wakeup(&pdev->dev))
                         disable_irq_wake(AT91_ID_SYS);
                 else
                         at91_sys_write(AT91_RTC_IER, at91_rtc_imr);
         }
-
-        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
-                1900 + tm.tm_year, tm.tm_mon, tm.tm_mday,
-                tm.tm_hour, tm.tm_min, tm.tm_sec);
-
         return 0;
 }
 #else
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 7c0d60910077..6085261aa2c1 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -46,6 +46,10 @@ struct cmos_rtc {
         int                     irq;
         struct resource         *iomem;
 
+        void                    (*wake_on)(struct device *);
+        void                    (*wake_off)(struct device *);
+
+        u8                      enabled_wake;
         u8                      suspend_ctrl;
 
         /* newer hardware extends the original register set */
@@ -203,7 +207,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
         rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
         rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
         if (is_intr(rtc_intr))
-                rtc_update_irq(&cmos->rtc->class_dev, 1, rtc_intr);
+                rtc_update_irq(cmos->rtc, 1, rtc_intr);
 
         /* update alarm */
         CMOS_WRITE(hrs, RTC_HOURS_ALARM);
@@ -223,7 +227,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
                 rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
                 rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
                 if (is_intr(rtc_intr))
-                        rtc_update_irq(&cmos->rtc->class_dev, 1, rtc_intr);
+                        rtc_update_irq(cmos->rtc, 1, rtc_intr);
         }
 
         spin_unlock_irq(&rtc_lock);
@@ -304,7 +308,7 @@ cmos_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
         rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
         rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
         if (is_intr(rtc_intr))
-                rtc_update_irq(&cmos->rtc->class_dev, 1, rtc_intr);
+                rtc_update_irq(cmos->rtc, 1, rtc_intr);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return 0;
 }
@@ -379,12 +383,12 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
                 return IRQ_NONE;
 }
 
-#ifdef  CONFIG_PNPACPI
-#define is_pnpacpi()    1
+#ifdef  CONFIG_PNP
+#define is_pnp()        1
 #define INITSECTION
 
 #else
-#define is_pnpacpi()    0
+#define is_pnp()        0
 #define INITSECTION     __init
 #endif
 
@@ -405,13 +409,20 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
         cmos_rtc.irq = rtc_irq;
         cmos_rtc.iomem = ports;
 
-        /* For ACPI systems the info comes from the FADT.  On others,
-         * board specific setup provides it as appropriate.
+        /* For ACPI systems extension info comes from the FADT.  On others,
+         * board specific setup provides it as appropriate.  Systems where
+         * the alarm IRQ isn't automatically a wakeup IRQ (like ACPI, and
+         * some almost-clones) can provide hooks to make that behave.
          */
         if (info) {
                 cmos_rtc.day_alrm = info->rtc_day_alarm;
                 cmos_rtc.mon_alrm = info->rtc_mon_alarm;
                 cmos_rtc.century = info->rtc_century;
+
+                if (info->wake_on && info->wake_off) {
+                        cmos_rtc.wake_on = info->wake_on;
+                        cmos_rtc.wake_off = info->wake_off;
+                }
         }
 
         cmos_rtc.rtc = rtc_device_register(driver_name, dev,
@@ -427,14 +438,14 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
          * REVISIT for non-x86 systems we may need to handle io memory
          * resources: ioremap them, and request_mem_region().
          */
-        if (is_pnpacpi()) {
+        if (is_pnp()) {
                 retval = request_resource(&ioport_resource, ports);
                 if (retval < 0) {
                         dev_dbg(dev, "i/o registers already in use\n");
                         goto cleanup0;
                 }
         }
-        rename_region(ports, cmos_rtc.rtc->class_dev.class_id);
+        rename_region(ports, cmos_rtc.rtc->dev.bus_id);
 
         spin_lock_irq(&rtc_lock);
 
@@ -470,8 +481,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 
         if (is_valid_irq(rtc_irq))
                 retval = request_irq(rtc_irq, cmos_interrupt, IRQF_DISABLED,
-                                cmos_rtc.rtc->class_dev.class_id,
-                                &cmos_rtc.rtc->class_dev);
+                                cmos_rtc.rtc->dev.bus_id,
+                                cmos_rtc.rtc);
         if (retval < 0) {
                 dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
                 goto cleanup1;
@@ -483,7 +494,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
          */
 
         pr_info("%s: alarms up to one %s%s\n",
-                        cmos_rtc.rtc->class_dev.class_id,
+                        cmos_rtc.rtc->dev.bus_id,
                         is_valid_irq(rtc_irq)
                                 ?  (cmos_rtc.mon_alrm
                                         ? "year"
@@ -520,12 +531,12 @@ static void __exit cmos_do_remove(struct device *dev)
 
         cmos_do_shutdown();
 
-        if (is_pnpacpi())
+        if (is_pnp())
                 release_resource(cmos->iomem);
         rename_region(cmos->iomem, NULL);
 
         if (is_valid_irq(cmos->irq))
-                free_irq(cmos->irq, &cmos_rtc.rtc->class_dev);
+                free_irq(cmos->irq, cmos_rtc.rtc);
 
         rtc_device_unregister(cmos_rtc.rtc);
 
@@ -555,16 +566,20 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
                 irqstat = CMOS_READ(RTC_INTR_FLAGS);
                 irqstat &= (tmp & RTC_IRQMASK) | RTC_IRQF;
                 if (is_intr(irqstat))
-                        rtc_update_irq(&cmos->rtc->class_dev, 1, irqstat);
+                        rtc_update_irq(cmos->rtc, 1, irqstat);
         }
         spin_unlock_irq(&rtc_lock);
 
-        /* ACPI HOOK:  enable ACPI_EVENT_RTC when (tmp & RTC_AIE)
-         * ... it'd be best if we could do that under rtc_lock.
-         */
+        if (tmp & RTC_AIE) {
+                cmos->enabled_wake = 1;
+                if (cmos->wake_on)
+                        cmos->wake_on(dev);
+                else
+                        enable_irq_wake(cmos->irq);
+        }
 
         pr_debug("%s: suspend%s, ctrl %02x\n",
-                        cmos_rtc.rtc->class_dev.class_id,
+                        cmos_rtc.rtc->dev.bus_id,
                         (tmp & RTC_AIE) ? ", alarm may wake" : "",
                         tmp);
 
@@ -576,26 +591,28 @@ static int cmos_resume(struct device *dev)
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
         unsigned char   tmp = cmos->suspend_ctrl;
 
-        /* REVISIT:  a mechanism to resync the system clock (jiffies)
-         * on resume should be portable between platforms ...
-         */
-
         /* re-enable any irqs previously active */
         if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) {
 
-                /* ACPI HOOK:  disable ACPI_EVENT_RTC when (tmp & RTC_AIE) */
+                if (cmos->enabled_wake) {
+                        if (cmos->wake_off)
+                                cmos->wake_off(dev);
+                        else
+                                disable_irq_wake(cmos->irq);
+                        cmos->enabled_wake = 0;
+                }
 
                 spin_lock_irq(&rtc_lock);
                 CMOS_WRITE(tmp, RTC_CONTROL);
                 tmp = CMOS_READ(RTC_INTR_FLAGS);
                 tmp &= (cmos->suspend_ctrl & RTC_IRQMASK) | RTC_IRQF;
                 if (is_intr(tmp))
-                        rtc_update_irq(&cmos->rtc->class_dev, 1, tmp);
+                        rtc_update_irq(cmos->rtc, 1, tmp);
                 spin_unlock_irq(&rtc_lock);
         }
 
         pr_debug("%s: resume, ctrl %02x\n",
-                        cmos_rtc.rtc->class_dev.class_id,
+                        cmos_rtc.rtc->dev.bus_id,
                         cmos->suspend_ctrl);
 
 
@@ -613,7 +630,7 @@ static int cmos_resume(struct device *dev)
  * the device node will always be created as a PNPACPI device.
  */
 
-#ifdef  CONFIG_PNPACPI
+#ifdef  CONFIG_PNP
 
 #include <linux/pnp.h>
 
@@ -684,11 +701,11 @@ static void __exit cmos_exit(void)
 }
 module_exit(cmos_exit);
 
-#else   /* no PNPACPI */
+#else   /* no PNP */
 
 /*----------------------------------------------------------------*/
 
-/* Platform setup should have set up an RTC device, when PNPACPI is
+/* Platform setup should have set up an RTC device, when PNP is
  * unavailable ... this could happen even on (older) PCs.
  */
 
@@ -734,7 +751,7 @@ static void __exit cmos_exit(void)
 module_exit(cmos_exit);
 
 
-#endif  /* !PNPACPI */
+#endif  /* !PNP */
 
 MODULE_AUTHOR("David Brownell");
 MODULE_DESCRIPTION("Driver for PC-style 'CMOS' RTCs");
diff --git a/drivers/rtc/rtc-core.h b/drivers/rtc/rtc-core.h
new file mode 100644
index 000000000000..5f9df7430a22
--- /dev/null
+++ b/drivers/rtc/rtc-core.h
@@ -0,0 +1,70 @@
+#ifdef CONFIG_RTC_INTF_DEV
+
+extern void __init rtc_dev_init(void);
+extern void __exit rtc_dev_exit(void);
+extern void rtc_dev_prepare(struct rtc_device *rtc);
+extern void rtc_dev_add_device(struct rtc_device *rtc);
+extern void rtc_dev_del_device(struct rtc_device *rtc);
+
+#else
+
+static inline void rtc_dev_init(void)
+{
+}
+
+static inline void rtc_dev_exit(void)
+{
+}
+
+static inline void rtc_dev_prepare(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_dev_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_dev_del_device(struct rtc_device *rtc)
+{
+}
+
+#endif
+
+#ifdef CONFIG_RTC_INTF_PROC
+
+extern void rtc_proc_add_device(struct rtc_device *rtc);
+extern void rtc_proc_del_device(struct rtc_device *rtc);
+
+#else
+
+static inline void rtc_proc_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_proc_del_device(struct rtc_device *rtc)
+{
+}
+
+#endif
+
+#ifdef CONFIG_RTC_INTF_SYSFS
+
+extern void __init rtc_sysfs_init(struct class *);
+extern void rtc_sysfs_add_device(struct rtc_device *rtc);
+extern void rtc_sysfs_del_device(struct rtc_device *rtc);
+
+#else
+
+static inline void rtc_sysfs_init(struct class *rtc)
+{
+}
+
+static inline void rtc_sysfs_add_device(struct rtc_device *rtc)
+{
+}
+
+static inline void rtc_sysfs_del_device(struct rtc_device *rtc)
+{
+}
+
+#endif
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 137330b8636b..f4e5f0040ff7 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -13,8 +13,8 @@
 
 #include <linux/module.h>
 #include <linux/rtc.h>
+#include "rtc-core.h"
 
-static struct class *rtc_dev_class;
 static dev_t rtc_devt;
 
 #define RTC_DEV_MAX 16 /* 16 RTCs should be enough for everyone... */
@@ -32,9 +32,9 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
         if (!(mutex_trylock(&rtc->char_lock)))
                 return -EBUSY;
 
-        file->private_data = &rtc->class_dev;
+        file->private_data = rtc;
 
-        err = ops->open ? ops->open(rtc->class_dev.dev) : 0;
+        err = ops->open ? ops->open(rtc->dev.parent) : 0;
         if (err == 0) {
                 spin_lock_irq(&rtc->irq_lock);
                 rtc->irq_data = 0;
@@ -61,7 +61,7 @@ static void rtc_uie_task(struct work_struct *work)
         int num = 0;
         int err;
 
-        err = rtc_read_time(&rtc->class_dev, &tm);
+        err = rtc_read_time(rtc, &tm);
 
         local_irq_disable();
         spin_lock(&rtc->irq_lock);
@@ -79,7 +79,7 @@ static void rtc_uie_task(struct work_struct *work)
         }
         spin_unlock(&rtc->irq_lock);
         if (num)
-                rtc_update_irq(&rtc->class_dev, num, RTC_UF | RTC_IRQF);
+                rtc_update_irq(rtc, num, RTC_UF | RTC_IRQF);
         local_irq_enable();
 }
 static void rtc_uie_timer(unsigned long data)
@@ -121,7 +121,7 @@ static int set_uie(struct rtc_device *rtc)
         struct rtc_time tm;
         int err;
 
-        err = rtc_read_time(&rtc->class_dev, &tm);
+        err = rtc_read_time(rtc, &tm);
         if (err)
                 return err;
         spin_lock_irq(&rtc->irq_lock);
@@ -180,7 +180,7 @@ rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (ret == 0) {
                 /* Check for any data updates */
                 if (rtc->ops->read_callback)
-                        data = rtc->ops->read_callback(rtc->class_dev.dev,
+                        data = rtc->ops->read_callback(rtc->dev.parent,
                                                        data);
 
                 if (sizeof(int) != sizeof(long) &&
@@ -210,8 +210,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
                 unsigned int cmd, unsigned long arg)
 {
         int err = 0;
-        struct class_device *class_dev = file->private_data;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
+        struct rtc_device *rtc = file->private_data;
         const struct rtc_class_ops *ops = rtc->ops;
         struct rtc_time tm;
         struct rtc_wkalrm alarm;
@@ -252,7 +251,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
 
         /* try the driver's ioctl interface */
         if (ops->ioctl) {
-                err = ops->ioctl(class_dev->dev, cmd, arg);
+                err = ops->ioctl(rtc->dev.parent, cmd, arg);
                 if (err != -ENOIOCTLCMD)
                         return err;
         }
@@ -264,7 +263,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         case RTC_ALM_READ:
-                err = rtc_read_alarm(class_dev, &alarm);
+                err = rtc_read_alarm(rtc, &alarm);
                 if (err < 0)
                         return err;
 
@@ -278,17 +277,53 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
 
                 alarm.enabled = 0;
                 alarm.pending = 0;
-                alarm.time.tm_mday = -1;
-                alarm.time.tm_mon = -1;
-                alarm.time.tm_year = -1;
                 alarm.time.tm_wday = -1;
                 alarm.time.tm_yday = -1;
                 alarm.time.tm_isdst = -1;
-                err = rtc_set_alarm(class_dev, &alarm);
+
+                /* RTC_ALM_SET alarms may be up to 24 hours in the future.
+                 * Rather than expecting every RTC to implement "don't care"
+                 * for day/month/year fields, just force the alarm to have
+                 * the right values for those fields.
+                 *
+                 * RTC_WKALM_SET should be used instead.  Not only does it
+                 * eliminate the need for a separate RTC_AIE_ON call, it
+                 * doesn't have the "alarm 23:59:59 in the future" race.
+                 *
+                 * NOTE:  some legacy code may have used invalid fields as
+                 * wildcards, exposing hardware "periodic alarm" capabilities.
+                 * Not supported here.
+                 */
+                {
+                        unsigned long now, then;
+
+                        err = rtc_read_time(rtc, &tm);
+                        if (err < 0)
+                                return err;
+                        rtc_tm_to_time(&tm, &now);
+
+                        alarm.time.tm_mday = tm.tm_mday;
+                        alarm.time.tm_mon = tm.tm_mon;
+                        alarm.time.tm_year = tm.tm_year;
+                        err  = rtc_valid_tm(&alarm.time);
+                        if (err < 0)
+                                return err;
+                        rtc_tm_to_time(&alarm.time, &then);
+
+                        /* alarm may need to wrap into tomorrow */
+                        if (then < now) {
+                                rtc_time_to_tm(now + 24 * 60 * 60, &tm);
+                                alarm.time.tm_mday = tm.tm_mday;
+                                alarm.time.tm_mon = tm.tm_mon;
+                                alarm.time.tm_year = tm.tm_year;
+                        }
+                }
+
+                err = rtc_set_alarm(rtc, &alarm);
                 break;
 
         case RTC_RD_TIME:
-                err = rtc_read_time(class_dev, &tm);
+                err = rtc_read_time(rtc, &tm);
                 if (err < 0)
                         return err;
 
@@ -300,7 +335,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
                 if (copy_from_user(&tm, uarg, sizeof(tm)))
                         return -EFAULT;
 
-                err = rtc_set_time(class_dev, &tm);
+                err = rtc_set_time(rtc, &tm);
                 break;
 
         case RTC_IRQP_READ:
@@ -310,7 +345,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
 
         case RTC_IRQP_SET:
                 if (ops->irq_set_freq)
-                        err = rtc_irq_set_freq(class_dev, rtc->irq_task, arg);
+                        err = rtc_irq_set_freq(rtc, rtc->irq_task, arg);
                 break;
 
 #if 0
@@ -336,11 +371,11 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
                 if (copy_from_user(&alarm, uarg, sizeof(alarm)))
                         return -EFAULT;
 
-                err = rtc_set_alarm(class_dev, &alarm);
+                err = rtc_set_alarm(rtc, &alarm);
                 break;
 
         case RTC_WKALM_RD:
-                err = rtc_read_alarm(class_dev, &alarm);
+                err = rtc_read_alarm(rtc, &alarm);
                 if (err < 0)
                         return err;
 
@@ -372,7 +407,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
         clear_uie(rtc);
 #endif
         if (rtc->ops->release)
-                rtc->ops->release(rtc->class_dev.dev);
+                rtc->ops->release(rtc->dev.parent);
 
         mutex_unlock(&rtc->char_lock);
         return 0;
@@ -397,17 +432,18 @@ static const struct file_operations rtc_dev_fops = {
 
 /* insertion/removal hooks */
 
-static int rtc_dev_add_device(struct class_device *class_dev,
-                                struct class_interface *class_intf)
+void rtc_dev_prepare(struct rtc_device *rtc)
 {
-        int err = 0;
-        struct rtc_device *rtc = to_rtc_device(class_dev);
+        if (!rtc_devt)
+                return;
 
         if (rtc->id >= RTC_DEV_MAX) {
-                dev_err(class_dev->dev, "too many RTCs\n");
-                return -EINVAL;
+                pr_debug("%s: too many RTC devices\n", rtc->name);
+                return;
         }
 
+        rtc->dev.devt = MKDEV(MAJOR(rtc_devt), rtc->id);
+
         mutex_init(&rtc->char_lock);
         spin_lock_init(&rtc->irq_lock);
         init_waitqueue_head(&rtc->irq_queue);
@@ -418,100 +454,36 @@ static int rtc_dev_add_device(struct class_device *class_dev,
 
         cdev_init(&rtc->char_dev, &rtc_dev_fops);
         rtc->char_dev.owner = rtc->owner;
+}
 
-        if (cdev_add(&rtc->char_dev, MKDEV(MAJOR(rtc_devt), rtc->id), 1)) {
-                dev_err(class_dev->dev,
-                        "failed to add char device %d:%d\n",
+void rtc_dev_add_device(struct rtc_device *rtc)
+{
+        if (cdev_add(&rtc->char_dev, rtc->dev.devt, 1))
+                printk(KERN_WARNING "%s: failed to add char device %d:%d\n",
+                        rtc->name, MAJOR(rtc_devt), rtc->id);
+        else
+                pr_debug("%s: dev (%d:%d)\n", rtc->name,
                         MAJOR(rtc_devt), rtc->id);
-                return -ENODEV;
-        }
-
-        rtc->rtc_dev = class_device_create(rtc_dev_class, NULL,
-                                                MKDEV(MAJOR(rtc_devt), rtc->id),
-                                                class_dev->dev, "rtc%d", rtc->id);
-        if (IS_ERR(rtc->rtc_dev)) {
-                dev_err(class_dev->dev, "cannot create rtc_dev device\n");
-                err = PTR_ERR(rtc->rtc_dev);
-                goto err_cdev_del;
-        }
-
-        dev_dbg(class_dev->dev, "rtc intf: dev (%d:%d)\n",
-                MAJOR(rtc->rtc_dev->devt),
-                MINOR(rtc->rtc_dev->devt));
-
-        return 0;
-
-err_cdev_del:
-
-        cdev_del(&rtc->char_dev);
-        return err;
 }
 
-static void rtc_dev_remove_device(struct class_device *class_dev,
-                                        struct class_interface *class_intf)
+void rtc_dev_del_device(struct rtc_device *rtc)
 {
-        struct rtc_device *rtc = to_rtc_device(class_dev);
-
-        if (rtc->rtc_dev) {
-                dev_dbg(class_dev->dev, "removing char %d:%d\n",
-                        MAJOR(rtc->rtc_dev->devt),
-                        MINOR(rtc->rtc_dev->devt));
-
-                class_device_unregister(rtc->rtc_dev);
+        if (rtc->dev.devt)
                 cdev_del(&rtc->char_dev);
-        }
 }
 
-/* interface registration */
-
-static struct class_interface rtc_dev_interface = {
-        .add = &rtc_dev_add_device,
-        .remove = &rtc_dev_remove_device,
-};
-
-static int __init rtc_dev_init(void)
+void __init rtc_dev_init(void)
 {
         int err;
 
-        rtc_dev_class = class_create(THIS_MODULE, "rtc-dev");
-        if (IS_ERR(rtc_dev_class))
-                return PTR_ERR(rtc_dev_class);
-
         err = alloc_chrdev_region(&rtc_devt, 0, RTC_DEV_MAX, "rtc");
-        if (err < 0) {
+        if (err < 0)
                 printk(KERN_ERR "%s: failed to allocate char dev region\n",
                         __FILE__);
-                goto err_destroy_class;
-        }
-
-        err = rtc_interface_register(&rtc_dev_interface);
-        if (err < 0) {
-                printk(KERN_ERR "%s: failed to register the interface\n",
-                        __FILE__);
-                goto err_unregister_chrdev;
-        }
-
-        return 0;
-
-err_unregister_chrdev:
-        unregister_chrdev_region(rtc_devt, RTC_DEV_MAX);
-
-err_destroy_class:
-        class_destroy(rtc_dev_class);
-
-        return err;
 }
 
-static void __exit rtc_dev_exit(void)
+void __exit rtc_dev_exit(void)
 {
-        class_interface_unregister(&rtc_dev_interface);
-        class_destroy(rtc_dev_class);
-        unregister_chrdev_region(rtc_devt, RTC_DEV_MAX);
+        if (rtc_devt)
+                unregister_chrdev_region(rtc_devt, RTC_DEV_MAX);
 }
-
-subsys_initcall(rtc_dev_init);
-module_exit(rtc_dev_exit);
-
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("RTC class dev interface");
-MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index e27176c0e18f..afa64c7fa2e2 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -203,7 +203,7 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)
                 events |= RTC_UF;
         else
                 events |= RTC_AF;
-        rtc_update_irq(&pdata->rtc->class_dev, 1, events);
+        rtc_update_irq(pdata->rtc, 1, events);
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 7bbc26a34bd2..ba795a4db1e9 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -117,85 +117,4 @@ int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time)
 }
 EXPORT_SYMBOL(rtc_tm_to_time);
 
-
-/* Merge the valid (i.e. non-negative) fields of alarm into the current
- * time.  If the valid alarm fields are earlier than the equivalent
- * fields in the time, carry one into the least significant invalid
- * field, so that the alarm expiry is in the future.  It assumes that the
- * least significant invalid field is more significant than the most
- * significant valid field, and that the seconds field is valid.
- *
- * This is used by alarms that take relative (rather than absolute)
- * times, and/or have a simple binary second counter instead of
- * day/hour/minute/sec registers.
- */
-void rtc_merge_alarm(struct rtc_time *now, struct rtc_time *alarm)
-{
-        int *alarmp = &alarm->tm_sec;
-        int *timep = &now->tm_sec;
-        int carry_into, i;
-
-        /* Ignore everything past the 6th element (tm_year). */
-        for (i = 5; i > 0; i--) {
-                if (alarmp[i] < 0)
-                        alarmp[i] = timep[i];
-                else
-                        break;
-        }
-
-        /* No carry needed if all fields are valid. */
-        if (i == 5)
-                return;
-
-        for (carry_into = i + 1; i >= 0; i--) {
-                if (alarmp[i] < timep[i])
-                        break;
-
-                if (alarmp[i] > timep[i])
-                        return;
-        }
-
-        switch (carry_into) {
-                case 1:
-                        alarm->tm_min++;
-
-                        if (alarm->tm_min < 60)
-                                return;
-
-                        alarm->tm_min = 0;
-                        /* fall-through */
-
-                case 2:
-                        alarm->tm_hour++;
-
-                        if (alarm->tm_hour < 60)
-                                return;
-
-                        alarm->tm_hour = 0;
-                        /* fall-through */
-
-                case 3:
-                        alarm->tm_mday++;
-
-                        if (alarm->tm_mday <= rtc_days_in_month[alarm->tm_mon])
-                                return;
-
-                        alarm->tm_mday = 1;
-                        /* fall-through */
-
-                case 4:
-                        alarm->tm_mon++;
-
-                        if (alarm->tm_mon <= 12)
-                                return;
-
-                        alarm->tm_mon = 1;
-                        /* fall-through */
-
-                case 5:
-                        alarm->tm_year++;
-        }
-}
-EXPORT_SYMBOL(rtc_merge_alarm);
-
 MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
new file mode 100644
index 000000000000..eee4ee5bb75a
--- /dev/null
+++ b/drivers/rtc/rtc-max6900.c
@@ -0,0 +1,311 @@
+/*
+ * rtc class driver for the Maxim MAX6900 chip
+ *
+ * Author: Dale Farnsworth <dale@farnsworth.org>
+ *
+ * based on previously existing rtc class drivers
+ *
+ * 2007 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/bcd.h>
+#include <linux/rtc.h>
+#include <linux/delay.h>
+
+#define DRV_NAME "max6900"
+#define DRV_VERSION "0.1"
+
+/*
+ * register indices
+ */
+#define MAX6900_REG_SC                  0       /* seconds      00-59 */
+#define MAX6900_REG_MN                  1       /* minutes      00-59 */
+#define MAX6900_REG_HR                  2       /* hours        00-23 */
+#define MAX6900_REG_DT                  3       /* day of month 00-31 */
+#define MAX6900_REG_MO                  4       /* month        01-12 */
+#define MAX6900_REG_DW                  5       /* day of week   1-7  */
+#define MAX6900_REG_YR                  6       /* year         00-99 */
+#define MAX6900_REG_CT                  7       /* control */
+#define MAX6900_REG_LEN                 8
+
+#define MAX6900_REG_CT_WP               (1 << 7)        /* Write Protect */
+
+/*
+ * register read/write commands
+ */
+#define MAX6900_REG_CONTROL_WRITE       0x8e
+#define MAX6900_REG_BURST_READ          0xbf
+#define MAX6900_REG_BURST_WRITE         0xbe
+#define MAX6900_REG_RESERVED_READ       0x96
+
+#define MAX6900_IDLE_TIME_AFTER_WRITE   3       /* specification says 2.5 mS */
+
+#define MAX6900_I2C_ADDR                0xa0
+
+static unsigned short normal_i2c[] = {
+        MAX6900_I2C_ADDR >> 1,
+        I2C_CLIENT_END
+};
+
+I2C_CLIENT_INSMOD;                      /* defines addr_data */
+
+static int max6900_probe(struct i2c_adapter *adapter, int addr, int kind);
+
+static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf)
+{
+        u8 reg_addr[1] = { MAX6900_REG_BURST_READ };
+        struct i2c_msg msgs[2] = {
+                {
+                        .addr   = client->addr,
+                        .flags  = 0, /* write */
+                        .len    = sizeof(reg_addr),
+                        .buf    = reg_addr
+                },
+                {
+                        .addr   = client->addr,
+                        .flags  = I2C_M_RD,
+                        .len    = MAX6900_REG_LEN,
+                        .buf    = buf
+                }
+        };
+        int rc;
+
+        rc = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+        if (rc != ARRAY_SIZE(msgs)) {
+                dev_err(&client->dev, "%s: register read failed\n",
+                        __FUNCTION__);
+                return -EIO;
+        }
+        return 0;
+}
+
+static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)
+{
+        u8 i2c_buf[MAX6900_REG_LEN + 1] = { MAX6900_REG_BURST_WRITE };
+        struct i2c_msg msgs[1] = {
+                {
+                        .addr   = client->addr,
+                        .flags  = 0, /* write */
+                        .len    = MAX6900_REG_LEN + 1,
+                        .buf    = i2c_buf
+                }
+        };
+        int rc;
+
+        memcpy(&i2c_buf[1], buf, MAX6900_REG_LEN);
+
+        rc = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+        if (rc != ARRAY_SIZE(msgs)) {
+                dev_err(&client->dev, "%s: register write failed\n",
+                        __FUNCTION__);
+                return -EIO;
+        }
+        msleep(MAX6900_IDLE_TIME_AFTER_WRITE);
+        return 0;
+}
+
+static int max6900_i2c_validate_client(struct i2c_client *client)
+{
+        u8 regs[MAX6900_REG_LEN];
+        u8 zero_mask[MAX6900_REG_LEN] = {
+                0x80,   /* seconds */
+                0x80,   /* minutes */
+                0x40,   /* hours */
+                0xc0,   /* day of month */
+                0xe0,   /* month */
+                0xf8,   /* day of week */
+                0x00,   /* year */
+                0x7f,   /* control */
+        };
+        int i;
+        int rc;
+        int reserved;
+
+        reserved = i2c_smbus_read_byte_data(client, MAX6900_REG_RESERVED_READ);
+        if (reserved != 0x07)
+                return -ENODEV;
+
+        rc = max6900_i2c_read_regs(client, regs);
+        if (rc < 0)
+                return rc;
+
+        for (i = 0; i < MAX6900_REG_LEN; ++i) {
+                if (regs[i] & zero_mask[i])
+                        return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
+{
+        int rc;
+        u8 regs[MAX6900_REG_LEN];
+
+        rc = max6900_i2c_read_regs(client, regs);
+        if (rc < 0)
+                return rc;
+
+        tm->tm_sec = BCD2BIN(regs[MAX6900_REG_SC]);
+        tm->tm_min = BCD2BIN(regs[MAX6900_REG_MN]);
+        tm->tm_hour = BCD2BIN(regs[MAX6900_REG_HR] & 0x3f);
+        tm->tm_mday = BCD2BIN(regs[MAX6900_REG_DT]);
+        tm->tm_mon = BCD2BIN(regs[MAX6900_REG_MO]) - 1;
+        tm->tm_year = BCD2BIN(regs[MAX6900_REG_YR]) + 100;
+        tm->tm_wday = BCD2BIN(regs[MAX6900_REG_DW]);
+
+        return 0;
+}
+
+static int max6900_i2c_clear_write_protect(struct i2c_client *client)
+{
+        int rc;
+        rc = i2c_smbus_write_byte_data (client, MAX6900_REG_CONTROL_WRITE, 0);
+        if (rc < 0) {
+                dev_err(&client->dev, "%s: control register write failed\n",
+                        __FUNCTION__);
+                return -EIO;
+        }
+        return 0;
+}
+
+static int max6900_i2c_set_time(struct i2c_client *client,
+                                struct rtc_time const *tm)
+{
+        u8 regs[MAX6900_REG_LEN];
+        int rc;
+
+        rc = max6900_i2c_clear_write_protect(client);
+        if (rc < 0)
+                return rc;
+
+        regs[MAX6900_REG_SC] = BIN2BCD(tm->tm_sec);
+        regs[MAX6900_REG_MN] = BIN2BCD(tm->tm_min);
+        regs[MAX6900_REG_HR] = BIN2BCD(tm->tm_hour);
+        regs[MAX6900_REG_DT] = BIN2BCD(tm->tm_mday);
+        regs[MAX6900_REG_MO] = BIN2BCD(tm->tm_mon + 1);
+        regs[MAX6900_REG_YR] = BIN2BCD(tm->tm_year - 100);
+        regs[MAX6900_REG_DW] = BIN2BCD(tm->tm_wday);
+        regs[MAX6900_REG_CT] = MAX6900_REG_CT_WP;       /* set write protect */
+
+        rc = max6900_i2c_write_regs(client, regs);
+        if (rc < 0)
+                return rc;
+
+        return 0;
+}
+
+static int max6900_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        return max6900_i2c_read_time(to_i2c_client(dev), tm);
+}
+
+static int max6900_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return max6900_i2c_set_time(to_i2c_client(dev), tm);
+}
+
+static int max6900_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_probe(adapter, &addr_data, max6900_probe);
+}
+
+static int max6900_detach_client(struct i2c_client *client)
+{
+        struct rtc_device *const rtc = i2c_get_clientdata(client);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        return i2c_detach_client(client);
+}
+
+static struct i2c_driver max6900_driver = {
+        .driver         = {
+                .name   = DRV_NAME,
+        },
+        .id             = I2C_DRIVERID_MAX6900,
+        .attach_adapter = max6900_attach_adapter,
+        .detach_client  = max6900_detach_client,
+};
+
+static const struct rtc_class_ops max6900_rtc_ops = {
+        .read_time      = max6900_rtc_read_time,
+        .set_time       = max6900_rtc_set_time,
+};
+
+static int max6900_probe(struct i2c_adapter *adapter, int addr, int kind)
+{
+        int rc = 0;
+        struct i2c_client *client = NULL;
+        struct rtc_device *rtc = NULL;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
+                rc = -ENODEV;
+                goto failout;
+        }
+
+        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (client == NULL) {
+                rc = -ENOMEM;
+                goto failout;
+        }
+
+        client->addr = addr;
+        client->adapter = adapter;
+        client->driver = &max6900_driver;
+        strlcpy(client->name, DRV_NAME, I2C_NAME_SIZE);
+
+        if (kind < 0) {
+                rc = max6900_i2c_validate_client(client);
+                if (rc < 0)
+                        goto failout;
+        }
+
+        rc = i2c_attach_client(client);
+        if (rc < 0)
+                goto failout;
+
+        dev_info(&client->dev,
+                 "chip found, driver version " DRV_VERSION "\n");
+
+        rtc = rtc_device_register(max6900_driver.driver.name,
+                                  &client->dev,
+                                  &max6900_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                rc = PTR_ERR(rtc);
+                goto failout_detach;
+        }
+
+        i2c_set_clientdata(client, rtc);
+
+        return 0;
+
+failout_detach:
+        i2c_detach_client(client);
+failout:
+        kfree(client);
+        return rc;
+}
+
+static int __init max6900_init(void)
+{
+        return i2c_add_driver(&max6900_driver);
+}
+
+static void __exit max6900_exit(void)
+{
+        i2c_del_driver(&max6900_driver);
+}
+
+MODULE_DESCRIPTION("Maxim MAX6900 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(max6900_init);
+module_exit(max6900_exit);
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 9de8d67f4f8d..a2f84f169588 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -124,7 +124,7 @@ static void rtc_wait_not_busy(void)
         /* now we have ~15 usec to read/write various registers */
 }
 
-static irqreturn_t rtc_irq(int irq, void *class_dev)
+static irqreturn_t rtc_irq(int irq, void *rtc)
 {
         unsigned long           events = 0;
         u8                      irq_data;
@@ -141,7 +141,7 @@ static irqreturn_t rtc_irq(int irq, void *class_dev)
         if (irq_data & OMAP_RTC_STATUS_1S_EVENT)
                 events |= RTC_IRQF | RTC_UF;
 
-        rtc_update_irq(class_dev, 1, events);
+        rtc_update_irq(rtc, 1, events);
 
         return IRQ_HANDLED;
 }
@@ -289,34 +289,6 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
         u8 reg;
 
-        /* Much userspace code uses RTC_ALM_SET, thus "don't care" for
-         * day/month/year specifies alarms up to 24 hours in the future.
-         * So we need to handle that ... but let's ignore the "don't care"
-         * values for hours/minutes/seconds.
-         */
-        if (alm->time.tm_mday <= 0
-                        && alm->time.tm_mon < 0
-                        && alm->time.tm_year < 0) {
-                struct rtc_time tm;
-                unsigned long now, then;
-
-                omap_rtc_read_time(dev, &tm);
-                rtc_tm_to_time(&tm, &now);
-
-                alm->time.tm_mday = tm.tm_mday;
-                alm->time.tm_mon = tm.tm_mon;
-                alm->time.tm_year = tm.tm_year;
-                rtc_tm_to_time(&alm->time, &then);
-
-                /* sometimes the alarm wraps into tomorrow */
-                if (then < now) {
-                        rtc_time_to_tm(now + 24 * 60 * 60, &tm);
-                        alm->time.tm_mday = tm.tm_mday;
-                        alm->time.tm_mon = tm.tm_mon;
-                        alm->time.tm_year = tm.tm_year;
-                }
-        }
-
         if (tm2bcd(&alm->time) < 0)
                 return -EINVAL;
 
@@ -399,7 +371,7 @@ static int __devinit omap_rtc_probe(struct platform_device *pdev)
                 goto fail;
         }
         platform_set_drvdata(pdev, rtc);
-        class_set_devdata(&rtc->class_dev, mem);
+        dev_set_drvdata(&rtc->dev, mem);
 
         /* clear pending irqs, and set 1/second periodic,
          * which we'll use instead of update irqs
@@ -418,13 +390,13 @@ static int __devinit omap_rtc_probe(struct platform_device *pdev)
 
         /* handle periodic and alarm irqs */
         if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED,
-                        rtc->class_dev.class_id, &rtc->class_dev)) {
+                        rtc->dev.bus_id, rtc)) {
                 pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n",
                         pdev->name, omap_rtc_timer);
                 goto fail0;
         }
         if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED,
-                        rtc->class_dev.class_id, &rtc->class_dev)) {
+                        rtc->dev.bus_id, rtc)) {
                 pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n",
                         pdev->name, omap_rtc_alarm);
                 goto fail1;
@@ -481,26 +453,17 @@ static int __devexit omap_rtc_remove(struct platform_device *pdev)
         free_irq(omap_rtc_timer, rtc);
         free_irq(omap_rtc_alarm, rtc);
 
-        release_resource(class_get_devdata(&rtc->class_dev));
+        release_resource(dev_get_drvdata(&rtc->dev));
         rtc_device_unregister(rtc);
         return 0;
 }
 
 #ifdef CONFIG_PM
 
-static struct timespec rtc_delta;
 static u8 irqstat;
 
 static int omap_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct rtc_time rtc_tm;
-        struct timespec time;
-
-        time.tv_nsec = 0;
-        omap_rtc_read_time(NULL, &rtc_tm);
-        rtc_tm_to_time(&rtc_tm, &time.tv_sec);
-
-        save_time_delta(&rtc_delta, &time);
         irqstat = rtc_read(OMAP_RTC_INTERRUPTS_REG);
 
         /* FIXME the RTC alarm is not currently acting as a wakeup event
@@ -517,14 +480,6 @@ static int omap_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 
 static int omap_rtc_resume(struct platform_device *pdev)
 {
-        struct rtc_time rtc_tm;
-        struct timespec time;
-
-        time.tv_nsec = 0;
-        omap_rtc_read_time(NULL, &rtc_tm);
-        rtc_tm_to_time(&rtc_tm, &time.tv_sec);
-
-        restore_time_delta(&rtc_delta, &time);
         if (device_may_wakeup(&pdev->dev))
                 disable_irq_wake(omap_rtc_alarm);
         else
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index f13daa9fecaa..e4bf68ca96f7 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -51,7 +51,7 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id)
 {
         struct rtc_device *rtc = dev_id;
 
-        rtc_update_irq(&rtc->class_dev, 1, RTC_AF);
+        rtc_update_irq(rtc, 1, RTC_AF);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 1bd624fc685c..8d300e6d0d9e 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -16,18 +16,18 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
-static struct class_device *rtc_dev = NULL;
-static DEFINE_MUTEX(rtc_lock);
+#include "rtc-core.h"
+
 
 static int rtc_proc_show(struct seq_file *seq, void *offset)
 {
         int err;
-        struct class_device *class_dev = seq->private;
-        const struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
+        struct rtc_device *rtc = seq->private;
+        const struct rtc_class_ops *ops = rtc->ops;
         struct rtc_wkalrm alrm;
         struct rtc_time tm;
 
-        err = rtc_read_time(class_dev, &tm);
+        err = rtc_read_time(rtc, &tm);
         if (err == 0) {
                 seq_printf(seq,
                         "rtc_time\t: %02d:%02d:%02d\n"
@@ -36,7 +36,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                         tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
         }
 
-        err = rtc_read_alarm(class_dev, &alrm);
+        err = rtc_read_alarm(rtc, &alrm);
         if (err == 0) {
                 seq_printf(seq, "alrm_time\t: ");
                 if ((unsigned int)alrm.time.tm_hour <= 24)
@@ -74,19 +74,19 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
         seq_printf(seq, "24hr\t\t: yes\n");
 
         if (ops->proc)
-                ops->proc(class_dev->dev, seq);
+                ops->proc(rtc->dev.parent, seq);
 
         return 0;
 }
 
 static int rtc_proc_open(struct inode *inode, struct file *file)
 {
-        struct class_device *class_dev = PDE(inode)->data;
+        struct rtc_device *rtc = PDE(inode)->data;
 
         if (!try_module_get(THIS_MODULE))
                 return -ENODEV;
 
-        return single_open(file, rtc_proc_show, class_dev);
+        return single_open(file, rtc_proc_show, rtc);
 }
 
 static int rtc_proc_release(struct inode *inode, struct file *file)
@@ -103,62 +103,22 @@ static const struct file_operations rtc_proc_fops = {
         .release        = rtc_proc_release,
 };
 
-static int rtc_proc_add_device(struct class_device *class_dev,
-                                        struct class_interface *class_intf)
+void rtc_proc_add_device(struct rtc_device *rtc)
 {
-        mutex_lock(&rtc_lock);
-        if (rtc_dev == NULL) {
+        if (rtc->id == 0) {
                 struct proc_dir_entry *ent;
 
-                rtc_dev = class_dev;
-
                 ent = create_proc_entry("driver/rtc", 0, NULL);
                 if (ent) {
-                        struct rtc_device *rtc = to_rtc_device(class_dev);
-
                         ent->proc_fops = &rtc_proc_fops;
                         ent->owner = rtc->owner;
-                        ent->data = class_dev;
-
-                        dev_dbg(class_dev->dev, "rtc intf: proc\n");
+                        ent->data = rtc;
                 }
-                else
-                        rtc_dev = NULL;
         }
-        mutex_unlock(&rtc_lock);
-
-        return 0;
 }
 
-static void rtc_proc_remove_device(struct class_device *class_dev,
-                                        struct class_interface *class_intf)
+void rtc_proc_del_device(struct rtc_device *rtc)
 {
-        mutex_lock(&rtc_lock);
-        if (rtc_dev == class_dev) {
+        if (rtc->id == 0)
                 remove_proc_entry("driver/rtc", NULL);
-                rtc_dev = NULL;
-        }
-        mutex_unlock(&rtc_lock);
-}
-
-static struct class_interface rtc_proc_interface = {
-        .add = &rtc_proc_add_device,
-        .remove = &rtc_proc_remove_device,
-};
-
-static int __init rtc_proc_init(void)
-{
-        return rtc_interface_register(&rtc_proc_interface);
 }
-
-static void __exit rtc_proc_exit(void)
-{
-        class_interface_unregister(&rtc_proc_interface);
-}
-
-subsys_initcall(rtc_proc_init);
-module_exit(rtc_proc_exit);
-
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("RTC class proc interface");
-MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c
new file mode 100644
index 000000000000..66eb133bf5fd
--- /dev/null
+++ b/drivers/rtc/rtc-rs5c313.c
@@ -0,0 +1,423 @@
+/*
+ * Ricoh RS5C313 RTC device/driver
+ *  Copyright (C) 2007 Nobuhiro Iwamatsu
+ *
+ *  2005-09-19 modifed by kogiidena
+ *
+ * Based on the old drivers/char/rs5c313_rtc.c  by:
+ *  Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
+ *  Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka
+ *
+ * Based on code written by Paul Gortmaker.
+ *  Copyright (C) 1996 Paul Gortmaker
+ *
+ * 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.
+ *
+ * Based on other minimal char device drivers, like Alan's
+ * watchdog, Ted's random, etc. etc.
+ *
+ *      1.07    Paul Gortmaker.
+ *      1.08    Miquel van Smoorenburg: disallow certain things on the
+ *              DEC Alpha as the CMOS clock is also used for other things.
+ *      1.09    Nikita Schmidt: epoch support and some Alpha cleanup.
+ *      1.09a   Pete Zaitcev: Sun SPARC
+ *      1.09b   Jeff Garzik: Modularize, init cleanup
+ *      1.09c   Jeff Garzik: SMP cleanup
+ *      1.10    Paul Barton-Davis: add support for async I/O
+ *      1.10a   Andrea Arcangeli: Alpha updates
+ *      1.10b   Andrew Morton: SMP lock fix
+ *      1.10c   Cesar Barros: SMP locking fixes and cleanup
+ *      1.10d   Paul Gortmaker: delete paranoia check in rtc_exit
+ *      1.10e   Maciej W. Rozycki: Handle DECstation's year weirdness.
+ *      1.11    Takashi Iwai: Kernel access functions
+ *                            rtc_register/rtc_unregister/rtc_control
+ *      1.11a   Daniele Bellucci: Audit create_proc_read_entry in rtc_init
+ *      1.12    Venkatesh Pallipadi: Hooks for emulating rtc on HPET base-timer
+ *              CONFIG_HPET_EMULATE_RTC
+ *      1.13    Nobuhiro Iwamatsu: Updata driver.
+ */
+
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+#include <linux/bcd.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+
+#define DRV_NAME        "rs5c313"
+#define DRV_VERSION     "1.13"
+
+#ifdef CONFIG_SH_LANDISK
+/*****************************************************/
+/* LANDISK dependence part of RS5C313                */
+/*****************************************************/
+
+#define SCSMR1          0xFFE00000
+#define SCSCR1          0xFFE00008
+#define SCSMR1_CA       0x80
+#define SCSCR1_CKE      0x03
+#define SCSPTR1         0xFFE0001C
+#define SCSPTR1_EIO     0x80
+#define SCSPTR1_SPB1IO  0x08
+#define SCSPTR1_SPB1DT  0x04
+#define SCSPTR1_SPB0IO  0x02
+#define SCSPTR1_SPB0DT  0x01
+
+#define SDA_OEN         SCSPTR1_SPB1IO
+#define SDA             SCSPTR1_SPB1DT
+#define SCL_OEN         SCSPTR1_SPB0IO
+#define SCL             SCSPTR1_SPB0DT
+
+/* RICOH RS5C313 CE port */
+#define RS5C313_CE      0xB0000003
+
+/* RICOH RS5C313 CE port bit */
+#define RS5C313_CE_RTCCE        0x02
+
+/* SCSPTR1 data */
+unsigned char scsptr1_data;
+
+#define RS5C313_CEENABLE    ctrl_outb(RS5C313_CE_RTCCE, RS5C313_CE);
+#define RS5C313_CEDISABLE   ctrl_outb(0x00, RS5C313_CE)
+#define RS5C313_MISCOP      ctrl_outb(0x02, 0xB0000008)
+
+static void rs5c313_init_port(void)
+{
+        /* Set SCK as I/O port and Initialize SCSPTR1 data & I/O port. */
+        ctrl_outb(ctrl_inb(SCSMR1) & ~SCSMR1_CA, SCSMR1);
+        ctrl_outb(ctrl_inb(SCSCR1) & ~SCSCR1_CKE, SCSCR1);
+
+        /* And Initialize SCL for RS5C313 clock */
+        scsptr1_data = ctrl_inb(SCSPTR1) | SCL; /* SCL:H */
+        ctrl_outb(scsptr1_data, SCSPTR1);
+        scsptr1_data = ctrl_inb(SCSPTR1) | SCL_OEN;     /* SCL output enable */
+        ctrl_outb(scsptr1_data, SCSPTR1);
+        RS5C313_CEDISABLE;      /* CE:L */
+}
+
+static void rs5c313_write_data(unsigned char data)
+{
+        int i;
+
+        for (i = 0; i < 8; i++) {
+                /* SDA:Write Data */
+                scsptr1_data = (scsptr1_data & ~SDA) |
+                                ((((0x80 >> i) & data) >> (7 - i)) << 2);
+                ctrl_outb(scsptr1_data, SCSPTR1);
+                if (i == 0) {
+                        scsptr1_data |= SDA_OEN;        /* SDA:output enable */
+                        ctrl_outb(scsptr1_data, SCSPTR1);
+                }
+                ndelay(700);
+                scsptr1_data &= ~SCL;   /* SCL:L */
+                ctrl_outb(scsptr1_data, SCSPTR1);
+                ndelay(700);
+                scsptr1_data |= SCL;    /* SCL:H */
+                ctrl_outb(scsptr1_data, SCSPTR1);
+        }
+
+        scsptr1_data &= ~SDA_OEN;       /* SDA:output disable */
+        ctrl_outb(scsptr1_data, SCSPTR1);
+}
+
+static unsigned char rs5c313_read_data(void)
+{
+        int i;
+        unsigned char data = 0;
+
+        for (i = 0; i < 8; i++) {
+                ndelay(700);
+                /* SDA:Read Data */
+                data |= ((ctrl_inb(SCSPTR1) & SDA) >> 2) << (7 - i);
+                scsptr1_data &= ~SCL;   /* SCL:L */
+                ctrl_outb(scsptr1_data, SCSPTR1);
+                ndelay(700);
+                scsptr1_data |= SCL;    /* SCL:H */
+                ctrl_outb(scsptr1_data, SCSPTR1);
+        }
+        return data & 0x0F;
+}
+
+#endif /* CONFIG_SH_LANDISK */
+
+/*****************************************************/
+/* machine independence part of RS5C313              */
+/*****************************************************/
+
+/* RICOH RS5C313 address */
+#define RS5C313_ADDR_SEC        0x00
+#define RS5C313_ADDR_SEC10      0x01
+#define RS5C313_ADDR_MIN        0x02
+#define RS5C313_ADDR_MIN10      0x03
+#define RS5C313_ADDR_HOUR       0x04
+#define RS5C313_ADDR_HOUR10     0x05
+#define RS5C313_ADDR_WEEK       0x06
+#define RS5C313_ADDR_INTINTVREG 0x07
+#define RS5C313_ADDR_DAY        0x08
+#define RS5C313_ADDR_DAY10      0x09
+#define RS5C313_ADDR_MON        0x0A
+#define RS5C313_ADDR_MON10      0x0B
+#define RS5C313_ADDR_YEAR       0x0C
+#define RS5C313_ADDR_YEAR10     0x0D
+#define RS5C313_ADDR_CNTREG     0x0E
+#define RS5C313_ADDR_TESTREG    0x0F
+
+/* RICOH RS5C313 control register */
+#define RS5C313_CNTREG_ADJ_BSY  0x01
+#define RS5C313_CNTREG_WTEN_XSTP        0x02
+#define RS5C313_CNTREG_12_24    0x04
+#define RS5C313_CNTREG_CTFG     0x08
+
+/* RICOH RS5C313 test register */
+#define RS5C313_TESTREG_TEST    0x01
+
+/* RICOH RS5C313 control bit */
+#define RS5C313_CNTBIT_READ     0x40
+#define RS5C313_CNTBIT_AD       0x20
+#define RS5C313_CNTBIT_DT       0x10
+
+static unsigned char rs5c313_read_reg(unsigned char addr)
+{
+
+        rs5c313_write_data(addr | RS5C313_CNTBIT_READ | RS5C313_CNTBIT_AD);
+        return rs5c313_read_data();
+}
+
+static void rs5c313_write_reg(unsigned char addr, unsigned char data)
+{
+        data &= 0x0f;
+        rs5c313_write_data(addr | RS5C313_CNTBIT_AD);
+        rs5c313_write_data(data | RS5C313_CNTBIT_DT);
+        return;
+}
+
+static inline unsigned char rs5c313_read_cntreg(void)
+{
+        return rs5c313_read_reg(RS5C313_ADDR_CNTREG);
+}
+
+static inline void rs5c313_write_cntreg(unsigned char data)
+{
+        rs5c313_write_reg(RS5C313_ADDR_CNTREG, data);
+}
+
+static inline void rs5c313_write_intintvreg(unsigned char data)
+{
+        rs5c313_write_reg(RS5C313_ADDR_INTINTVREG, data);
+}
+
+static int rs5c313_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        int data;
+        int cnt;
+
+        cnt = 0;
+        while (1) {
+                RS5C313_CEENABLE;       /* CE:H */
+
+                /* Initialize control reg. 24 hour */
+                rs5c313_write_cntreg(0x04);
+
+                if (!(rs5c313_read_cntreg() & RS5C313_CNTREG_ADJ_BSY))
+                        break;
+
+                RS5C313_CEDISABLE;
+                ndelay(700);    /* CE:L */
+
+                if (cnt++ > 100) {
+                        dev_err(dev, "%s: timeout error\n", __FUNCTION__);
+                        return -EIO;
+                }
+        }
+
+        data = rs5c313_read_reg(RS5C313_ADDR_SEC);
+        data |= (rs5c313_read_reg(RS5C313_ADDR_SEC10) << 4);
+        tm->tm_sec = BCD2BIN(data);
+
+        data = rs5c313_read_reg(RS5C313_ADDR_MIN);
+        data |= (rs5c313_read_reg(RS5C313_ADDR_MIN10) << 4);
+        tm->tm_min = BCD2BIN(data);
+
+        data = rs5c313_read_reg(RS5C313_ADDR_HOUR);
+        data |= (rs5c313_read_reg(RS5C313_ADDR_HOUR10) << 4);
+        tm->tm_hour = BCD2BIN(data);
+
+        data = rs5c313_read_reg(RS5C313_ADDR_DAY);
+        data |= (rs5c313_read_reg(RS5C313_ADDR_DAY10) << 4);
+        tm->tm_mday = BCD2BIN(data);
+
+        data = rs5c313_read_reg(RS5C313_ADDR_MON);
+        data |= (rs5c313_read_reg(RS5C313_ADDR_MON10) << 4);
+        tm->tm_mon = BCD2BIN(data) - 1;
+
+        data = rs5c313_read_reg(RS5C313_ADDR_YEAR);
+        data |= (rs5c313_read_reg(RS5C313_ADDR_YEAR10) << 4);
+        tm->tm_year = BCD2BIN(data);
+
+        if (tm->tm_year < 70)
+                tm->tm_year += 100;
+
+        data = rs5c313_read_reg(RS5C313_ADDR_WEEK);
+        tm->tm_wday = BCD2BIN(data);
+
+        RS5C313_CEDISABLE;
+        ndelay(700);            /* CE:L */
+
+        return 0;
+}
+
+static int rs5c313_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        int data;
+        int cnt;
+
+        cnt = 0;
+        /* busy check. */
+        while (1) {
+                RS5C313_CEENABLE;       /* CE:H */
+
+                /* Initiatlize control reg. 24 hour */
+                rs5c313_write_cntreg(0x04);
+
+                if (!(rs5c313_read_cntreg() & RS5C313_CNTREG_ADJ_BSY))
+                        break;
+                RS5C313_MISCOP;
+                RS5C313_CEDISABLE;
+                ndelay(700);    /* CE:L */
+
+                if (cnt++ > 100) {
+                        dev_err(dev, "%s: timeout error\n", __FUNCTION__);
+                        return -EIO;
+                }
+        }
+
+        data = BIN2BCD(tm->tm_sec);
+        rs5c313_write_reg(RS5C313_ADDR_SEC, data);
+        rs5c313_write_reg(RS5C313_ADDR_SEC10, (data >> 4));
+
+        data = BIN2BCD(tm->tm_min);
+        rs5c313_write_reg(RS5C313_ADDR_MIN, data );
+        rs5c313_write_reg(RS5C313_ADDR_MIN10, (data >> 4));
+
+        data = BIN2BCD(tm->tm_hour);
+        rs5c313_write_reg(RS5C313_ADDR_HOUR, data);
+        rs5c313_write_reg(RS5C313_ADDR_HOUR10, (data >> 4));
+
+        data = BIN2BCD(tm->tm_mday);
+        rs5c313_write_reg(RS5C313_ADDR_DAY, data);
+        rs5c313_write_reg(RS5C313_ADDR_DAY10, (data>> 4));
+
+        data = BIN2BCD(tm->tm_mon + 1);
+        rs5c313_write_reg(RS5C313_ADDR_MON, data);
+        rs5c313_write_reg(RS5C313_ADDR_MON10, (data >> 4));
+
+        data = BIN2BCD(tm->tm_year % 100);
+        rs5c313_write_reg(RS5C313_ADDR_YEAR, data);
+        rs5c313_write_reg(RS5C313_ADDR_YEAR10, (data >> 4));
+
+        data = BIN2BCD(tm->tm_wday);
+        rs5c313_write_reg(RS5C313_ADDR_WEEK, data);
+
+        RS5C313_CEDISABLE;      /* CE:H */
+        ndelay(700);
+
+        return 0;
+}
+
+static void rs5c313_check_xstp_bit(void)
+{
+        struct rtc_time tm;
+        int cnt;
+
+        RS5C313_CEENABLE;       /* CE:H */
+        if (rs5c313_read_cntreg() & RS5C313_CNTREG_WTEN_XSTP) {
+                /* INT interval reg. OFF */
+                rs5c313_write_intintvreg(0x00);
+                /* Initialize control reg. 24 hour & adjust */
+                rs5c313_write_cntreg(0x07);
+
+                /* busy check. */
+                for (cnt = 0; cnt < 100; cnt++) {
+                        if (!(rs5c313_read_cntreg() & RS5C313_CNTREG_ADJ_BSY))
+                                break;
+                        RS5C313_MISCOP;
+                }
+
+                memset(&tm, 0, sizeof(struct rtc_time));
+                tm.tm_mday      = 1;
+                tm.tm_mon       = 1 - 1;
+                tm.tm_year      = 2000 - 1900;
+
+                rs5c313_rtc_set_time(NULL, &tm);
+                printk(KERN_ERR "RICHO RS5C313: invalid value, resetting to "
+                                "1 Jan 2000\n");
+        }
+        RS5C313_CEDISABLE;
+        ndelay(700);            /* CE:L */
+}
+
+static const struct rtc_class_ops rs5c313_rtc_ops = {
+        .read_time = rs5c313_rtc_read_time,
+        .set_time = rs5c313_rtc_set_time,
+};
+
+static int rs5c313_rtc_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc = rtc_device_register("rs5c313", &pdev->dev,
+                                &rs5c313_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        platform_set_drvdata(pdev, rtc);
+
+        return 0;
+}
+
+static int __devexit rs5c313_rtc_remove(struct platform_device *pdev)
+{
+        struct rtc_device *rtc = platform_get_drvdata( pdev );
+
+        rtc_device_unregister(rtc);
+
+        return 0;
+}
+
+static struct platform_driver rs5c313_rtc_platform_driver = {
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .probe  = rs5c313_rtc_probe,
+        .remove = __devexit_p( rs5c313_rtc_remove ),
+};
+
+static int __init rs5c313_rtc_init(void)
+{
+        int err;
+
+        err = platform_driver_register(&rs5c313_rtc_platform_driver);
+        if (err)
+                return err;
+
+        rs5c313_init_port();
+        rs5c313_check_xstp_bit();
+
+        return 0;
+}
+
+static void __exit rs5c313_rtc_exit(void)
+{
+        platform_driver_unregister( &rs5c313_rtc_platform_driver );
+}
+
+module_init(rs5c313_rtc_init);
+module_exit(rs5c313_rtc_exit);
+
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("kogiidena , Nobuhiro Iwamatsu <iwamatsu@nigauri.org>");
+MODULE_DESCRIPTION("Ricoh RS5C313 RTC device driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 9a79a24a7487..54b613053468 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -50,7 +50,7 @@ static irqreturn_t s3c_rtc_alarmirq(int irq, void *id)
 {
         struct rtc_device *rdev = id;
 
-        rtc_update_irq(&rdev->class_dev, 1, RTC_AF | RTC_IRQF);
+        rtc_update_irq(rdev, 1, RTC_AF | RTC_IRQF);
         return IRQ_HANDLED;
 }
 
@@ -58,7 +58,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id)
 {
         struct rtc_device *rdev = id;
 
-        rtc_update_irq(&rdev->class_dev, tick_count++, RTC_PF | RTC_IRQF);
+        rtc_update_irq(rdev, tick_count++, RTC_PF | RTC_IRQF);
         return IRQ_HANDLED;
 }
 
@@ -548,37 +548,15 @@ static int ticnt_save;
 
 static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct rtc_time tm;
-        struct timespec time;
-
-        time.tv_nsec = 0;
-
         /* save TICNT for anyone using periodic interrupts */
-
         ticnt_save = readb(s3c_rtc_base + S3C2410_TICNT);
-
-        /* calculate time delta for suspend */
-
-        s3c_rtc_gettime(&pdev->dev, &tm);
-        rtc_tm_to_time(&tm, &time.tv_sec);
-        save_time_delta(&s3c_rtc_delta, &time);
         s3c_rtc_enable(pdev, 0);
-
         return 0;
 }
 
 static int s3c_rtc_resume(struct platform_device *pdev)
 {
-        struct rtc_time tm;
-        struct timespec time;
-
-        time.tv_nsec = 0;
-
         s3c_rtc_enable(pdev, 1);
-        s3c_rtc_gettime(&pdev->dev, &tm);
-        rtc_tm_to_time(&tm, &time.tv_sec);
-        restore_time_delta(&s3c_rtc_delta, &time);
-
         writeb(ticnt_save, s3c_rtc_base + S3C2410_TICNT);
         return 0;
 }
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 677bae820dc3..0918b787c4dd 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -93,7 +93,7 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
         if (rtsr & RTSR_HZ)
                 events |= RTC_UF | RTC_IRQF;
 
-        rtc_update_irq(&rtc->class_dev, 1, events);
+        rtc_update_irq(rtc, 1, events);
 
         if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
                 rtc_update_alarm(&rtc_alarm);
@@ -119,7 +119,7 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)
          */
         OSSR = OSSR_M1; /* clear match on timer1 */
 
-        rtc_update_irq(&rtc->class_dev, rtc_timer1_count, RTC_PF | RTC_IRQF);
+        rtc_update_irq(rtc, rtc_timer1_count, RTC_PF | RTC_IRQF);
 
         if (rtc_timer1_count == 1)
                 rtc_timer1_count = (rtc_freq * ((1<<30)/(TIMER_FREQ>>2)));
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 198b9f22fbff..e0f91dfce0f5 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -104,7 +104,7 @@ static irqreturn_t sh_rtc_interrupt(int irq, void *dev_id)
 
         writeb(tmp, rtc->regbase + RCR1);
 
-        rtc_update_irq(&rtc->rtc_dev->class_dev, 1, events);
+        rtc_update_irq(rtc->rtc_dev, 1, events);
 
         spin_unlock(&rtc->lock);
 
@@ -139,7 +139,7 @@ static irqreturn_t sh_rtc_alarm(int irq, void *dev_id)
 
                 rtc->rearm_aie = 1;
 
-                rtc_update_irq(&rtc->rtc_dev->class_dev, 1, events);
+                rtc_update_irq(rtc->rtc_dev, 1, events);
         }
 
         spin_unlock(&rtc->lock);
@@ -153,7 +153,7 @@ static irqreturn_t sh_rtc_periodic(int irq, void *dev_id)
 
         spin_lock(&rtc->lock);
 
-        rtc_update_irq(&rtc->rtc_dev->class_dev, 1, RTC_PF | RTC_IRQF);
+        rtc_update_irq(rtc->rtc_dev, 1, RTC_PF | RTC_IRQF);
 
         spin_unlock(&rtc->lock);
 
@@ -341,7 +341,7 @@ static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm)
                 tm->tm_sec--;
 #endif
 
-        dev_dbg(&dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+        dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
                 __FUNCTION__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 899ab8c514fa..69df94b44841 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -12,20 +12,26 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 
+#include "rtc-core.h"
+
+
 /* device attributes */
 
-static ssize_t rtc_sysfs_show_name(struct class_device *dev, char *buf)
+static ssize_t
+rtc_sysfs_show_name(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         return sprintf(buf, "%s\n", to_rtc_device(dev)->name);
 }
-static CLASS_DEVICE_ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL);
 
-static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf)
+static ssize_t
+rtc_sysfs_show_date(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         ssize_t retval;
         struct rtc_time tm;
 
-        retval = rtc_read_time(dev, &tm);
+        retval = rtc_read_time(to_rtc_device(dev), &tm);
         if (retval == 0) {
                 retval = sprintf(buf, "%04d-%02d-%02d\n",
                         tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
@@ -33,14 +39,15 @@ static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf)
 
         return retval;
 }
-static CLASS_DEVICE_ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL);
 
-static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf)
+static ssize_t
+rtc_sysfs_show_time(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         ssize_t retval;
         struct rtc_time tm;
 
-        retval = rtc_read_time(dev, &tm);
+        retval = rtc_read_time(to_rtc_device(dev), &tm);
         if (retval == 0) {
                 retval = sprintf(buf, "%02d:%02d:%02d\n",
                         tm.tm_hour, tm.tm_min, tm.tm_sec);
@@ -48,14 +55,15 @@ static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf)
 
         return retval;
 }
-static CLASS_DEVICE_ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL);
 
-static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf)
+static ssize_t
+rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         ssize_t retval;
         struct rtc_time tm;
 
-        retval = rtc_read_time(dev, &tm);
+        retval = rtc_read_time(to_rtc_device(dev), &tm);
         if (retval == 0) {
                 unsigned long time;
                 rtc_tm_to_time(&tm, &time);
@@ -64,23 +72,18 @@ static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf)
 
         return retval;
 }
-static CLASS_DEVICE_ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL);
-
-static struct attribute *rtc_attrs[] = {
-        &class_device_attr_name.attr,
-        &class_device_attr_date.attr,
-        &class_device_attr_time.attr,
-        &class_device_attr_since_epoch.attr,
-        NULL,
-};
 
-static struct attribute_group rtc_attr_group = {
-        .attrs = rtc_attrs,
+static struct device_attribute rtc_attrs[] = {
+        __ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL),
+        __ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL),
+        __ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL),
+        __ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL),
+        { },
 };
 
-
 static ssize_t
-rtc_sysfs_show_wakealarm(struct class_device *dev, char *buf)
+rtc_sysfs_show_wakealarm(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         ssize_t retval;
         unsigned long alarm;
@@ -94,7 +97,7 @@ rtc_sysfs_show_wakealarm(struct class_device *dev, char *buf)
          * REVISIT maybe we should require RTC implementations to
          * disable the RTC alarm after it triggers, for uniformity.
          */
-        retval = rtc_read_alarm(dev, &alm);
+        retval = rtc_read_alarm(to_rtc_device(dev), &alm);
         if (retval == 0 && alm.enabled) {
                 rtc_tm_to_time(&alm.time, &alarm);
                 retval = sprintf(buf, "%lu\n", alarm);
@@ -104,16 +107,18 @@ rtc_sysfs_show_wakealarm(struct class_device *dev, char *buf)
 }
 
 static ssize_t
-rtc_sysfs_set_wakealarm(struct class_device *dev, const char *buf, size_t n)
+rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t n)
 {
         ssize_t retval;
         unsigned long now, alarm;
         struct rtc_wkalrm alm;
+        struct rtc_device *rtc = to_rtc_device(dev);
 
         /* Only request alarms that trigger in the future.  Disable them
          * by writing another time, e.g. 0 meaning Jan 1 1970 UTC.
          */
-        retval = rtc_read_time(dev, &alm.time);
+        retval = rtc_read_time(rtc, &alm.time);
         if (retval < 0)
                 return retval;
         rtc_tm_to_time(&alm.time, &now);
@@ -124,7 +129,7 @@ rtc_sysfs_set_wakealarm(struct class_device *dev, const char *buf, size_t n)
                  * entirely prevent that here, without even the minimal
                  * locking from the /dev/rtcN api.
                  */
-                retval = rtc_read_alarm(dev, &alm);
+                retval = rtc_read_alarm(rtc, &alm);
                 if (retval < 0)
                         return retval;
                 if (alm.enabled)
@@ -141,10 +146,10 @@ rtc_sysfs_set_wakealarm(struct class_device *dev, const char *buf, size_t n)
         }
         rtc_time_to_tm(alarm, &alm.time);
 
-        retval = rtc_set_alarm(dev, &alm);
+        retval = rtc_set_alarm(rtc, &alm);
         return (retval < 0) ? retval : n;
 }
-static const CLASS_DEVICE_ATTR(wakealarm, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR(wakealarm, S_IRUGO | S_IWUSR,
                 rtc_sysfs_show_wakealarm, rtc_sysfs_set_wakealarm);
 
 
@@ -153,71 +158,37 @@ static const CLASS_DEVICE_ATTR(wakealarm, S_IRUGO | S_IWUSR,
  * suspend-to-disk.  So: no attribute unless that side effect is possible.
  * (Userspace may disable that mechanism later.)
  */
-static inline int rtc_does_wakealarm(struct class_device *class_dev)
+static inline int rtc_does_wakealarm(struct rtc_device *rtc)
 {
-        struct rtc_device *rtc;
-
-        if (!device_can_wakeup(class_dev->dev))
+        if (!device_can_wakeup(rtc->dev.parent))
                 return 0;
-        rtc = to_rtc_device(class_dev);
         return rtc->ops->set_alarm != NULL;
 }
 
 
-static int rtc_sysfs_add_device(struct class_device *class_dev,
-                                        struct class_interface *class_intf)
+void rtc_sysfs_add_device(struct rtc_device *rtc)
 {
         int err;
 
-        dev_dbg(class_dev->dev, "rtc intf: sysfs\n");
+        /* not all RTCs support both alarms and wakeup */
+        if (!rtc_does_wakealarm(rtc))
+                return;
 
-        err = sysfs_create_group(&class_dev->kobj, &rtc_attr_group);
+        err = device_create_file(&rtc->dev, &dev_attr_wakealarm);
         if (err)
-                dev_err(class_dev->dev, "failed to create %s\n",
-                                "sysfs attributes");
-        else if (rtc_does_wakealarm(class_dev)) {
-                /* not all RTCs support both alarms and wakeup */
-                err = class_device_create_file(class_dev,
-                                        &class_device_attr_wakealarm);
-                if (err) {
-                        dev_err(class_dev->dev, "failed to create %s\n",
-                                        "alarm attribute");
-                        sysfs_remove_group(&class_dev->kobj, &rtc_attr_group);
-                }
-        }
-
-        return err;
+                dev_err(rtc->dev.parent, "failed to create "
+                                "alarm attribute, %d",
+                                err);
 }
 
-static void rtc_sysfs_remove_device(struct class_device *class_dev,
-                                struct class_interface *class_intf)
+void rtc_sysfs_del_device(struct rtc_device *rtc)
 {
-        if (rtc_does_wakealarm(class_dev))
-                class_device_remove_file(class_dev,
-                                &class_device_attr_wakealarm);
-        sysfs_remove_group(&class_dev->kobj, &rtc_attr_group);
+        /* REVISIT did we add it successfully? */
+        if (rtc_does_wakealarm(rtc))
+                device_remove_file(&rtc->dev, &dev_attr_wakealarm);
 }
 
-/* interface registration */
-
-static struct class_interface rtc_sysfs_interface = {
-        .add = &rtc_sysfs_add_device,
-        .remove = &rtc_sysfs_remove_device,
-};
-
-static int __init rtc_sysfs_init(void)
+void __init rtc_sysfs_init(struct class *rtc_class)
 {
-        return rtc_interface_register(&rtc_sysfs_interface);
+        rtc_class->dev_attrs = rtc_attrs;
 }
-
-static void __exit rtc_sysfs_exit(void)
-{
-        class_interface_unregister(&rtc_sysfs_interface);
-}
-
-subsys_initcall(rtc_sysfs_init);
-module_exit(rtc_sysfs_exit);
-
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("RTC class sysfs interface");
-MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index f50a1b8e1607..254c9fce27da 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -101,11 +101,11 @@ static ssize_t test_irq_store(struct device *dev,
         retval = count;
         local_irq_disable();
         if (strncmp(buf, "tick", 4) == 0)
-                rtc_update_irq(&rtc->class_dev, 1, RTC_PF | RTC_IRQF);
+                rtc_update_irq(rtc, 1, RTC_PF | RTC_IRQF);
         else if (strncmp(buf, "alarm", 5) == 0)
-                rtc_update_irq(&rtc->class_dev, 1, RTC_AF | RTC_IRQF);
+                rtc_update_irq(rtc, 1, RTC_AF | RTC_IRQF);
         else if (strncmp(buf, "update", 6) == 0)
-                rtc_update_irq(&rtc->class_dev, 1, RTC_UF | RTC_IRQF);
+                rtc_update_irq(rtc, 1, RTC_UF | RTC_IRQF);
         else
                 retval = -EINVAL;
         local_irq_enable();
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index e40322b71938..af7596ef29e2 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -97,6 +97,7 @@ static DEFINE_SPINLOCK(rtc_lock);
 static char rtc_name[] = "RTC";
 static unsigned long periodic_frequency;
 static unsigned long periodic_count;
+static unsigned int alarm_enabled;
 
 struct resource rtc_resource[2] = {
         {       .name   = rtc_name,
@@ -188,6 +189,7 @@ static int vr41xx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
         low = rtc1_read(ECMPLREG);
         mid = rtc1_read(ECMPMREG);
         high = rtc1_read(ECMPHREG);
+        wkalrm->enabled = alarm_enabled;
 
         spin_unlock_irq(&rtc_lock);
 
@@ -206,10 +208,18 @@ static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
 
         spin_lock_irq(&rtc_lock);
 
+        if (alarm_enabled)
+                disable_irq(ELAPSEDTIME_IRQ);
+
         rtc1_write(ECMPLREG, (uint16_t)(alarm_sec << 15));
         rtc1_write(ECMPMREG, (uint16_t)(alarm_sec >> 1));
         rtc1_write(ECMPHREG, (uint16_t)(alarm_sec >> 17));
 
+        if (wkalrm->enabled)
+                enable_irq(ELAPSEDTIME_IRQ);
+
+        alarm_enabled = wkalrm->enabled;
+
         spin_unlock_irq(&rtc_lock);
 
         return 0;
@@ -221,10 +231,24 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
 
         switch (cmd) {
         case RTC_AIE_ON:
-                enable_irq(ELAPSEDTIME_IRQ);
+                spin_lock_irq(&rtc_lock);
+
+                if (!alarm_enabled) {
+                        enable_irq(ELAPSEDTIME_IRQ);
+                        alarm_enabled = 1;
+                }
+
+                spin_unlock_irq(&rtc_lock);
                 break;
         case RTC_AIE_OFF:
-                disable_irq(ELAPSEDTIME_IRQ);
+                spin_lock_irq(&rtc_lock);
+
+                if (alarm_enabled) {
+                        disable_irq(ELAPSEDTIME_IRQ);
+                        alarm_enabled = 0;
+                }
+
+                spin_unlock_irq(&rtc_lock);
                 break;
         case RTC_PIE_ON:
                 enable_irq(RTCLONG1_IRQ);
@@ -275,7 +299,7 @@ static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id)
 
         rtc2_write(RTCINTREG, ELAPSEDTIME_INT);
 
-        rtc_update_irq(&rtc->class_dev, 1, RTC_AF);
+        rtc_update_irq(rtc, 1, RTC_AF);
 
         return IRQ_HANDLED;
 }
@@ -291,7 +315,7 @@ static irqreturn_t rtclong1_interrupt(int irq, void *dev_id)
         rtc1_write(RTCL1LREG, count);
         rtc1_write(RTCL1HREG, count >> 16);
 
-        rtc_update_irq(&rtc->class_dev, 1, RTC_PF);
+        rtc_update_irq(rtc, 1, RTC_PF);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index b250c5354503..e879b212cf43 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -1,11 +1,9 @@
-if S390 && BLOCK
-
 comment "S/390 block device drivers"
-        depends on S390
+        depends on S390 && BLOCK
 
 config BLK_DEV_XPRAM
         tristate "XPRAM disk support"
-        depends on S390
+        depends on S390 && BLOCK
         help
           Select this option if you want to use your expanded storage on S/390
           or zSeries as a disk.  This is useful as a _fast_ swap device if you
@@ -15,12 +13,13 @@ config BLK_DEV_XPRAM
 
 config DCSSBLK
         tristate "DCSSBLK support"
+        depends on S390 && BLOCK
         help
           Support for dcss block device
 
 config DASD
         tristate "Support for DASD devices"
-        depends on CCW
+        depends on CCW && BLOCK
         help
           Enable this option if you want to access DASDs directly utilizing
           S/390s channel subsystem commands. This is necessary for running
@@ -62,5 +61,3 @@ config DASD_EER
           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.
-
-endif
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 977521013fe8..bfeca57098fa 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2174,9 +2174,10 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
         return ret;
 }
 
-struct dasd_ccw_req * dasd_generic_build_rdc(struct dasd_device *device,
-                                             void *rdc_buffer,
-                                             int rdc_buffer_size, char *magic)
+static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device,
+                                                   void *rdc_buffer,
+                                                   int rdc_buffer_size,
+                                                   char *magic)
 {
         struct dasd_ccw_req *cqr;
         struct ccw1 *ccw;
@@ -2219,6 +2220,7 @@ int dasd_generic_read_dev_chars(struct dasd_device *device, char *magic,
         dasd_sfree_request(cqr, cqr->device);
         return ret;
 }
+EXPORT_SYMBOL_GPL(dasd_generic_read_dev_chars);
 
 static int __init
 dasd_init(void)
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index e810e4a44ed4..eccac1c3b71b 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -50,6 +50,7 @@ struct dasd_diag_private {
         struct dasd_diag_rw_io iob;
         struct dasd_diag_init_io iib;
         blocknum_t pt_block;
+        struct ccw_dev_id dev_id;
 };
 
 struct dasd_diag_req {
@@ -102,7 +103,7 @@ mdsk_init_io(struct dasd_device *device, unsigned int blocksize,
         iib = &private->iib;
         memset(iib, 0, sizeof (struct dasd_diag_init_io));
 
-        iib->dev_nr = _ccw_device_get_device_number(device->cdev);
+        iib->dev_nr = private->dev_id.devno;
         iib->block_size = blocksize;
         iib->offset = offset;
         iib->flaga = DASD_DIAG_FLAGA_DEFAULT;
@@ -127,7 +128,7 @@ mdsk_term_io(struct dasd_device * device)
         private = (struct dasd_diag_private *) device->private;
         iib = &private->iib;
         memset(iib, 0, sizeof (struct dasd_diag_init_io));
-        iib->dev_nr = _ccw_device_get_device_number(device->cdev);
+        iib->dev_nr = private->dev_id.devno;
         rc = dia250(iib, TERM_BIO);
         return rc;
 }
@@ -166,7 +167,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
         private = (struct dasd_diag_private *) device->private;
         dreq = (struct dasd_diag_req *) cqr->data;
 
-        private->iob.dev_nr = _ccw_device_get_device_number(device->cdev);
+        private->iob.dev_nr = private->dev_id.devno;
         private->iob.key = 0;
         private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
         private->iob.block_count = dreq->block_count;
@@ -323,11 +324,12 @@ dasd_diag_check_device(struct dasd_device *device)
                                 "memory allocation failed for private data");
                         return -ENOMEM;
                 }
+                ccw_device_get_id(device->cdev, &private->dev_id);
                 device->private = (void *) private;
         }
         /* Read Device Characteristics */
         rdc_data = (void *) &(private->rdc_data);
-        rdc_data->dev_nr = _ccw_device_get_device_number(device->cdev);
+        rdc_data->dev_nr = private->dev_id.devno;
         rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics);
 
         rc = diag210((struct diag210 *) rdc_data);
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index c9583fbc2a7d..418b4e63a4fa 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -450,9 +450,9 @@ dasd_eckd_generate_uid(struct dasd_device *device, struct dasd_uid *uid)
         return 0;
 }
 
-struct dasd_ccw_req * dasd_eckd_build_rcd_lpm(struct dasd_device *device,
-                                              void *rcd_buffer,
-                                              struct ciw *ciw, __u8 lpm)
+static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm(struct dasd_device *device,
+                                                    void *rcd_buffer,
+                                                    struct ciw *ciw, __u8 lpm)
 {
         struct dasd_ccw_req *cqr;
         struct ccw1 *ccw;
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 758cfb542865..672eb0a3dd0b 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -255,6 +255,7 @@ dasd_ioctl_information(struct dasd_device *device,
         unsigned long flags;
         int rc;
         struct ccw_device *cdev;
+        struct ccw_dev_id dev_id;
 
         if (!device->discipline->fill_info)
                 return -EINVAL;
@@ -270,8 +271,9 @@ dasd_ioctl_information(struct dasd_device *device,
         }
 
         cdev = device->cdev;
+        ccw_device_get_id(cdev, &dev_id);
 
-        dasd_info->devno = _ccw_device_get_device_number(device->cdev);
+        dasd_info->devno = dev_id.devno;
         dasd_info->schid = _ccw_device_get_subchannel_number(device->cdev);
         dasd_info->cu_type = cdev->id.cu_type;
         dasd_info->cu_model = cdev->id.cu_model;
diff --git a/drivers/s390/Kconfig b/drivers/s390/char/Kconfig
index 165af398fdea..66102a184322 100644
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -1,69 +1,9 @@
-config CCW
-        bool
-        default y
-
-source "drivers/block/Kconfig"
-
-source "drivers/md/Kconfig"
-
-
-menu "Character device drivers"
-
-config UNIX98_PTYS
-        bool "Unix98 PTY support"
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-
-          Linux has traditionally used the BSD-like names /dev/ptyxx for
-          masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
-          has a number of problems. The GNU C library glibc 2.1 and later,
-          however, supports the Unix98 naming standard: in order to acquire a
-          pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
-          terminal is then made available to the process and the pseudo
-          terminal slave can be accessed as /dev/pts/<number>. What was
-          traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-
-          The entries in /dev/pts/ are created on the fly by a virtual
-          file system; therefore, if you say Y here you should say Y to
-          "/dev/pts file system for Unix98 PTYs" as well.
-
-          If you want to say Y here, you need to have the C library glibc 2.1
-          or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
-          Read the instructions in <file:Documentation/Changes> pertaining to
-          pseudo terminals. It's safe to say N.
-
-config UNIX98_PTY_COUNT
-        int "Maximum number of Unix98 PTYs in use (0-2048)"
-        depends on UNIX98_PTYS
-        default "256"
-        help
-          The maximum number of Unix98 PTYs that can be used at any one time.
-          The default is 256, and should be enough for desktop systems. Server
-          machines which support incoming telnet/rlogin/ssh connections and/or
-          serve several X terminals may want to increase this: every incoming
-          connection and every xterm uses up one PTY.
-
-          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"
+        depends on S390
 
 config TN3270
         tristate "Support for locally attached 3270 terminals"
+        depends on CCW
         help
           Include support for IBM 3270 terminals.
 
@@ -88,6 +28,7 @@ config TN3270_CONSOLE
 
 config TN3215
         bool "Support for 3215 line mode terminal"
+        depends on CCW
         help
           Include support for IBM 3215 line-mode terminals.
 
@@ -99,12 +40,19 @@ config TN3215_CONSOLE
           Linux system console.
 
 config CCW_CONSOLE
-        bool
-        depends on TN3215_CONSOLE || TN3270_CONSOLE
-        default y
- 
+        bool
+        depends on TN3215_CONSOLE || TN3270_CONSOLE
+        default y
+
+config SCLP
+        bool "Support for SCLP"
+        depends on S390
+        help
+          Include support for the SCLP interface to the service element.
+
 config SCLP_TTY
         bool "Support for SCLP line mode terminal"
+        depends on SCLP
         help
           Include support for IBM SCLP line-mode terminals.
 
@@ -117,6 +65,7 @@ config SCLP_CONSOLE
 
 config SCLP_VT220_TTY
         bool "Support for SCLP VT220-compatible terminal"
+        depends on SCLP
         help
           Include support for an IBM SCLP VT220-compatible terminal.
 
@@ -129,6 +78,7 @@ config SCLP_VT220_CONSOLE
 
 config SCLP_CPI
         tristate "Control-Program Identification"
+        depends on SCLP
         help
           This option enables the hardware console interface for system
           identification. This is commonly used for workload management and
@@ -140,6 +90,7 @@ config SCLP_CPI
 
 config S390_TAPE
         tristate "S/390 tape device support"
+        depends on CCW
         help
           Select this option if you want to access channel-attached tape
           devices on IBM S/390 or zSeries.
@@ -194,6 +145,7 @@ config VMLOGRDR
 
 config VMCP
         tristate "Support for the z/VM CP interface (VM only)"
+        depends on S390
         help
           Select this option if you want to be able to interact with the control
           program on z/VM
@@ -207,33 +159,8 @@ config MONREADER
 
 config MONWRITER
         tristate "API for writing z/VM monitor service records"
+        depends on S390
         default "m"
         help
           Character device driver for writing z/VM monitor service records
 
-endmenu
-
-menu "Cryptographic devices"
-
-config ZCRYPT
-        tristate "Support for PCI-attached cryptographic adapters"
-        select ZCRYPT_MONOLITHIC if ZCRYPT="y"
-        default "m"
-        help
-          Select this option if you want to use a PCI-attached cryptographic
-          adapter like:
-          + PCI Cryptographic Accelerator (PCICA)
-          + PCI Cryptographic Coprocessor (PCICC)
-          + PCI-X Cryptographic Coprocessor (PCIXCC)
-          + Crypto Express2 Coprocessor (CEX2C)
-          + Crypto Express2 Accelerator (CEX2A)
-
-config ZCRYPT_MONOLITHIC
-        bool "Monolithic zcrypt module"
-        depends on ZCRYPT="m"
-        help
-          Select this option if you want to have a single module z90crypt.ko
-          that contains all parts of the crypto device driver (ap bus,
-          request router and all the card drivers).
-
-endmenu
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 8df7b1323c05..67009bfa093e 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -97,7 +97,7 @@ static u8 user_data_sever[16] = {
  * Create the 8 bytes EBCDIC DCSS segment name from
  * an ASCII name, incl. padding
  */
-static inline void dcss_mkname(char *ascii_name, char *ebcdic_name)
+static void dcss_mkname(char *ascii_name, char *ebcdic_name)
 {
         int i;
 
@@ -191,7 +191,7 @@ static inline u32 mon_rec_end(struct mon_msg *monmsg)
         return *((u32 *) (mon_mca_start(monmsg) + monmsg->mca_offset + 8));
 }
 
-static inline int mon_check_mca(struct mon_msg *monmsg)
+static int mon_check_mca(struct mon_msg *monmsg)
 {
         if ((mon_rec_end(monmsg) <= mon_rec_start(monmsg)) ||
             (mon_rec_start(monmsg) < mon_dcss_start) ||
@@ -209,8 +209,8 @@ static inline int mon_check_mca(struct mon_msg *monmsg)
         return 0;
 }
 
-static inline int mon_send_reply(struct mon_msg *monmsg,
-                                 struct mon_private *monpriv)
+static int mon_send_reply(struct mon_msg *monmsg,
+                          struct mon_private *monpriv)
 {
         int rc;
 
@@ -236,7 +236,7 @@ static inline int mon_send_reply(struct mon_msg *monmsg,
         return 0;
 }
 
-static inline void mon_free_mem(struct mon_private *monpriv)
+static void mon_free_mem(struct mon_private *monpriv)
 {
         int i;
 
@@ -246,7 +246,7 @@ static inline void mon_free_mem(struct mon_private *monpriv)
         kfree(monpriv);
 }
 
-static inline struct mon_private *mon_alloc_mem(void)
+static struct mon_private *mon_alloc_mem(void)
 {
         int i;
         struct mon_private *monpriv;
@@ -307,7 +307,7 @@ static inline void mon_next_mca(struct mon_msg *monmsg)
         monmsg->pos = 0;
 }
 
-static inline struct mon_msg *mon_next_message(struct mon_private *monpriv)
+static struct mon_msg *mon_next_message(struct mon_private *monpriv)
 {
         struct mon_msg *monmsg;
 
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 8facd14adb7c..f6ef90ee3e7d 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -589,9 +589,10 @@ static int
 __raw3270_size_device_vm(struct raw3270 *rp)
 {
         int rc, model;
+        struct ccw_dev_id dev_id;
 
-        raw3270_init_diag210.vrdcdvno = 
-                _ccw_device_get_device_number(rp->cdev);
+        ccw_device_get_id(rp->cdev, &dev_id);
+        raw3270_init_diag210.vrdcdvno = dev_id.devno;
         raw3270_init_diag210.vrdclen = sizeof(struct diag210);
         rc = diag210(&raw3270_init_diag210);
         if (rc)
diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h
index 87ac4a3ad49d..dbb99d1b6f57 100644
--- a/drivers/s390/char/sclp.h
+++ b/drivers/s390/char/sclp.h
@@ -132,6 +132,9 @@ int sclp_deactivate(void);
 int sclp_reactivate(void);
 int sclp_service_call(sclp_cmdw_t command, void *sccb);
 
+int sclp_sdias_init(void);
+void sclp_sdias_exit(void);
+
 /* useful inlines */
 
 /* VM uses EBCDIC 037, LPAR+native(SE+HMC) use EBCDIC 500 */
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index bbd5b8b66f42..d6b06ab81188 100644
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -23,7 +23,7 @@
 
 /*
  * The room for the SCCB (only for writing) is not equal to a pages size
- * (as it is specified as the maximum size in the the SCLP documentation)
+ * (as it is specified as the maximum size in the SCLP documentation)
  * because of the additional data structure described above.
  */
 #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer))
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 52283daddaef..1c064976b32b 100644
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -66,9 +66,9 @@ static DEFINE_MUTEX(sdias_mutex);
 
 static void sdias_callback(struct sclp_req *request, void *data)
 {
-        struct sdias_sccb *sccb;
+        struct sdias_sccb *cbsccb;
 
-        sccb = (struct sdias_sccb *) request->sccb;
+        cbsccb = (struct sdias_sccb *) request->sccb;
         sclp_req_done = 1;
         wake_up(&sdias_wq); /* Inform caller, that request is complete */
         TRACE("callback done\n");
@@ -229,7 +229,7 @@ out:
         return rc;
 }
 
-int __init sdias_init(void)
+int __init sclp_sdias_init(void)
 {
         int rc;
 
@@ -248,7 +248,7 @@ int __init sdias_init(void)
         return 0;
 }
 
-void __exit sdias_exit(void)
+void __exit sclp_sdias_exit(void)
 {
         debug_unregister(sdias_dbf);
         sclp_unregister(&sclp_sdias_register);
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 89d439316a53..66eb0688d523 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -21,6 +21,7 @@
 #include <asm/debug.h>
 #include <asm/processor.h>
 #include <asm/irqflags.h>
+#include "sclp.h"
 
 #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x)
 #define MSG(x...) printk( KERN_ALERT x )
@@ -564,8 +565,6 @@ static void __init zcore_header_init(int arch, struct zcore_header *hdr)
         get_cpu_id(&hdr->cpu_id);
 }
 
-extern int sdias_init(void);
-
 static int __init zcore_init(void)
 {
         unsigned char arch;
@@ -582,7 +581,7 @@ static int __init zcore_init(void)
         TRACE("wwpn:   %llx\n", (unsigned long long) ipl_info.data.fcp.wwpn);
         TRACE("lun:    %llx\n", (unsigned long long) ipl_info.data.fcp.lun);
 
-        rc = sdias_init();
+        rc = sclp_sdias_init();
         if (rc)
                 goto fail;
 
@@ -634,12 +633,10 @@ fail:
         return rc;
 }
 
-extern void sdias_exit(void);
-
 static void __exit zcore_exit(void)
 {
         debug_unregister(zcore_dbf);
-        sdias_exit();
+        sclp_sdias_exit();
         diag308(DIAG308_REL_HSA, NULL);
 }
 
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 27c6d9e55b23..dfca0ef139fd 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -191,8 +191,7 @@ static int css_register_subchannel(struct subchannel *sch)
         return ret;
 }
 
-int
-css_probe_device(struct subchannel_id schid)
+static int css_probe_device(struct subchannel_id schid)
 {
         int ret;
         struct subchannel *sch;
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 71fcfdc42800..ed7977531c3f 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -138,9 +138,7 @@ struct css_driver {
  * all css_drivers have the css_bus_type
  */
 extern struct bus_type css_bus_type;
-extern struct css_driver io_subchannel_driver;
 
-extern int css_probe_device(struct subchannel_id);
 extern int css_sch_device_register(struct subchannel *);
 extern void css_sch_device_unregister(struct subchannel *);
 extern struct subchannel * get_subchannel_by_schid(struct subchannel_id);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index a23ff582db9d..a8b373f69cf0 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -129,7 +129,7 @@ static void io_subchannel_verify(struct device *);
 static void io_subchannel_ioterm(struct device *);
 static void io_subchannel_shutdown(struct subchannel *);
 
-struct css_driver io_subchannel_driver = {
+static struct css_driver io_subchannel_driver = {
         .subchannel_type = SUBCHANNEL_TYPE_IO,
         .drv = {
                 .name = "io_subchannel",
@@ -546,7 +546,7 @@ static struct attribute_group ccwdev_attr_group = {
         .attrs = ccwdev_attrs,
 };
 
-struct attribute_group *ccwdev_attr_groups[] = {
+static struct attribute_group *ccwdev_attr_groups[] = {
         &ccwdev_attr_group,
         NULL,
 };
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 16f59fcb66b1..a5d263fb55ae 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -616,6 +616,17 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no)
         return chp_get_chp_desc(chpid);
 }
 
+/**
+ * ccw_device_get_id - obtain a ccw device id
+ * @cdev: device to obtain the id for
+ * @dev_id: where to fill in the values
+ */
+void ccw_device_get_id(struct ccw_device *cdev, struct ccw_dev_id *dev_id)
+{
+        *dev_id = cdev->private->dev_id;
+}
+EXPORT_SYMBOL(ccw_device_get_id);
+
 // FIXME: these have to go:
 
 int
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index cba64e4cfcd4..e70aeb7a3781 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -996,18 +996,25 @@ __qdio_outbound_processing(struct qdio_q *q)
         if (qdio_has_outbound_q_moved(q))
                 qdio_kick_outbound_handler(q);
 
-        if (q->is_iqdio_q) {
+        if (q->queue_type == QDIO_ZFCP_QFMT) {
+                if ((!q->hydra_gives_outbound_pcis) &&
+                    (!qdio_is_outbound_q_done(q)))
+                        qdio_mark_q(q);
+        }
+        else if (((!q->is_iqdio_q) && (!q->is_pci_out)) ||
+                 (q->queue_type == QDIO_IQDIO_QFMT_ASYNCH)) {
                 /* 
-                 * for asynchronous queues, we better check, if the sent
-                 * buffer is already switched from PRIMED to EMPTY.
+                 * make sure buffer switch from PRIMED to EMPTY is noticed
+                 * and outbound_handler is called
                  */
-                if ((q->queue_type == QDIO_IQDIO_QFMT_ASYNCH) &&
-                    !qdio_is_outbound_q_done(q))
-                        qdio_mark_q(q);
-
-        } else if (!q->hydra_gives_outbound_pcis)
-                if (!qdio_is_outbound_q_done(q))
-                        qdio_mark_q(q);
+                if (qdio_is_outbound_q_done(q)) {
+                        del_timer(&q->timer);
+                } else {
+                        if (!timer_pending(&q->timer))
+                                mod_timer(&q->timer, jiffies +
+                                          QDIO_FORCE_CHECK_TIMEOUT);
+                }
+        }
 
         qdio_release_q(q);
 }
@@ -1826,6 +1833,7 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                         q->queue_type = QDIO_IQDIO_QFMT_ASYNCH;
                 q->int_parm=int_parm;
                 q->is_input_q=0;
+                q->is_pci_out = 0;
                 q->schid = irq_ptr->schid;
                 q->cdev = cdev;
                 q->irq_ptr = irq_ptr;
@@ -1838,6 +1846,10 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                 q->tasklet.data=(unsigned long)q;
                 q->tasklet.func=(void(*)(unsigned long))
                         &qdio_outbound_processing;
+                q->timer.function=(void(*)(unsigned long))
+                        &qdio_outbound_processing;
+                q->timer.data = (long)q;
+                init_timer(&q->timer);
 
                 atomic_set(&q->busy_siga_counter,0);
                 q->timing.busy_start=0;
@@ -1971,6 +1983,7 @@ qdio_handle_pci(struct qdio_irq *irq_ptr)
                 if (q->is_input_q&QDIO_FLAG_NO_INPUT_INTERRUPT_CONTEXT)
                         qdio_mark_q(q);
                 else {
+                        qdio_perf_stat_dec(&perf_stats.tl_runs);
                         __qdio_inbound_processing(q);
                 }
         }
@@ -2635,6 +2648,7 @@ qdio_shutdown(struct ccw_device *cdev, int how)
 
         for (i=0;i<irq_ptr->no_output_qs;i++) {
                 tasklet_kill(&irq_ptr->output_qs[i]->tasklet);
+                del_timer(&irq_ptr->output_qs[i]->timer);
                 wait_event_interruptible_timeout(cdev->private->wait_q,
                                                  !atomic_read(&irq_ptr->
                                                               output_qs[i]->
@@ -3458,6 +3472,10 @@ do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags,
                 qdio_perf_stat_inc(&perf_stats.outbound_cnt);
                 return;
         }
+        if (callflags & QDIO_FLAG_PCI_OUT)
+                q->is_pci_out = 1;
+        else
+                q->is_pci_out = 0;
         if (q->is_iqdio_q) {
                 /* one siga for every sbal */
                 while (count--)
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 2895392eaae4..6d7aad18f6f0 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -60,6 +60,7 @@
 #define QDIO_ACTIVATE_TIMEOUT ((5*HZ)>>10)
 #define QDIO_CLEANUP_CLEAR_TIMEOUT (20*HZ)
 #define QDIO_CLEANUP_HALT_TIMEOUT (10*HZ)
+#define QDIO_FORCE_CHECK_TIMEOUT (10*HZ)
 
 enum qdio_irq_states {
         QDIO_IRQ_STATE_INACTIVE,
@@ -511,8 +512,8 @@ struct qdio_q {
 
         void *irq_ptr;
 
-#ifdef QDIO_USE_TIMERS_FOR_POLLING
         struct timer_list timer;
+#ifdef QDIO_USE_TIMERS_FOR_POLLING
         atomic_t timer_already_set;
         spinlock_t timer_lock;
 #else /* QDIO_USE_TIMERS_FOR_POLLING */
@@ -558,6 +559,7 @@ struct qdio_q {
         } timing;
         atomic_t busy_siga_counter;
         unsigned int queue_type;
+        unsigned int is_pci_out;
 
         /* leave this member at the end. won't be cleared in qdio_fill_qs */
         struct slib *slib; /* a page is allocated under this pointer,
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index f98fa465df0a..eada69dec4fe 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -3,7 +3,7 @@ menu "S/390 network device drivers"
 
 config LCS
         tristate "Lan Channel Station Interface"
-        depends on NETDEVICES && (NET_ETHERNET || TR || FDDI)
+        depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
         help
            Select this option if you want to use LCS networking  on IBM S/390
            or zSeries. This device driver supports Token Ring (IEEE 802.5),
@@ -13,7 +13,7 @@ config LCS
 
 config CTC
         tristate "CTC device support"
-        depends on NETDEVICES
+        depends on CCW && NETDEVICES
         help
           Select this option if you want to use channel-to-channel networking
           on IBM S/390 or zSeries. This device driver supports real CTC
@@ -42,7 +42,7 @@ config SMSGIUCV
 
 config CLAW
         tristate "CLAW device support"
-        depends on NETDEVICES
+        depends on CCW && NETDEVICES
         help
           This driver supports channel attached CLAW devices.
           CLAW is Common Link Access for Workstation.  Common devices
@@ -52,7 +52,7 @@ config CLAW
 
 config QETH
         tristate "Gigabit Ethernet device support"
-        depends on NETDEVICES && IP_MULTICAST && QDIO
+        depends on CCW && NETDEVICES && IP_MULTICAST && QDIO
         help
           This driver supports the IBM S/390 and zSeries OSA Express adapters
           in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index e10e85e85c84..c358764f3264 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1862,12 +1862,14 @@ static void netiucv_remove_connection(struct iucv_connection *conn)
         write_lock_bh(&iucv_connection_rwlock);
         list_del_init(&conn->list);
         write_unlock_bh(&iucv_connection_rwlock);
+        fsm_deltimer(&conn->timer);
+        netiucv_purge_skb_queue(&conn->collect_queue);
         if (conn->path) {
                 iucv_path_sever(conn->path, iucvMagic);
                 kfree(conn->path);
                 conn->path = NULL;
         }
-        fsm_deltimer(&conn->timer);
+        netiucv_purge_skb_queue(&conn->commit_queue);
         kfree_fsm(conn->fsm);
         kfree_skb(conn->rx_buff);
         kfree_skb(conn->tx_buff);
@@ -2115,7 +2117,6 @@ static void __exit netiucv_exit(void)
         while (!list_empty(&iucv_connection_list)) {
                 cp = list_entry(iucv_connection_list.next,
                                 struct iucv_connection, list);
-                list_del(&cp->list);
                 ndev = cp->netdev;
                 priv = netdev_priv(ndev);
                 dev = priv->dev;
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index dd7034fbfff8..4640f32daae5 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -620,10 +620,10 @@ qeth_eddp_create_context_tcp(struct qeth_card *card, struct sk_buff *skb,
 
 struct qeth_eddp_context *
 qeth_eddp_create_context(struct qeth_card *card, struct sk_buff *skb,
-                         struct qeth_hdr *qhdr)
+                         struct qeth_hdr *qhdr, unsigned char sk_protocol)
 {
         QETH_DBF_TEXT(trace, 5, "creddpc");
-        switch (skb->sk->sk_protocol){
+        switch (sk_protocol) {
         case IPPROTO_TCP:
                 return qeth_eddp_create_context_tcp(card, skb, qhdr);
         default:
diff --git a/drivers/s390/net/qeth_eddp.h b/drivers/s390/net/qeth_eddp.h
index 103768d3bab2..52910c9252c0 100644
--- a/drivers/s390/net/qeth_eddp.h
+++ b/drivers/s390/net/qeth_eddp.h
@@ -34,7 +34,8 @@ struct qeth_eddp_context_reference {
 };
 
 extern struct qeth_eddp_context *
-qeth_eddp_create_context(struct qeth_card *,struct sk_buff *,struct qeth_hdr *);
+qeth_eddp_create_context(struct qeth_card *,struct sk_buff *,
+                         struct qeth_hdr *, unsigned char);
 
 extern void
 qeth_eddp_put_context(struct qeth_eddp_context *);
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 6fd8870551d3..0b96d49dd636 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1682,6 +1682,21 @@ qeth_put_reply(struct qeth_reply *reply)
                 kfree(reply);
 }
 
+static void
+qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, struct qeth_card *card)
+{
+        int rc;
+        int com;
+        char * ipa_name;
+
+        com = cmd->hdr.command;
+        rc  = cmd->hdr.return_code;
+        ipa_name = qeth_get_ipa_cmd_name(com);
+
+        PRINT_ERR("%s(x%X) for %s returned x%X \"%s\"\n", ipa_name, com,
+                   QETH_CARD_IFNAME(card), rc, qeth_get_ipa_msg(rc));
+}
+
 static struct qeth_ipa_cmd *
 qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
 {
@@ -1690,8 +1705,11 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
         QETH_DBF_TEXT(trace,5,"chkipad");
         if (IS_IPA(iob->data)){
                 cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data);
-                if (IS_IPA_REPLY(cmd))
+                if (IS_IPA_REPLY(cmd)) {
+                        if (cmd->hdr.return_code)
+                                qeth_issue_ipa_msg(cmd, card);
                         return cmd;
+                }
                 else {
                         switch (cmd->hdr.command) {
                         case IPA_CMD_STOPLAN:
@@ -2816,6 +2834,7 @@ qeth_flush_buffers(struct qeth_qdio_out_q *queue, int under_int,
         struct qeth_qdio_out_buffer *buf;
         int rc;
         int i;
+        unsigned int qdio_flags;
 
         QETH_DBF_TEXT(trace, 6, "flushbuf");
 
@@ -2841,7 +2860,7 @@ qeth_flush_buffers(struct qeth_qdio_out_q *queue, int under_int,
                         if (!atomic_read(&queue->set_pci_flags_count)){
                                 /*
                                  * there's no outstanding PCI any more, so we
-                                 * have to request a PCI to be sure the the PCI
+                                 * have to request a PCI to be sure that the PCI
                                  * will wake at some time in the future then we
                                  * can flush packed buffers that might still be
                                  * hanging around, which can happen if no
@@ -2859,13 +2878,13 @@ qeth_flush_buffers(struct qeth_qdio_out_q *queue, int under_int,
                 queue->card->perf_stats.outbound_do_qdio_start_time =
                         qeth_get_micros();
         }
+        qdio_flags = QDIO_FLAG_SYNC_OUTPUT;
         if (under_int)
-                rc = do_QDIO(CARD_DDEV(queue->card),
-                             QDIO_FLAG_SYNC_OUTPUT | QDIO_FLAG_UNDER_INTERRUPT,
-                             queue->queue_no, index, count, NULL);
-        else
-                rc = do_QDIO(CARD_DDEV(queue->card), QDIO_FLAG_SYNC_OUTPUT,
-                             queue->queue_no, index, count, NULL);
+                qdio_flags |= QDIO_FLAG_UNDER_INTERRUPT;
+        if (atomic_read(&queue->set_pci_flags_count))
+                qdio_flags |= QDIO_FLAG_PCI_OUT;
+        rc = do_QDIO(CARD_DDEV(queue->card), qdio_flags,
+                     queue->queue_no, index, count, NULL);
         if (queue->card->options.performance_stats)
                 queue->card->perf_stats.outbound_do_qdio_time +=
                         qeth_get_micros() -
@@ -4490,7 +4509,8 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 qeth_fill_header(card, hdr, new_skb, ipv, cast_type);
         }
         if (large_send == QETH_LARGE_SEND_EDDP) {
-                ctx = qeth_eddp_create_context(card, new_skb, hdr);
+                ctx = qeth_eddp_create_context(card, new_skb, hdr,
+                                               skb->sk->sk_protocol);
                 if (ctx == NULL) {
                         __qeth_free_new_skb(skb, new_skb);
                         PRINT_WARN("could not create eddp context\n");
@@ -5948,9 +5968,6 @@ qeth_layer2_send_setmac_cb(struct qeth_card *card,
         cmd = (struct qeth_ipa_cmd *) data;
         if (cmd->hdr.return_code) {
                 QETH_DBF_TEXT_(trace, 2, "L2er%x", cmd->hdr.return_code);
-                PRINT_WARN("Error in registering MAC address on " \
-                           "device %s: x%x\n", CARD_BUS_ID(card),
-                           cmd->hdr.return_code);
                 card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
                 cmd->hdr.return_code = -EIO;
         } else {
@@ -5985,9 +6002,6 @@ qeth_layer2_send_delmac_cb(struct qeth_card *card,
         QETH_DBF_TEXT(trace, 2, "L2Dmaccb");
         cmd = (struct qeth_ipa_cmd *) data;
         if (cmd->hdr.return_code) {
-                PRINT_WARN("Error in deregistering MAC address on " \
-                           "device %s: x%x\n", CARD_BUS_ID(card),
-                           cmd->hdr.return_code);
                 QETH_DBF_TEXT_(trace, 2, "err%d", cmd->hdr.return_code);
                 cmd->hdr.return_code = -EIO;
                 return 0;
@@ -6651,7 +6665,7 @@ qeth_setadpparms_change_macaddr_cb(struct qeth_card *card,
         QETH_DBF_TEXT(trace,4,"chgmaccb");
 
         cmd = (struct qeth_ipa_cmd *) data;
-        if (!card->options.layer2 || card->info.guestlan ||
+        if (!card->options.layer2 ||
             !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {
                 memcpy(card->dev->dev_addr,
                        &cmd->data.setadapterparms.data.change_addr.addr,
@@ -8497,6 +8511,7 @@ __qeth_reboot_event_card(struct device *dev, void *data)
         card = (struct qeth_card *) dev->driver_data;
         qeth_clear_ip_list(card, 0, 0);
         qeth_qdio_clear_card(card, 0);
+        qeth_clear_qdio_buffers(card);
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_mpc.c b/drivers/s390/net/qeth_mpc.c
index 77c83209d70e..f29a4bc4f6f2 100644
--- a/drivers/s390/net/qeth_mpc.c
+++ b/drivers/s390/net/qeth_mpc.c
@@ -157,12 +157,113 @@ unsigned char READ_CCW[]={
 };
 
 
+struct ipa_rc_msg {
+        enum qeth_ipa_return_codes rc;
+        char *msg;
+};
 
+static struct ipa_rc_msg qeth_ipa_rc_msg[] = {
+        {IPA_RC_SUCCESS,                "success"},
+        {IPA_RC_NOTSUPP,                "Command not supported"},
+        {IPA_RC_IP_TABLE_FULL,          "Add Addr IP Table Full - ipv6"},
+        {IPA_RC_UNKNOWN_ERROR,          "IPA command failed - reason unknown"},
+        {IPA_RC_UNSUPPORTED_COMMAND,    "Command not supported"},
+        {IPA_RC_DUP_IPV6_REMOTE,"ipv6 address already registered remote"},
+        {IPA_RC_DUP_IPV6_HOME,          "ipv6 address already registered"},
+        {IPA_RC_UNREGISTERED_ADDR,      "Address not registered"},
+        {IPA_RC_NO_ID_AVAILABLE,        "No identifiers available"},
+        {IPA_RC_ID_NOT_FOUND,           "Identifier not found"},
+        {IPA_RC_INVALID_IP_VERSION,     "IP version incorrect"},
+        {IPA_RC_LAN_FRAME_MISMATCH,     "LAN and frame mismatch"},
+        {IPA_RC_L2_UNSUPPORTED_CMD,     "Unsupported layer 2 command"},
+        {IPA_RC_L2_DUP_MAC,             "Duplicate MAC address"},
+        {IPA_RC_L2_ADDR_TABLE_FULL,     "Layer2 address table full"},
+        {IPA_RC_L2_DUP_LAYER3_MAC,      "Duplicate with layer 3 MAC"},
+        {IPA_RC_L2_GMAC_NOT_FOUND,      "GMAC not found"},
+        {IPA_RC_L2_MAC_NOT_FOUND,       "L2 mac address not found"},
+        {IPA_RC_L2_INVALID_VLAN_ID,     "L2 invalid vlan id"},
+        {IPA_RC_L2_DUP_VLAN_ID,         "L2 duplicate vlan id"},
+        {IPA_RC_L2_VLAN_ID_NOT_FOUND,   "L2 vlan id not found"},
+        {IPA_RC_DATA_MISMATCH,          "Data field mismatch (v4/v6 mixed)"},
+        {IPA_RC_INVALID_MTU_SIZE,       "Invalid MTU size"},
+        {IPA_RC_INVALID_LANTYPE,        "Invalid LAN type"},
+        {IPA_RC_INVALID_LANNUM,         "Invalid LAN num"},
+        {IPA_RC_DUPLICATE_IP_ADDRESS,   "Address already registered"},
+        {IPA_RC_IP_ADDR_TABLE_FULL,     "IP address table full"},
+        {IPA_RC_LAN_PORT_STATE_ERROR,   "LAN port state error"},
+        {IPA_RC_SETIP_NO_STARTLAN,      "Setip no startlan received"},
+        {IPA_RC_SETIP_ALREADY_RECEIVED, "Setip already received"},
+        {IPA_RC_IP_ADDR_ALREADY_USED,   "IP address already in use on LAN"},
+        {IPA_RC_MULTICAST_FULL,         "No task available, multicast full"},
+        {IPA_RC_SETIP_INVALID_VERSION,  "SETIP invalid IP version"},
+        {IPA_RC_UNSUPPORTED_SUBCMD,     "Unsupported assist subcommand"},
+        {IPA_RC_ARP_ASSIST_NO_ENABLE,   "Only partial success, no enable"},
+        {IPA_RC_PRIMARY_ALREADY_DEFINED,"Primary already defined"},
+        {IPA_RC_SECOND_ALREADY_DEFINED, "Secondary already defined"},
+        {IPA_RC_INVALID_SETRTG_INDICATOR,"Invalid SETRTG indicator"},
+        {IPA_RC_MC_ADDR_ALREADY_DEFINED,"Multicast address already defined"},
+        {IPA_RC_LAN_OFFLINE,            "STRTLAN_LAN_DISABLED - LAN offline"},
+        {IPA_RC_INVALID_IP_VERSION2,    "Invalid IP version"},
+        {IPA_RC_FFFF,                   "Unknown Error"}
+};
 
 
 
+char *
+qeth_get_ipa_msg(enum qeth_ipa_return_codes rc)
+{
+        int x = 0;
+        qeth_ipa_rc_msg[sizeof(qeth_ipa_rc_msg) /
+                        sizeof(struct ipa_rc_msg) - 1].rc = rc;
+        while(qeth_ipa_rc_msg[x].rc != rc)
+                x++;
+        return qeth_ipa_rc_msg[x].msg;
+}
 
 
+struct ipa_cmd_names {
+        enum qeth_ipa_cmds cmd;
+        char *name;
+};
+
+static struct ipa_cmd_names qeth_ipa_cmd_names[] = {
+        {IPA_CMD_STARTLAN,      "startlan"},
+        {IPA_CMD_STOPLAN,       "stoplan"},
+        {IPA_CMD_SETVMAC,       "setvmac"},
+        {IPA_CMD_DELVMAC,       "delvmca"},
+        {IPA_CMD_SETGMAC,       "setgmac"},
+        {IPA_CMD_DELGMAC,       "delgmac"},
+        {IPA_CMD_SETVLAN,       "setvlan"},
+        {IPA_CMD_DELVLAN,       "delvlan"},
+        {IPA_CMD_SETCCID,       "setccid"},
+        {IPA_CMD_DELCCID,       "delccid"},
+        {IPA_CMD_MODCCID,       "setip"},
+        {IPA_CMD_SETIP,         "setip"},
+        {IPA_CMD_QIPASSIST,     "qipassist"},
+        {IPA_CMD_SETASSPARMS,   "setassparms"},
+        {IPA_CMD_SETIPM,        "setipm"},
+        {IPA_CMD_DELIPM,        "delipm"},
+        {IPA_CMD_SETRTG,        "setrtg"},
+        {IPA_CMD_DELIP,         "delip"},
+        {IPA_CMD_SETADAPTERPARMS, "setadapterparms"},
+        {IPA_CMD_SET_DIAG_ASS,  "set_diag_ass"},
+        {IPA_CMD_CREATE_ADDR,   "create_addr"},
+        {IPA_CMD_DESTROY_ADDR,  "destroy_addr"},
+        {IPA_CMD_REGISTER_LOCAL_ADDR,   "register_local_addr"},
+        {IPA_CMD_UNREGISTER_LOCAL_ADDR, "unregister_local_addr"},
+        {IPA_CMD_UNKNOWN,       "unknown"},
+};
 
+char *
+qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd)
+{
+        int x = 0;
+        qeth_ipa_cmd_names[
+                sizeof(qeth_ipa_cmd_names)/
+                        sizeof(struct ipa_cmd_names)-1].cmd = cmd;
+        while(qeth_ipa_cmd_names[x].cmd != cmd)
+                x++;
+        return qeth_ipa_cmd_names[x].name;
+}
 
 
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index d74bc43da72a..1d8083c91765 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -25,14 +25,14 @@ extern unsigned char IPA_PDU_HEADER[];
 
 #define IPA_CMD_LENGTH  (IPA_PDU_HEADER_SIZE + sizeof(struct qeth_ipa_cmd))
 
-#define QETH_SEQ_NO_LENGTH      4
-#define QETH_MPC_TOKEN_LENGTH   4
+#define QETH_SEQ_NO_LENGTH      4
+#define QETH_MPC_TOKEN_LENGTH   4
 #define QETH_MCL_LENGTH         4
 #define OSA_ADDR_LEN            6
 
-#define QETH_TIMEOUT            (10 * HZ)
-#define QETH_IPA_TIMEOUT        (45 * HZ)
-#define QETH_IDX_COMMAND_SEQNO  0xffff0000
+#define QETH_TIMEOUT            (10 * HZ)
+#define QETH_IPA_TIMEOUT        (45 * HZ)
+#define QETH_IDX_COMMAND_SEQNO  0xffff0000
 #define SR_INFO_LEN             16
 
 #define QETH_CLEAR_CHANNEL_PARM -10
@@ -93,79 +93,107 @@ enum qeth_checksum_types {
  */
 #define RESET_ROUTING_FLAG 0x10 /* indicate that routing type shall be set */
 enum qeth_routing_types {
-        NO_ROUTER           = 0, /* TODO: set to bit flag used in IPA Command */
-        PRIMARY_ROUTER      = 1,
-        SECONDARY_ROUTER    = 2,
-        MULTICAST_ROUTER    = 3,
-        PRIMARY_CONNECTOR   = 4,
-        SECONDARY_CONNECTOR = 5,
+        NO_ROUTER               = 0, /* TODO: set to bit flag used in IPA Command */
+        PRIMARY_ROUTER          = 1,
+        SECONDARY_ROUTER        = 2,
+        MULTICAST_ROUTER        = 3,
+        PRIMARY_CONNECTOR       = 4,
+        SECONDARY_CONNECTOR     = 5,
 };
 
-
 /* IPA Commands */
 enum qeth_ipa_cmds {
-        IPA_CMD_STARTLAN              = 0x01,
-        IPA_CMD_STOPLAN               = 0x02,
-        IPA_CMD_SETVMAC               = 0x21,
-        IPA_CMD_DELVMAC               = 0x22,
-        IPA_CMD_SETGMAC               = 0x23,
-        IPA_CMD_DELGMAC               = 0x24,
-        IPA_CMD_SETVLAN               = 0x25,
-        IPA_CMD_DELVLAN               = 0x26,
-        IPA_CMD_SETCCID               = 0x41,
-        IPA_CMD_DELCCID               = 0x42,
-        IPA_CMD_MODCCID               = 0x43,
-        IPA_CMD_SETIP                 = 0xb1,
-        IPA_CMD_DELIP                 = 0xb7,
-        IPA_CMD_QIPASSIST             = 0xb2,
-        IPA_CMD_SETASSPARMS           = 0xb3,
-        IPA_CMD_SETIPM                = 0xb4,
-        IPA_CMD_DELIPM                = 0xb5,
-        IPA_CMD_SETRTG                = 0xb6,
-        IPA_CMD_SETADAPTERPARMS       = 0xb8,
-        IPA_CMD_IPFRAME               = 0xb9,
-        IPA_CMD_ADD_ADDR_ENTRY        = 0xc1,
-        IPA_CMD_DELETE_ADDR_ENTRY     = 0xc2,
-        IPA_CMD_CREATE_ADDR           = 0xc3,
-        IPA_CMD_DESTROY_ADDR          = 0xc4,
-        IPA_CMD_REGISTER_LOCAL_ADDR   = 0xd1,
-        IPA_CMD_UNREGISTER_LOCAL_ADDR = 0xd2,
+        IPA_CMD_STARTLAN                = 0x01,
+        IPA_CMD_STOPLAN                 = 0x02,
+        IPA_CMD_SETVMAC                 = 0x21,
+        IPA_CMD_DELVMAC                 = 0x22,
+        IPA_CMD_SETGMAC                 = 0x23,
+        IPA_CMD_DELGMAC                 = 0x24,
+        IPA_CMD_SETVLAN                 = 0x25,
+        IPA_CMD_DELVLAN                 = 0x26,
+        IPA_CMD_SETCCID                 = 0x41,
+        IPA_CMD_DELCCID                 = 0x42,
+        IPA_CMD_MODCCID                 = 0x43,
+        IPA_CMD_SETIP                   = 0xb1,
+        IPA_CMD_QIPASSIST               = 0xb2,
+        IPA_CMD_SETASSPARMS             = 0xb3,
+        IPA_CMD_SETIPM                  = 0xb4,
+        IPA_CMD_DELIPM                  = 0xb5,
+        IPA_CMD_SETRTG                  = 0xb6,
+        IPA_CMD_DELIP                   = 0xb7,
+        IPA_CMD_SETADAPTERPARMS         = 0xb8,
+        IPA_CMD_SET_DIAG_ASS            = 0xb9,
+        IPA_CMD_CREATE_ADDR             = 0xc3,
+        IPA_CMD_DESTROY_ADDR            = 0xc4,
+        IPA_CMD_REGISTER_LOCAL_ADDR     = 0xd1,
+        IPA_CMD_UNREGISTER_LOCAL_ADDR   = 0xd2,
+        IPA_CMD_UNKNOWN                 = 0x00
 };
 
 enum qeth_ip_ass_cmds {
         IPA_CMD_ASS_START       = 0x0001,
         IPA_CMD_ASS_STOP        = 0x0002,
-        IPA_CMD_ASS_CONFIGURE   = 0x0003,
-        IPA_CMD_ASS_ENABLE      = 0x0004,
+        IPA_CMD_ASS_CONFIGURE   = 0x0003,
+        IPA_CMD_ASS_ENABLE      = 0x0004,
 };
 
 enum qeth_arp_process_subcmds {
-        IPA_CMD_ASS_ARP_SET_NO_ENTRIES  = 0x0003,
-        IPA_CMD_ASS_ARP_QUERY_CACHE     = 0x0004,
-        IPA_CMD_ASS_ARP_ADD_ENTRY       = 0x0005,
-        IPA_CMD_ASS_ARP_REMOVE_ENTRY    = 0x0006,
-        IPA_CMD_ASS_ARP_FLUSH_CACHE     = 0x0007,
-        IPA_CMD_ASS_ARP_QUERY_INFO      = 0x0104,
-        IPA_CMD_ASS_ARP_QUERY_STATS     = 0x0204,
+        IPA_CMD_ASS_ARP_SET_NO_ENTRIES  = 0x0003,
+        IPA_CMD_ASS_ARP_QUERY_CACHE     = 0x0004,
+        IPA_CMD_ASS_ARP_ADD_ENTRY       = 0x0005,
+        IPA_CMD_ASS_ARP_REMOVE_ENTRY    = 0x0006,
+        IPA_CMD_ASS_ARP_FLUSH_CACHE     = 0x0007,
+        IPA_CMD_ASS_ARP_QUERY_INFO      = 0x0104,
+        IPA_CMD_ASS_ARP_QUERY_STATS     = 0x0204,
 };
 
-/* Return Codes for IPA Commands */
+
+/* Return Codes for IPA Commands
+ * according to OSA card Specs */
+
 enum qeth_ipa_return_codes {
-        IPA_RC_SUCCESS             = 0x0000,
-        IPA_RC_NOTSUPP             = 0x0001,
-        IPA_RC_NO_ACCESS           = 0x0002,
-        IPA_RC_FAILED              = 0x0003,
-        IPA_RC_DATA_MISMATCH       = 0xe001,
-        IPA_RC_INVALID_LAN_TYPE    = 0xe003,
-        IPA_RC_INVALID_LAN_NO      = 0xe004,
-        IPA_RC_IPADDR_ALREADY_REG  = 0xe005,
-        IPA_RC_IPADDR_TABLE_FULL   = 0xe006,
-        IPA_RC_IPADDR_ALREADY_USED = 0xe00a,
-        IPA_RC_ASSNO_NOT_SUPP      = 0xe00d,
-        IPA_RC_ASSCMD_START_FAILED = 0xe00e,
-        IPA_RC_ASSCMD_PART_SUCCESS = 0xe00f,
-        IPA_RC_IPADDR_NOT_DEFINED  = 0xe010,
-        IPA_RC_LAN_OFFLINE         = 0xe080,
+        IPA_RC_SUCCESS                  = 0x0000,
+        IPA_RC_NOTSUPP                  = 0x0001,
+        IPA_RC_IP_TABLE_FULL            = 0x0002,
+        IPA_RC_UNKNOWN_ERROR            = 0x0003,
+        IPA_RC_UNSUPPORTED_COMMAND      = 0x0004,
+        IPA_RC_DUP_IPV6_REMOTE          = 0x0008,
+        IPA_RC_DUP_IPV6_HOME            = 0x0010,
+        IPA_RC_UNREGISTERED_ADDR        = 0x0011,
+        IPA_RC_NO_ID_AVAILABLE          = 0x0012,
+        IPA_RC_ID_NOT_FOUND             = 0x0013,
+        IPA_RC_INVALID_IP_VERSION       = 0x0020,
+        IPA_RC_LAN_FRAME_MISMATCH       = 0x0040,
+        IPA_RC_L2_UNSUPPORTED_CMD       = 0x2003,
+        IPA_RC_L2_DUP_MAC               = 0x2005,
+        IPA_RC_L2_ADDR_TABLE_FULL       = 0x2006,
+        IPA_RC_L2_DUP_LAYER3_MAC        = 0x200a,
+        IPA_RC_L2_GMAC_NOT_FOUND        = 0x200b,
+        IPA_RC_L2_MAC_NOT_FOUND         = 0x2010,
+        IPA_RC_L2_INVALID_VLAN_ID       = 0x2015,
+        IPA_RC_L2_DUP_VLAN_ID           = 0x2016,
+        IPA_RC_L2_VLAN_ID_NOT_FOUND     = 0x2017,
+        IPA_RC_DATA_MISMATCH            = 0xe001,
+        IPA_RC_INVALID_MTU_SIZE         = 0xe002,
+        IPA_RC_INVALID_LANTYPE          = 0xe003,
+        IPA_RC_INVALID_LANNUM           = 0xe004,
+        IPA_RC_DUPLICATE_IP_ADDRESS     = 0xe005,
+        IPA_RC_IP_ADDR_TABLE_FULL       = 0xe006,
+        IPA_RC_LAN_PORT_STATE_ERROR     = 0xe007,
+        IPA_RC_SETIP_NO_STARTLAN        = 0xe008,
+        IPA_RC_SETIP_ALREADY_RECEIVED   = 0xe009,
+        IPA_RC_IP_ADDR_ALREADY_USED     = 0xe00a,
+        IPA_RC_MULTICAST_FULL           = 0xe00b,
+        IPA_RC_SETIP_INVALID_VERSION    = 0xe00d,
+        IPA_RC_UNSUPPORTED_SUBCMD       = 0xe00e,
+        IPA_RC_ARP_ASSIST_NO_ENABLE     = 0xe00f,
+        IPA_RC_PRIMARY_ALREADY_DEFINED  = 0xe010,
+        IPA_RC_SECOND_ALREADY_DEFINED   = 0xe011,
+        IPA_RC_INVALID_SETRTG_INDICATOR = 0xe012,
+        IPA_RC_MC_ADDR_ALREADY_DEFINED  = 0xe013,
+        IPA_RC_LAN_OFFLINE              = 0xe080,
+        IPA_RC_INVALID_IP_VERSION2      = 0xf001,
+        IPA_RC_FFFF                     = 0xffff
 };
 
 /* IPA function flags; each flag marks availability of respective function */
@@ -183,7 +211,9 @@ enum qeth_ipa_funcs {
         IPA_SETADAPTERPARMS     = 0x00000400L,
         IPA_VLAN_PRIO           = 0x00000800L,
         IPA_PASSTHRU            = 0x00001000L,
+        IPA_FLUSH_ARP_SUPPORT   = 0x00002000L,
         IPA_FULL_VLAN           = 0x00004000L,
+        IPA_INBOUND_PASSTHRU    = 0x00008000L,
         IPA_SOURCE_MAC          = 0x00010000L,
         IPA_OSA_MC_ROUTER       = 0x00020000L,
         IPA_QUERY_ARP_ASSIST    = 0x00040000L,
@@ -204,31 +234,30 @@ enum qeth_ipa_setdelip_flags {
 /* SETADAPTER IPA Command: ****************************************************/
 enum qeth_ipa_setadp_cmd {
         IPA_SETADP_QUERY_COMMANDS_SUPPORTED     = 0x01,
-        IPA_SETADP_ALTER_MAC_ADDRESS            = 0x02,
-        IPA_SETADP_ADD_DELETE_GROUP_ADDRESS     = 0x04,
-        IPA_SETADP_ADD_DELETE_FUNCTIONAL_ADDR   = 0x08,
-        IPA_SETADP_SET_ADDRESSING_MODE          = 0x10,
-        IPA_SETADP_SET_CONFIG_PARMS             = 0x20,
-        IPA_SETADP_SET_CONFIG_PARMS_EXTENDED    = 0x40,
-        IPA_SETADP_SET_BROADCAST_MODE           = 0x80,
-        IPA_SETADP_SEND_OSA_MESSAGE             = 0x0100,
-        IPA_SETADP_SET_SNMP_CONTROL             = 0x0200,
-        IPA_SETADP_READ_SNMP_PARMS              = 0x0400,
+        IPA_SETADP_ALTER_MAC_ADDRESS            = 0x02,
+        IPA_SETADP_ADD_DELETE_GROUP_ADDRESS     = 0x04,
+        IPA_SETADP_ADD_DELETE_FUNCTIONAL_ADDR   = 0x08,
+        IPA_SETADP_SET_ADDRESSING_MODE          = 0x10,
+        IPA_SETADP_SET_CONFIG_PARMS             = 0x20,
+        IPA_SETADP_SET_CONFIG_PARMS_EXTENDED    = 0x40,
+        IPA_SETADP_SET_BROADCAST_MODE           = 0x80,
+        IPA_SETADP_SEND_OSA_MESSAGE             = 0x0100,
+        IPA_SETADP_SET_SNMP_CONTROL             = 0x0200,
+        IPA_SETADP_QUERY_CARD_INFO              = 0x0400,
         IPA_SETADP_SET_PROMISC_MODE             = 0x0800,
-        IPA_SETADP_QUERY_CARD_INFO              = 0x1000,
 };
 enum qeth_ipa_mac_ops {
-        CHANGE_ADDR_READ_MAC            = 0,
-        CHANGE_ADDR_REPLACE_MAC         = 1,
-        CHANGE_ADDR_ADD_MAC             = 2,
-        CHANGE_ADDR_DEL_MAC             = 4,
-        CHANGE_ADDR_RESET_MAC           = 8,
+        CHANGE_ADDR_READ_MAC            = 0,
+        CHANGE_ADDR_REPLACE_MAC         = 1,
+        CHANGE_ADDR_ADD_MAC             = 2,
+        CHANGE_ADDR_DEL_MAC             = 4,
+        CHANGE_ADDR_RESET_MAC           = 8,
 };
 enum qeth_ipa_addr_ops {
-        CHANGE_ADDR_READ_ADDR           = 0,
-        CHANGE_ADDR_ADD_ADDR            = 1,
-        CHANGE_ADDR_DEL_ADDR            = 2,
-        CHANGE_ADDR_FLUSH_ADDR_TABLE    = 4,
+        CHANGE_ADDR_READ_ADDR           = 0,
+        CHANGE_ADDR_ADD_ADDR            = 1,
+        CHANGE_ADDR_DEL_ADDR            = 2,
+        CHANGE_ADDR_FLUSH_ADDR_TABLE    = 4,
 };
 enum qeth_ipa_promisc_modes {
         SET_PROMISC_MODE_OFF            = 0,
@@ -407,15 +436,15 @@ struct qeth_ipacmd_hdr {
 struct qeth_ipa_cmd {
         struct qeth_ipacmd_hdr hdr;
         union {
-                struct qeth_ipacmd_setdelip4            setdelip4;
-                struct qeth_ipacmd_setdelip6            setdelip6;
+                struct qeth_ipacmd_setdelip4            setdelip4;
+                struct qeth_ipacmd_setdelip6            setdelip6;
                 struct qeth_ipacmd_setdelipm            setdelipm;
-                struct qeth_ipacmd_setassparms          setassparms;
-                struct qeth_ipacmd_layer2setdelmac      setdelmac;
-                struct qeth_ipacmd_layer2setdelvlan     setdelvlan;
-                struct qeth_create_destroy_address      create_destroy_addr;
-                struct qeth_ipacmd_setadpparms          setadapterparms;
-                struct qeth_set_routing                 setrtg;
+                struct qeth_ipacmd_setassparms          setassparms;
+                struct qeth_ipacmd_layer2setdelmac      setdelmac;
+                struct qeth_ipacmd_layer2setdelvlan     setdelvlan;
+                struct qeth_create_destroy_address      create_destroy_addr;
+                struct qeth_ipacmd_setadpparms          setadapterparms;
+                struct qeth_set_routing                 setrtg;
         } data;
 } __attribute__ ((packed));
 
@@ -433,6 +462,12 @@ enum qeth_ipa_arp_return_codes {
         QETH_IPA_ARP_RC_Q_NO_DATA    = 0x0008,
 };
 
+
+extern char *
+qeth_get_ipa_msg(enum qeth_ipa_return_codes rc);
+extern char *
+qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd);
+
 #define QETH_SETASS_BASE_LEN (sizeof(struct qeth_ipacmd_hdr) + \
                                sizeof(struct qeth_ipacmd_setassparms_hdr))
 #define QETH_IPA_ARP_DATA_POS(buffer) (buffer + IPA_PDU_HEADER_SIZE + \
@@ -521,7 +556,7 @@ extern unsigned char DM_ACT[];
 extern unsigned char IDX_ACTIVATE_READ[];
 extern unsigned char IDX_ACTIVATE_WRITE[];
 
-#define IDX_ACTIVATE_SIZE       0x22
+#define IDX_ACTIVATE_SIZE       0x22
 #define QETH_IDX_ACT_ISSUER_RM_TOKEN(buffer) (buffer+0x0c)
 #define QETH_IDX_NO_PORTNAME_REQUIRED(buffer) ((buffer)[0x0b]&0x80)
 #define QETH_IDX_ACT_FUNC_LEVEL(buffer) (buffer+0x10)
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index d518419cd0c6..65ffc21afc37 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -384,8 +384,6 @@ qeth_dev_route_store(struct qeth_card *card, struct qeth_routing_info *route,
                 route->type = PRIMARY_CONNECTOR;
         } else if (!strcmp(tmp, "secondary_connector")) {
                 route->type = SECONDARY_CONNECTOR;
-        } else if (!strcmp(tmp, "multicast_router")) {
-                route->type = MULTICAST_ROUTER;
         } else if (!strcmp(tmp, "primary_router")) {
                 route->type = PRIMARY_ROUTER;
         } else if (!strcmp(tmp, "secondary_router")) {
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 1f9554e08013..ddff40c4212c 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -118,97 +118,32 @@ _zfcp_hex_dump(char *addr, int count)
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_FSF
 
-static int zfcp_reqlist_init(struct zfcp_adapter *adapter)
+static int zfcp_reqlist_alloc(struct zfcp_adapter *adapter)
 {
-        int i;
+        int idx;
 
         adapter->req_list = kcalloc(REQUEST_LIST_SIZE, sizeof(struct list_head),
                                     GFP_KERNEL);
-
         if (!adapter->req_list)
                 return -ENOMEM;
 
-        for (i=0; i<REQUEST_LIST_SIZE; i++)
-                INIT_LIST_HEAD(&adapter->req_list[i]);
-
+        for (idx = 0; idx < REQUEST_LIST_SIZE; idx++)
+                INIT_LIST_HEAD(&adapter->req_list[idx]);
         return 0;
 }
 
 static void zfcp_reqlist_free(struct zfcp_adapter *adapter)
 {
-        struct zfcp_fsf_req *request, *tmp;
-        unsigned int i;
-
-        for (i=0; i<REQUEST_LIST_SIZE; i++) {
-                if (list_empty(&adapter->req_list[i]))
-                        continue;
-
-                list_for_each_entry_safe(request, tmp,
-                                         &adapter->req_list[i], list)
-                        list_del(&request->list);
-        }
-
         kfree(adapter->req_list);
 }
 
-void zfcp_reqlist_add(struct zfcp_adapter *adapter,
-                      struct zfcp_fsf_req *fsf_req)
-{
-        unsigned int i;
-
-        i = fsf_req->req_id % REQUEST_LIST_SIZE;
-        list_add_tail(&fsf_req->list, &adapter->req_list[i]);
-}
-
-void zfcp_reqlist_remove(struct zfcp_adapter *adapter, unsigned long req_id)
-{
-        struct zfcp_fsf_req *request, *tmp;
-        unsigned int i, counter;
-        u64 dbg_tmp[2];
-
-        i = req_id % REQUEST_LIST_SIZE;
-        BUG_ON(list_empty(&adapter->req_list[i]));
-
-        counter = 0;
-        list_for_each_entry_safe(request, tmp, &adapter->req_list[i], list) {
-                if (request->req_id == req_id) {
-                        dbg_tmp[0] = (u64) atomic_read(&adapter->reqs_active);
-                        dbg_tmp[1] = (u64) counter;
-                        debug_event(adapter->erp_dbf, 4, (void *) dbg_tmp, 16);
-                        list_del(&request->list);
-                        break;
-                }
-                counter++;
-        }
-}
-
-struct zfcp_fsf_req *zfcp_reqlist_ismember(struct zfcp_adapter *adapter,
-                                           unsigned long req_id)
-{
-        struct zfcp_fsf_req *request, *tmp;
-        unsigned int i;
-
-        /* 0 is reserved as an invalid req_id */
-        if (req_id == 0)
-                return NULL;
-
-        i = req_id % REQUEST_LIST_SIZE;
-
-        list_for_each_entry_safe(request, tmp, &adapter->req_list[i], list)
-                if (request->req_id == req_id)
-                        return request;
-
-        return NULL;
-}
-
 int zfcp_reqlist_isempty(struct zfcp_adapter *adapter)
 {
-        unsigned int i;
+        unsigned int idx;
 
-        for (i=0; i<REQUEST_LIST_SIZE; i++)
-                if (!list_empty(&adapter->req_list[i]))
+        for (idx = 0; idx < REQUEST_LIST_SIZE; idx++)
+                if (!list_empty(&adapter->req_list[idx]))
                         return 0;
-
         return 1;
 }
 
@@ -672,8 +607,7 @@ zfcp_sg_list_free(struct zfcp_sg_list *sg_list)
  * @sg_count: elements in array
  * Return: size of entire scatter-gather list
  */
-size_t
-zfcp_sg_size(struct scatterlist *sg, unsigned int sg_count)
+static size_t zfcp_sg_size(struct scatterlist *sg, unsigned int sg_count)
 {
         unsigned int i;
         struct scatterlist *p;
@@ -913,6 +847,8 @@ zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
         unit->sysfs_device.release = zfcp_sysfs_unit_release;
         dev_set_drvdata(&unit->sysfs_device, unit);
 
+        init_waitqueue_head(&unit->scsi_scan_wq);
+
         /* mark unit unusable as long as sysfs registration is not complete */
         atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status);
 
@@ -1038,8 +974,7 @@ zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)
                 mempool_destroy(adapter->pool.data_gid_pn);
 }
 
-void
-zfcp_dummy_release(struct device *dev)
+static void zfcp_dummy_release(struct device *dev)
 {
         return;
 }
@@ -1104,7 +1039,7 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
 
         /* initialize list of fsf requests */
         spin_lock_init(&adapter->req_list_lock);
-        retval = zfcp_reqlist_init(adapter);
+        retval = zfcp_reqlist_alloc(adapter);
         if (retval) {
                 ZFCP_LOG_INFO("request list initialization failed\n");
                 goto failed_low_mem_buffers;
@@ -1165,6 +1100,7 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
         zfcp_sysfs_adapter_remove_files(&adapter->ccw_device->dev);
  sysfs_failed:
         dev_set_drvdata(&ccw_device->dev, NULL);
+        zfcp_reqlist_free(adapter);
  failed_low_mem_buffers:
         zfcp_free_low_mem_buffers(adapter);
         if (qdio_free(ccw_device) != 0)
@@ -1398,7 +1334,7 @@ zfcp_nameserver_enqueue(struct zfcp_adapter *adapter)
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_FC
 
-void
+static void
 zfcp_fsf_incoming_els_rscn(struct zfcp_adapter *adapter,
                            struct fsf_status_read_buffer *status_buffer)
 {
@@ -1497,7 +1433,7 @@ zfcp_fsf_incoming_els_plogi(struct zfcp_adapter *adapter,
 
         if (!port || (port->wwpn != (*(wwn_t *) &els_plogi->serv_param.wwpn))) {
                 ZFCP_LOG_DEBUG("ignored incoming PLOGI for nonexisting port "
-                               "with d_id 0x%08x on adapter %s\n",
+                               "with d_id 0x%06x on adapter %s\n",
                                status_buffer->d_id,
                                zfcp_get_busid_by_adapter(adapter));
         } else {
@@ -1522,7 +1458,7 @@ zfcp_fsf_incoming_els_logo(struct zfcp_adapter *adapter,
 
         if (!port || (port->wwpn != els_logo->nport_wwpn)) {
                 ZFCP_LOG_DEBUG("ignored incoming LOGO for nonexisting port "
-                               "with d_id 0x%08x on adapter %s\n",
+                               "with d_id 0x%06x on adapter %s\n",
                                status_buffer->d_id,
                                zfcp_get_busid_by_adapter(adapter));
         } else {
@@ -1704,7 +1640,7 @@ static void zfcp_ns_gid_pn_handler(unsigned long data)
         /* looks like a valid d_id */
         port->d_id = ct_iu_resp->d_id & ZFCP_DID_MASK;
         atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &port->status);
-        ZFCP_LOG_DEBUG("adapter %s:  wwpn=0x%016Lx ---> d_id=0x%08x\n",
+        ZFCP_LOG_DEBUG("adapter %s:  wwpn=0x%016Lx ---> d_id=0x%06x\n",
                        zfcp_get_busid_by_port(port), port->wwpn, port->d_id);
         goto out;
 
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index d8191d115c14..5f3212440f68 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -478,7 +478,7 @@ static struct debug_view zfcp_hba_dbf_view = {
         NULL
 };
 
-void
+static void
 _zfcp_san_dbf_event_common_ct(const char *tag, struct zfcp_fsf_req *fsf_req,
                               u32 s_id, u32 d_id, void *buffer, int buflen)
 {
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 32933ed54b8a..22649639230b 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -637,6 +637,7 @@ do { \
 #define ZFCP_STATUS_UNIT_SHARED                 0x00000004
 #define ZFCP_STATUS_UNIT_READONLY               0x00000008
 #define ZFCP_STATUS_UNIT_REGISTERED             0x00000010
+#define ZFCP_STATUS_UNIT_SCSI_WORK_PENDING      0x00000020
 
 /* FSF request status (this does not have a common part) */
 #define ZFCP_STATUS_FSFREQ_NOT_INIT             0x00000000
@@ -980,6 +981,10 @@ struct zfcp_unit {
         struct scsi_device     *device;        /* scsi device struct pointer */
         struct zfcp_erp_action erp_action;     /* pending error recovery */
         atomic_t               erp_counter;
+        wait_queue_head_t      scsi_scan_wq;   /* can be used to wait until
+                                                  all scsi_scan_target
+                                                  requests have been
+                                                  completed. */
 };
 
 /* FSF request */
@@ -1085,6 +1090,42 @@ extern void _zfcp_hex_dump(char *, int);
 #define zfcp_get_busid_by_unit(unit) (zfcp_get_busid_by_port(unit->port))
 
 /*
+ * Helper functions for request ID management.
+ */
+static inline int zfcp_reqlist_hash(unsigned long req_id)
+{
+        return req_id % REQUEST_LIST_SIZE;
+}
+
+static inline void zfcp_reqlist_add(struct zfcp_adapter *adapter,
+                                    struct zfcp_fsf_req *fsf_req)
+{
+        unsigned int idx;
+
+        idx = zfcp_reqlist_hash(fsf_req->req_id);
+        list_add_tail(&fsf_req->list, &adapter->req_list[idx]);
+}
+
+static inline void zfcp_reqlist_remove(struct zfcp_adapter *adapter,
+                                       struct zfcp_fsf_req *fsf_req)
+{
+        list_del(&fsf_req->list);
+}
+
+static inline struct zfcp_fsf_req *
+zfcp_reqlist_find(struct zfcp_adapter *adapter, unsigned long req_id)
+{
+        struct zfcp_fsf_req *request;
+        unsigned int idx;
+
+        idx = zfcp_reqlist_hash(req_id);
+        list_for_each_entry(request, &adapter->req_list[idx], list)
+                if (request->req_id == req_id)
+                        return request;
+        return NULL;
+}
+
+/*
  *  functions needed for reference/usage counting
  */
 
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index c1f2d4b14c2b..aef66bc2b6ca 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -179,7 +179,7 @@ static void zfcp_close_fsf(struct zfcp_adapter *adapter)
 static void zfcp_fsf_request_timeout_handler(unsigned long data)
 {
         struct zfcp_adapter *adapter = (struct zfcp_adapter *) data;
-        zfcp_erp_adapter_reopen(adapter, 0);
+        zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED);
 }
 
 void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req, unsigned long timeout)
@@ -342,9 +342,9 @@ zfcp_erp_adisc(struct zfcp_port *port)
         adisc->wwpn = fc_host_port_name(adapter->scsi_host);
         adisc->wwnn = fc_host_node_name(adapter->scsi_host);
         adisc->nport_id = fc_host_port_id(adapter->scsi_host);
-        ZFCP_LOG_INFO("ADISC request from s_id 0x%08x to d_id 0x%08x "
+        ZFCP_LOG_INFO("ADISC request from s_id 0x%06x to d_id 0x%06x "
                       "(wwpn=0x%016Lx, wwnn=0x%016Lx, "
-                      "hard_nport_id=0x%08x, nport_id=0x%08x)\n",
+                      "hard_nport_id=0x%06x, nport_id=0x%06x)\n",
                       adisc->nport_id, send_els->d_id, (wwn_t) adisc->wwpn,
                       (wwn_t) adisc->wwnn, adisc->hard_nport_id,
                       adisc->nport_id);
@@ -352,7 +352,7 @@ zfcp_erp_adisc(struct zfcp_port *port)
         retval = zfcp_fsf_send_els(send_els);
         if (retval != 0) {
                 ZFCP_LOG_NORMAL("error: initiation of Send ELS failed for port "
-                                "0x%08x on adapter %s\n", send_els->d_id,
+                                "0x%06x on adapter %s\n", send_els->d_id,
                                 zfcp_get_busid_by_adapter(adapter));
                 goto freemem;
         }
@@ -398,7 +398,7 @@ zfcp_erp_adisc_handler(unsigned long data)
         if (send_els->status != 0) {
                 ZFCP_LOG_NORMAL("ELS request rejected/timed out, "
                                 "force physical port reopen "
-                                "(adapter %s, port d_id=0x%08x)\n",
+                                "(adapter %s, port d_id=0x%06x)\n",
                                 zfcp_get_busid_by_adapter(adapter), d_id);
                 debug_text_event(adapter->erp_dbf, 3, "forcreop");
                 if (zfcp_erp_port_forced_reopen(port, 0))
@@ -411,9 +411,9 @@ zfcp_erp_adisc_handler(unsigned long data)
 
         adisc = zfcp_sg_to_address(send_els->resp);
 
-        ZFCP_LOG_INFO("ADISC response from d_id 0x%08x to s_id "
-                      "0x%08x (wwpn=0x%016Lx, wwnn=0x%016Lx, "
-                      "hard_nport_id=0x%08x, nport_id=0x%08x)\n",
+        ZFCP_LOG_INFO("ADISC response from d_id 0x%06x to s_id "
+                      "0x%06x (wwpn=0x%016Lx, wwnn=0x%016Lx, "
+                      "hard_nport_id=0x%06x, nport_id=0x%06x)\n",
                       d_id, fc_host_port_id(adapter->scsi_host),
                       (wwn_t) adisc->wwpn, (wwn_t) adisc->wwnn,
                       adisc->hard_nport_id, adisc->nport_id);
@@ -847,8 +847,7 @@ zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
         if (erp_action->fsf_req) {
                 /* take lock to ensure that request is not deleted meanwhile */
                 spin_lock(&adapter->req_list_lock);
-                if (zfcp_reqlist_ismember(adapter,
-                                            erp_action->fsf_req->req_id)) {
+                if (zfcp_reqlist_find(adapter, erp_action->fsf_req->req_id)) {
                         /* fsf_req still exists */
                         debug_text_event(adapter->erp_dbf, 3, "a_ca_req");
                         debug_event(adapter->erp_dbf, 3, &erp_action->fsf_req,
@@ -1377,7 +1376,7 @@ zfcp_erp_port_failed(struct zfcp_port *port)
 
         if (atomic_test_mask(ZFCP_STATUS_PORT_WKA, &port->status))
                 ZFCP_LOG_NORMAL("port erp failed (adapter %s, "
-                                "port d_id=0x%08x)\n",
+                                "port d_id=0x%06x)\n",
                                 zfcp_get_busid_by_port(port), port->d_id);
         else
                 ZFCP_LOG_NORMAL("port erp failed (adapter %s, wwpn=0x%016Lx)\n",
@@ -1591,6 +1590,62 @@ zfcp_erp_strategy_check_adapter(struct zfcp_adapter *adapter, int result)
         return result;
 }
 
+struct zfcp_erp_add_work {
+        struct zfcp_unit  *unit;
+        struct work_struct work;
+};
+
+/**
+ * zfcp_erp_scsi_scan
+ * @data: pointer to a struct zfcp_erp_add_work
+ *
+ * Registers a logical unit with the SCSI stack.
+ */
+static void zfcp_erp_scsi_scan(struct work_struct *work)
+{
+        struct zfcp_erp_add_work *p =
+                container_of(work, struct zfcp_erp_add_work, work);
+        struct zfcp_unit *unit = p->unit;
+        struct fc_rport *rport = unit->port->rport;
+        scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,
+                         unit->scsi_lun, 0);
+        atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
+        wake_up(&unit->scsi_scan_wq);
+        zfcp_unit_put(unit);
+        kfree(p);
+}
+
+/**
+ * zfcp_erp_schedule_work
+ * @unit: pointer to unit which should be registered with SCSI stack
+ *
+ * Schedules work which registers a unit with the SCSI stack
+ */
+static void
+zfcp_erp_schedule_work(struct zfcp_unit *unit)
+{
+        struct zfcp_erp_add_work *p;
+
+        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        if (!p) {
+                ZFCP_LOG_NORMAL("error: Out of resources. Could not register "
+                                "the FCP-LUN 0x%Lx connected to "
+                                "the port with WWPN 0x%Lx connected to "
+                                "the adapter %s with the SCSI stack.\n",
+                                unit->fcp_lun,
+                                unit->port->wwpn,
+                                zfcp_get_busid_by_unit(unit));
+                return;
+        }
+
+        zfcp_unit_get(unit);
+        memset(p, 0, sizeof(*p));
+        atomic_set_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
+        INIT_WORK(&p->work, zfcp_erp_scsi_scan);
+        p->unit = unit;
+        schedule_work(&p->work);
+}
+
 /*
  * function:    
  *
@@ -2401,7 +2456,7 @@ zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *erp_action)
                                 retval = ZFCP_ERP_FAILED;
                         }
                 } else {
-                        ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%08x -> "
+                        ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%06x -> "
                                        "trying open\n", port->wwpn, port->d_id);
                         retval = zfcp_erp_port_strategy_open_port(erp_action);
                 }
@@ -2441,7 +2496,7 @@ zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *erp_action)
         case ZFCP_ERP_STEP_UNINITIALIZED:
         case ZFCP_ERP_STEP_PHYS_PORT_CLOSING:
         case ZFCP_ERP_STEP_PORT_CLOSING:
-                ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%08x -> trying open\n",
+                ZFCP_LOG_DEBUG("port 0x%016Lx has d_id=0x%06x -> trying open\n",
                                port->wwpn, port->d_id);
                 retval = zfcp_erp_port_strategy_open_port(erp_action);
                 break;
@@ -3092,9 +3147,9 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,
                     && port->rport) {
                         atomic_set_mask(ZFCP_STATUS_UNIT_REGISTERED,
                                         &unit->status);
-                        scsi_scan_target(&port->rport->dev, 0,
-                                         port->rport->scsi_target_id,
-                                         unit->scsi_lun, 0);
+                        if (atomic_test_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING,
+                                             &unit->status) == 0)
+                                zfcp_erp_schedule_work(unit);
                 }
                 zfcp_unit_put(unit);
                 break;
@@ -3121,7 +3176,7 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,
                                                 zfcp_get_busid_by_port(port),
                                                 port->wwpn);
                         else {
-                                scsi_flush_work(adapter->scsi_host);
+                                scsi_target_unblock(&port->rport->dev);
                                 port->rport->maxframe_size = port->maxframe_size;
                                 port->rport->supported_classes =
                                         port->supported_classes;
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 01386ac688a2..991d45667a44 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -184,10 +184,6 @@ extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *,
                                       unsigned long);
 extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *,
                                          struct scsi_cmnd *);
-extern void zfcp_reqlist_add(struct zfcp_adapter *, struct zfcp_fsf_req *);
-extern void zfcp_reqlist_remove(struct zfcp_adapter *, unsigned long);
-extern struct zfcp_fsf_req *zfcp_reqlist_ismember(struct zfcp_adapter *,
-                                                  unsigned long);
 extern int zfcp_reqlist_isempty(struct zfcp_adapter *);
 
 #endif  /* ZFCP_EXT_H */
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 4c0a59afd5c8..a8b02542ac2d 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -828,7 +828,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
 
         if (!port || (port->d_id != (status_buffer->d_id & ZFCP_DID_MASK))) {
                 ZFCP_LOG_NORMAL("bug: Reopen port indication received for"
-                                "nonexisting port with d_id 0x%08x on "
+                                "nonexisting port with d_id 0x%06x on "
                                 "adapter %s. Ignored.\n",
                                 status_buffer->d_id & ZFCP_DID_MASK,
                                 zfcp_get_busid_by_adapter(adapter));
@@ -853,7 +853,7 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
                                 &status_buffer->status_subtype, sizeof (u32));
                 ZFCP_LOG_NORMAL("bug: Undefined status subtype received "
                                 "for a reopen indication on port with "
-                                "d_id 0x%08x on the adapter %s. "
+                                "d_id 0x%06x on the adapter %s. "
                                 "Ignored. (debug info 0x%x)\n",
                                 status_buffer->d_id,
                                 zfcp_get_busid_by_adapter(adapter),
@@ -1156,7 +1156,7 @@ zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
         }
 
         ZFCP_LOG_DEBUG("Abort FCP Command request initiated "
-                       "(adapter%s, port d_id=0x%08x, "
+                       "(adapter%s, port d_id=0x%06x, "
                        "unit x%016Lx, old_req_id=0x%lx)\n",
                        zfcp_get_busid_by_adapter(adapter),
                        unit->port->d_id,
@@ -1554,7 +1554,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
 
         case FSF_ACCESS_DENIED:
                 ZFCP_LOG_NORMAL("access denied, cannot send generic service "
-                                "command (adapter %s, port d_id=0x%08x)\n",
+                                "command (adapter %s, port d_id=0x%06x)\n",
                                 zfcp_get_busid_by_port(port), port->d_id);
                 for (counter = 0; counter < 2; counter++) {
                         subtable = header->fsf_status_qual.halfword[counter * 2];
@@ -1576,7 +1576,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
 
         case FSF_GENERIC_COMMAND_REJECTED:
                 ZFCP_LOG_INFO("generic service command rejected "
-                              "(adapter %s, port d_id=0x%08x)\n",
+                              "(adapter %s, port d_id=0x%06x)\n",
                               zfcp_get_busid_by_port(port), port->d_id);
                 ZFCP_LOG_INFO("status qualifier:\n");
                 ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_INFO,
@@ -1602,7 +1602,7 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
 
         case FSF_PORT_BOXED:
                 ZFCP_LOG_INFO("port needs to be reopened "
-                              "(adapter %s, port d_id=0x%08x)\n",
+                              "(adapter %s, port d_id=0x%06x)\n",
                               zfcp_get_busid_by_port(port), port->d_id);
                 debug_text_event(adapter->erp_dbf, 2, "fsf_s_pboxed");
                 zfcp_erp_port_boxed(port);
@@ -1683,7 +1683,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
                                   NULL, &lock_flags, &fsf_req);
         if (ret < 0) {
                 ZFCP_LOG_INFO("error: creation of ELS request failed "
-                              "(adapter %s, port d_id: 0x%08x)\n",
+                              "(adapter %s, port d_id: 0x%06x)\n",
                               zfcp_get_busid_by_adapter(adapter), d_id);
                 goto failed_req;
         }
@@ -1708,7 +1708,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
                                                 ZFCP_MAX_SBALS_PER_ELS_REQ);
                 if (bytes <= 0) {
                         ZFCP_LOG_INFO("error: creation of ELS request failed "
-                                      "(adapter %s, port d_id: 0x%08x)\n",
+                                      "(adapter %s, port d_id: 0x%06x)\n",
                                       zfcp_get_busid_by_adapter(adapter), d_id);
                         if (bytes == 0) {
                                 ret = -ENOMEM;
@@ -1725,7 +1725,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
                                                 ZFCP_MAX_SBALS_PER_ELS_REQ);
                 if (bytes <= 0) {
                         ZFCP_LOG_INFO("error: creation of ELS request failed "
-                                      "(adapter %s, port d_id: 0x%08x)\n",
+                                      "(adapter %s, port d_id: 0x%06x)\n",
                                       zfcp_get_busid_by_adapter(adapter), d_id);
                         if (bytes == 0) {
                                 ret = -ENOMEM;
@@ -1739,7 +1739,7 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
                 /* reject request */
                 ZFCP_LOG_INFO("error: microcode does not support chained SBALs"
                               ", ELS request too big (adapter %s, "
-                              "port d_id: 0x%08x)\n",
+                              "port d_id: 0x%06x)\n",
                               zfcp_get_busid_by_adapter(adapter), d_id);
                 ret = -EOPNOTSUPP;
                 goto failed_send;
@@ -1760,13 +1760,13 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
         ret = zfcp_fsf_req_send(fsf_req);
         if (ret) {
                 ZFCP_LOG_DEBUG("error: initiation of ELS request failed "
-                               "(adapter %s, port d_id: 0x%08x)\n",
+                               "(adapter %s, port d_id: 0x%06x)\n",
                                zfcp_get_busid_by_adapter(adapter), d_id);
                 goto failed_send;
         }
 
         ZFCP_LOG_DEBUG("ELS request initiated (adapter %s, port d_id: "
-                       "0x%08x)\n", zfcp_get_busid_by_adapter(adapter), d_id);
+                       "0x%06x)\n", zfcp_get_busid_by_adapter(adapter), d_id);
         goto out;
 
  failed_send:
@@ -1859,7 +1859,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
         case FSF_ELS_COMMAND_REJECTED:
                 ZFCP_LOG_INFO("ELS has been rejected because command filter "
                               "prohibited sending "
-                              "(adapter: %s, port d_id: 0x%08x)\n",
+                              "(adapter: %s, port d_id: 0x%06x)\n",
                               zfcp_get_busid_by_adapter(adapter), d_id);
 
                 break;
@@ -1907,7 +1907,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
 
         case FSF_ACCESS_DENIED:
                 ZFCP_LOG_NORMAL("access denied, cannot send ELS command "
-                                "(adapter %s, port d_id=0x%08x)\n",
+                                "(adapter %s, port d_id=0x%06x)\n",
                                 zfcp_get_busid_by_adapter(adapter), d_id);
                 for (counter = 0; counter < 2; counter++) {
                         subtable = header->fsf_status_qual.halfword[counter * 2];
@@ -2070,7 +2070,7 @@ zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *fsf_req, int xchg_ok)
         ZFCP_LOG_NORMAL("The adapter %s reported the following characteristics:\n"
                         "WWNN 0x%016Lx, "
                         "WWPN 0x%016Lx, "
-                        "S_ID 0x%08x,\n"
+                        "S_ID 0x%06x,\n"
                         "adapter version 0x%x, "
                         "LIC version 0x%x, "
                         "FC link speed %d Gb/s\n",
@@ -3043,6 +3043,7 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
         queue_designator = &header->fsf_status_qual.fsf_queue_designator;
 
         atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
+                          ZFCP_STATUS_COMMON_ACCESS_BOXED |
                           ZFCP_STATUS_UNIT_SHARED |
                           ZFCP_STATUS_UNIT_READONLY,
                           &unit->status);
@@ -4645,23 +4646,22 @@ zfcp_fsf_req_create(struct zfcp_adapter *adapter, u32 fsf_cmd, int req_flags,
         fsf_req->adapter = adapter;
         fsf_req->fsf_command = fsf_cmd;
         INIT_LIST_HEAD(&fsf_req->list);
-        
-        /* this is serialized (we are holding req_queue-lock of adapter */
-        if (adapter->req_no == 0)
-                adapter->req_no++;
-        fsf_req->req_id = adapter->req_no++;
-
         init_timer(&fsf_req->timer);
-        zfcp_fsf_req_qtcb_init(fsf_req);
 
         /* initialize waitqueue which may be used to wait on 
            this request completion */
         init_waitqueue_head(&fsf_req->completion_wq);
 
         ret = zfcp_fsf_req_sbal_get(adapter, req_flags, lock_flags);
-        if(ret < 0) {
+        if (ret < 0)
                 goto failed_sbals;
-        }
+
+        /* this is serialized (we are holding req_queue-lock of adapter) */
+        if (adapter->req_no == 0)
+                adapter->req_no++;
+        fsf_req->req_id = adapter->req_no++;
+
+        zfcp_fsf_req_qtcb_init(fsf_req);
 
         /*
          * We hold queue_lock here. Check if QDIOUP is set and let request fail
@@ -4788,7 +4788,7 @@ static int zfcp_fsf_req_send(struct zfcp_fsf_req *fsf_req)
                 retval = -EIO;
                 del_timer(&fsf_req->timer);
                 spin_lock(&adapter->req_list_lock);
-                zfcp_reqlist_remove(adapter, fsf_req->req_id);
+                zfcp_reqlist_remove(adapter, fsf_req);
                 spin_unlock(&adapter->req_list_lock);
                 /* undo changes in request queue made for this request */
                 zfcp_qdio_zero_sbals(req_queue->buffer,
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 1e12a78e8edd..bdf5782b8a7a 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -222,7 +222,7 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter, unsigned int status,
                 * Since we have been using this adapter, it is save to assume
                 * that it is not failed but recoverable. The card seems to
                 * report link-up events by self-initiated queue shutdown.
-                * That is why we need to clear the the link-down flag
+                * That is why we need to clear the link-down flag
                 * which is set again in case we have missed by a mile.
                 */
                zfcp_erp_adapter_reopen(
@@ -283,10 +283,10 @@ zfcp_qdio_request_handler(struct ccw_device *ccw_device,
 }
 
 /**
- * zfcp_qdio_reqid_check - checks for valid reqids or unsolicited status
+ * zfcp_qdio_reqid_check - checks for valid reqids.
  */
-static int zfcp_qdio_reqid_check(struct zfcp_adapter *adapter, 
-                                 unsigned long req_id)
+static void zfcp_qdio_reqid_check(struct zfcp_adapter *adapter,
+                                  unsigned long req_id)
 {
         struct zfcp_fsf_req *fsf_req;
         unsigned long flags;
@@ -294,23 +294,22 @@ static int zfcp_qdio_reqid_check(struct zfcp_adapter *adapter,
         debug_long_event(adapter->erp_dbf, 4, req_id);
 
         spin_lock_irqsave(&adapter->req_list_lock, flags);
-        fsf_req = zfcp_reqlist_ismember(adapter, req_id);
+        fsf_req = zfcp_reqlist_find(adapter, req_id);
 
-        if (!fsf_req) {
-                spin_unlock_irqrestore(&adapter->req_list_lock, flags);
-                ZFCP_LOG_NORMAL("error: unknown request id (%ld).\n", req_id);
-                zfcp_erp_adapter_reopen(adapter, 0);
-                return -EINVAL;
-        }
+        if (!fsf_req)
+                /*
+                 * Unknown request means that we have potentially memory
+                 * corruption and must stop the machine immediatly.
+                 */
+                panic("error: unknown request id (%ld) on adapter %s.\n",
+                      req_id, zfcp_get_busid_by_adapter(adapter));
 
-        zfcp_reqlist_remove(adapter, req_id);
+        zfcp_reqlist_remove(adapter, fsf_req);
         atomic_dec(&adapter->reqs_active);
         spin_unlock_irqrestore(&adapter->req_list_lock, flags);
 
         /* finish the FSF request */
         zfcp_fsf_req_complete(fsf_req);
-
-        return 0;
 }
 
 /*
@@ -374,27 +373,9 @@ zfcp_qdio_response_handler(struct ccw_device *ccw_device,
 
                         /* look for QDIO request identifiers in SB */
                         buffere = &buffer->element[buffere_index];
-                        retval = zfcp_qdio_reqid_check(adapter,
-                                        (unsigned long) buffere->addr);
-
-                        if (retval) {
-                                ZFCP_LOG_NORMAL("bug: unexpected inbound "
-                                                "packet on adapter %s "
-                                                "(reqid=0x%lx, "
-                                                "first_element=%d, "
-                                                "elements_processed=%d)\n",
-                                                zfcp_get_busid_by_adapter(adapter),
-                                                (unsigned long) buffere->addr,
-                                                first_element,
-                                                elements_processed);
-                                ZFCP_LOG_NORMAL("hex dump of inbound buffer "
-                                                "at address %p "
-                                                "(buffer_index=%d, "
-                                                "buffere_index=%d)\n", buffer,
-                                                buffer_index, buffere_index);
-                                ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_NORMAL,
-                                              (char *) buffer, SBAL_SIZE);
-                        }
+                        zfcp_qdio_reqid_check(adapter,
+                                              (unsigned long) buffere->addr);
+
                         /*
                          * A single used SBALE per inbound SBALE has been
                          * implemented by QDIO so far. Hope they will
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 99db02062c3b..16e2d64658af 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -22,6 +22,7 @@
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_SCSI
 
 #include "zfcp_ext.h"
+#include <asm/atomic.h>
 
 static void zfcp_scsi_slave_destroy(struct scsi_device *sdp);
 static int zfcp_scsi_slave_alloc(struct scsi_device *sdp);
@@ -179,6 +180,10 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)
         struct zfcp_unit *unit = (struct zfcp_unit *) sdpnt->hostdata;
 
         if (unit) {
+                zfcp_erp_wait(unit->port->adapter);
+                wait_event(unit->scsi_scan_wq,
+                           atomic_test_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING,
+                                            &unit->status) == 0);
                 atomic_clear_mask(ZFCP_STATUS_UNIT_REGISTERED, &unit->status);
                 sdpnt->hostdata = NULL;
                 unit->device = NULL;
@@ -402,8 +407,8 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
 
         /* Check whether corresponding fsf_req is still pending */
         spin_lock(&adapter->req_list_lock);
-        fsf_req = zfcp_reqlist_ismember(adapter, (unsigned long)
-                                        scpnt->host_scribble);
+        fsf_req = zfcp_reqlist_find(adapter,
+                                    (unsigned long) scpnt->host_scribble);
         spin_unlock(&adapter->req_list_lock);
         if (!fsf_req) {
                 write_unlock_irqrestore(&adapter->abort_lock, flags);
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 8410587348f1..178155bf9db6 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -18,6 +18,7 @@
 #include <asm/ebus.h>
 #include <asm/spitfire.h>
 #include <asm/bbc.h>
+#include <asm/io.h>
 
 #include "bbc_i2c.h"
 
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index a39ee80c9715..4fab0c23814c 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -15,7 +15,6 @@
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/ioport.h>
@@ -157,7 +156,7 @@ static unsigned short get_pins(unsigned minor)
 #define BPP_ICR      0x18
 #define BPP_SIZE     0x1A
 
-/* BPP_CSR.  Bits of type RW1 are cleared with writting '1'. */
+/* BPP_CSR.  Bits of type RW1 are cleared with writing '1'. */
 #define P_DEV_ID_MASK   0xf0000000      /* R   */
 #define P_DEV_ID_ZEBRA  0x40000000
 #define P_DEV_ID_L64854 0xa0000000      /*      == NCR 89C100+89C105. Pity. */
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2d14a29effe4..3279a1b6501d 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -20,6 +20,7 @@
 #include <asm/ebus.h>                   /* EBus device                                  */
 #include <asm/oplib.h>                  /* OpenProm Library                     */
 #include <asm/uaccess.h>                /* put_/get_user                        */
+#include <asm/io.h>
 
 #include <asm/display7seg.h>
 
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index f2be2ead8742..8328acab47fd 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -30,6 +30,7 @@
 #include <asm/ebus.h>
 #include <asm/uaccess.h>
 #include <asm/envctrl.h>
+#include <asm/io.h>
 
 #define ENVCTRL_MINOR   162
 
diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index 94d185829119..18d18f1a114e 100644
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -19,7 +19,6 @@
 #include <linux/fcntl.h>
 #include <linux/poll.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/io.h>
 #include <asm/mostek.h>
 #include <asm/system.h>
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index c3135e2fbd5a..6afc7e5df0d4 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e62d23f65180..d28c14e23c32 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1757,6 +1757,14 @@ config SCSI_ESP_CORE
         tristate "ESP Scsi Driver Core"
         depends on SCSI
         select SCSI_SPI_ATTRS
+        help
+          This is a core driver for NCR53c9x based scsi chipsets,
+          also known as "ESP" for Emulex Scsi Processor or
+          Enhanced Scsi Processor.  This driver does not exist by
+          itself, there are front-end drivers which, when enabled,
+          select and enable this driver.  One example is SCSI_SUNESP.
+          These front-end drivers provide probing, DMA, and register
+          access support for the core driver.
 
 config SCSI_SUNESP
         tristate "Sparc ESP Scsi Driver"
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 33682ce96a5d..3009ad8c4073 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -387,12 +387,11 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
          *      Ok now init the communication subsystem
          */
 
-        dev->queues = kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
+        dev->queues = kzalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
         if (dev->queues == NULL) {
                 printk(KERN_ERR "Error could not allocate comm region.\n");
                 return NULL;
         }
-        memset(dev->queues, 0, sizeof(struct aac_queue_block));
 
         if (aac_comm_init(dev)<0){
                 kfree(dev->queues);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 5824a757a753..9aca57eda943 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1223,13 +1223,11 @@ int aac_check_health(struct aac_dev * aac)
                  * Warning: no sleep allowed while
                  * holding spinlock
                  */
-                hw_fib = kmalloc(sizeof(struct hw_fib), GFP_ATOMIC);
-                fib = kmalloc(sizeof(struct fib), GFP_ATOMIC);
+                hw_fib = kzalloc(sizeof(struct hw_fib), GFP_ATOMIC);
+                fib = kzalloc(sizeof(struct fib), GFP_ATOMIC);
                 if (fib && hw_fib) {
                         struct aac_aifcmd * aif;
 
-                        memset(hw_fib, 0, sizeof(struct hw_fib));
-                        memset(fib, 0, sizeof(struct fib));
                         fib->hw_fib_va = hw_fib;
                         fib->dev = aac;
                         aac_fib_init(fib);
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index 42c7dcda6d9b..fcd25f7d0bc6 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -248,16 +248,14 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                  * manage the linked lists.
                  */
                 if ((!dev->aif_thread)
-                 || (!(fib = kmalloc(sizeof(struct fib),GFP_ATOMIC))))
+                 || (!(fib = kzalloc(sizeof(struct fib),GFP_ATOMIC))))
                         return 1;
-                if (!(hw_fib = kmalloc(sizeof(struct hw_fib),GFP_ATOMIC))) {
+                if (!(hw_fib = kzalloc(sizeof(struct hw_fib),GFP_ATOMIC))) {
                         kfree (fib);
                         return 1;
                 }
-                memset(hw_fib, 0, sizeof(struct hw_fib));
                 memcpy(hw_fib, (struct hw_fib *)(((ptrdiff_t)(dev->regs.sa)) +
                   (index & ~0x00000002L)), sizeof(struct hw_fib));
-                memset(fib, 0, sizeof(struct fib));
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 0c71315cbf1a..291cd14f4e98 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -539,8 +539,10 @@ int _aac_rx_init(struct aac_dev *dev)
         }
 
         /* Failure to reset here is an option ... */
+        dev->a_ops.adapter_sync_cmd = rx_sync_cmd;
+        dev->a_ops.adapter_enable_int = aac_rx_disable_interrupt;
         dev->OIMR = status = rx_readb (dev, MUnit.OIMR);
-        if ((((status & 0xff) != 0xff) || reset_devices) &&
+        if ((((status & 0x0c) != 0x0c) || reset_devices) &&
           !aac_rx_restart_adapter(dev, 0))
                 ++restart;
         /*
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 9218f29314fa..ad9761b237dc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -47,7 +47,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 8d72bbae96ad..0bada0028aa0 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -966,7 +966,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
                               |  AHD_BUSFREEREV_BUG;
                 ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG;
 
-                /* If the user requested the the SLOWCRC bit to be set. */
+                /* If the user requested that the SLOWCRC bit to be set. */
                 if (aic79xx_slowcrc)
                         ahd->features |= AHD_AIC79XXB_SLOWCRC;
 
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 85ae5d836fa4..8fee7edc6eb3 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -64,7 +64,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile
index e6b70123940c..e78ce0fa44d2 100644
--- a/drivers/scsi/aic94xx/Makefile
+++ b/drivers/scsi/aic94xx/Makefile
@@ -6,7 +6,7 @@
 #
 # This file is licensed under GPLv2.
 #
-# This file is part of the the aic94xx driver.
+# This file is part of the aic94xx driver.
 #
 # The aic94xx driver is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 7e132c5bacf8..2836fe248df9 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -281,7 +281,6 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct arxescsi_info *info;
-        unsigned long resbase, reslen;
         void __iomem *base;
         int ret;
 
@@ -289,9 +288,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
-        reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
-        base = ioremap(resbase, reslen);
+        base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base) {
                 ret = -ENOMEM;
                 goto out_region;
@@ -300,7 +297,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         host = scsi_host_alloc(&arxescsi_template, sizeof(struct arxescsi_info));
         if (!host) {
                 ret = -ENOMEM;
-                goto out_unmap;
+                goto out_region;
         }
 
         info = (struct arxescsi_info *)host->hostdata;
@@ -337,8 +334,6 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         fas216_release(host);
  out_unregister:
         scsi_host_put(host);
- out_unmap:
-        iounmap(base);
  out_region:
         ecard_release_resources(ec);
  out:
@@ -348,13 +343,10 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 static void __devexit arxescsi_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
-        struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
 
         ecard_set_drvdata(ec, NULL);
         fas216_remove(host);
 
-        iounmap(info->base);
-
         fas216_release(host);
         scsi_host_put(host);
         ecard_release_resources(ec);
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 82add77ad131..68a64123af8f 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -401,7 +401,6 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct cumanascsi2_info *info;
-        unsigned long resbase, reslen;
         void __iomem *base;
         int ret;
 
@@ -409,9 +408,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
-        reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
-        base = ioremap(resbase, reslen);
+        base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base) {
                 ret = -ENOMEM;
                 goto out_region;
@@ -421,7 +418,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
                                sizeof(struct cumanascsi2_info));
         if (!host) {
                 ret = -ENOMEM;
-                goto out_unmap;
+                goto out_region;
         }
 
         ecard_set_drvdata(ec, host);
@@ -450,8 +447,8 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 
         ec->irqaddr     = info->base + CUMANASCSI2_STATUS;
         ec->irqmask     = STATUS_INT;
-        ec->irq_data    = info;
-        ec->ops         = &cumanascsi_2_ops;
+
+        ecard_setirq(ec, &cumanascsi_2_ops, info);
 
         ret = fas216_init(host);
         if (ret)
@@ -490,9 +487,6 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
  out_free:
         scsi_host_put(host);
 
- out_unmap:
-        iounmap(base);
-
  out_region:
         ecard_release_resources(ec);
 
@@ -512,8 +506,6 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec)
                 free_dma(info->info.scsi.dma);
         free_irq(ec->irq, info);
 
-        iounmap(info->base);
-
         fas216_release(host);
         scsi_host_put(host);
         ecard_release_resources(ec);
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index ed06a8c19ad6..bb2477b3fb0b 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -519,7 +519,6 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct eesoxscsi_info *info;
-        unsigned long resbase, reslen;
         void __iomem *base;
         int ret;
 
@@ -527,9 +526,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        resbase = ecard_resource_start(ec, ECARD_RES_IOCFAST);
-        reslen = ecard_resource_len(ec, ECARD_RES_IOCFAST);
-        base = ioremap(resbase, reslen);
+        base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!base) {
                 ret = -ENOMEM;
                 goto out_region;
@@ -539,7 +536,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
                                sizeof(struct eesoxscsi_info));
         if (!host) {
                 ret = -ENOMEM;
-                goto out_unmap;
+                goto out_region;
         }
 
         ecard_set_drvdata(ec, host);
@@ -569,8 +566,8 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
         ec->irqaddr     = base + EESOX_DMASTAT;
         ec->irqmask     = EESOX_STAT_INTR;
-        ec->irq_data    = info;
-        ec->ops         = &eesoxscsi_ops;
+
+        ecard_setirq(ec, &eesoxscsi_ops, info);
 
         device_create_file(&ec->dev, &dev_attr_bus_term);
 
@@ -612,9 +609,6 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         device_remove_file(&ec->dev, &dev_attr_bus_term);
         scsi_host_put(host);
 
- out_unmap:
-        iounmap(base);
-
  out_region:
         ecard_release_resources(ec);
 
@@ -636,8 +630,6 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
 
         device_remove_file(&ec->dev, &dev_attr_bus_term);
 
-        iounmap(info->base);
-
         fas216_release(host);
         scsi_host_put(host);
         ecard_release_resources(ec);
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 159047a34997..d9a546d1917c 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -313,7 +313,6 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct powertec_info *info;
-        unsigned long resbase, reslen;
         void __iomem *base;
         int ret;
 
@@ -321,9 +320,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto out;
 
-        resbase = ecard_resource_start(ec, ECARD_RES_IOCFAST);
-        reslen = ecard_resource_len(ec, ECARD_RES_IOCFAST);
-        base = ioremap(resbase, reslen);
+        base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!base) {
                 ret = -ENOMEM;
                 goto out_region;
@@ -333,7 +330,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
                                sizeof (struct powertec_info));
         if (!host) {
                 ret = -ENOMEM;
-                goto out_unmap;
+                goto out_region;
         }
 
         ecard_set_drvdata(ec, host);
@@ -361,8 +358,8 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
         ec->irqaddr     = base + POWERTEC_INTR_STATUS;
         ec->irqmask     = POWERTEC_INTR_BIT;
-        ec->irq_data    = info;
-        ec->ops         = &powertecscsi_ops;
+
+        ecard_setirq(ec, &powertecscsi_ops, info);
 
         device_create_file(&ec->dev, &dev_attr_bus_term);
 
@@ -404,9 +401,6 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         device_remove_file(&ec->dev, &dev_attr_bus_term);
         scsi_host_put(host);
 
- out_unmap:
-        iounmap(base);
-
  out_region:
         ecard_release_resources(ec);
 
@@ -428,8 +422,6 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec)
                 free_dma(info->info.scsi.dma);
         free_irq(ec->irq, info);
 
-        iounmap(info->base);
-
         fas216_release(host);
         scsi_host_put(host);
         ecard_release_resources(ec);
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 2a2cc6cf1182..2311019304c0 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -319,10 +319,9 @@ ch_readconfig(scsi_changer *ch)
         int     result,id,lun,i;
         u_int   elem;
 
-        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
+        buffer = kzalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer)
                 return -ENOMEM;
-        memset(buffer,0,512);
         
         memset(cmd,0,sizeof(cmd));
         cmd[0] = MODE_SENSE;
@@ -530,10 +529,9 @@ ch_set_voltag(scsi_changer *ch, u_int elem,
         u_char  *buffer;
         int result;
 
-        buffer = kmalloc(512, GFP_KERNEL);
+        buffer = kzalloc(512, GFP_KERNEL);
         if (!buffer)
                 return -ENOMEM;
-        memset(buffer,0,512);
 
         dprintk("%s %s voltag: 0x%x => \"%s\"\n",
                 clear     ? "clear"     : "set",
@@ -922,11 +920,10 @@ static int ch_probe(struct device *dev)
         if (sd->type != TYPE_MEDIUM_CHANGER)
                 return -ENODEV;
     
-        ch = kmalloc(sizeof(*ch), GFP_KERNEL);
+        ch = kzalloc(sizeof(*ch), GFP_KERNEL);
         if (NULL == ch)
                 return -ENOMEM;
 
-        memset(ch,0,sizeof(*ch));
         ch->minor = ch_devcount;
         sprintf(ch->name,"ch%d",ch->minor);
         mutex_init(&ch->lock);
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index a965ed3548d5..564ea90ed3a0 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -541,7 +541,7 @@ static struct ParameterData __devinitdata cfg_data[] = {
 
 
 /*
- * Safe settings. If set to zero the the BIOS/default values with
+ * Safe settings. If set to zero the BIOS/default values with
  * command line overrides will be used. If set to 1 then safe and
  * slow settings will be used.
  */
@@ -617,7 +617,7 @@ static void __devinit fix_settings(void)
 
 /*
  * Mapping from the eeprom delay index value (index into this array)
- * to the the number of actual seconds that the delay should be for.
+ * to the number of actual seconds that the delay should be for.
  */
 static char __devinitdata eeprom_index_to_delay_map[] = 
         { 1, 3, 5, 10, 16, 30, 60, 120 };
@@ -4136,7 +4136,7 @@ static void __devinit trms1040_write_all(struct NvRamType *eeprom, unsigned long
  * @io_port:    base I/O address
  * @addr:       offset into SEEPROM
  *
- * Returns the the byte read.
+ * Returns the byte read.
  **/
 static u8 __devinit trms1040_get_data(unsigned long io_port, u8 addr)
 {
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index f7b9dbd64a96..8c7d2bbf9b1a 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -55,7 +55,6 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
 #include <linux/sched.h>
 #include <linux/reboot.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/dma-mapping.h>
 
 #include <linux/timer.h>
@@ -1309,13 +1308,12 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba)
                 schedule_timeout_uninterruptible(1);
         } while (m == EMPTY_QUEUE);
 
-        status = kmalloc(4, GFP_KERNEL|ADDR32);
+        status = kzalloc(4, GFP_KERNEL|ADDR32);
         if(status == NULL) {
                 adpt_send_nop(pHba, m);
                 printk(KERN_ERR"IOP reset failed - no free memory.\n");
                 return -ENOMEM;
         }
-        memset(status,0,4);
 
         msg[0]=EIGHT_WORD_MSG_SIZE|SGL_OFFSET_0;
         msg[1]=I2O_CMD_ADAPTER_RESET<<24|HOST_TID<<12|ADAPTER_TID;
@@ -1505,21 +1503,19 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
                                         continue;
                                 }
                                 if( pHba->channel[bus_no].device[scsi_id] == NULL){
-                                        pDev =  kmalloc(sizeof(struct adpt_device),GFP_KERNEL);
+                                        pDev =  kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
                                         if(pDev == NULL) {
                                                 return -ENOMEM;
                                         }
                                         pHba->channel[bus_no].device[scsi_id] = pDev;
-                                        memset(pDev,0,sizeof(struct adpt_device));
                                 } else {
                                         for( pDev = pHba->channel[bus_no].device[scsi_id];      
                                                         pDev->next_lun; pDev = pDev->next_lun){
                                         }
-                                        pDev->next_lun = kmalloc(sizeof(struct adpt_device),GFP_KERNEL);
+                                        pDev->next_lun = kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
                                         if(pDev->next_lun == NULL) {
                                                 return -ENOMEM;
                                         }
-                                        memset(pDev->next_lun,0,sizeof(struct adpt_device));
                                         pDev = pDev->next_lun;
                                 }
                                 pDev->tid = tid;
@@ -1668,12 +1664,11 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg)
                 reply_size = REPLY_FRAME_SIZE;
         }
         reply_size *= 4;
-        reply = kmalloc(REPLY_FRAME_SIZE*4, GFP_KERNEL);
+        reply = kzalloc(REPLY_FRAME_SIZE*4, GFP_KERNEL);
         if(reply == NULL) {
                 printk(KERN_WARNING"%s: Could not allocate reply buffer\n",pHba->name);
                 return -ENOMEM;
         }
-        memset(reply,0,REPLY_FRAME_SIZE*4);
         sg_offset = (msg[0]>>4)&0xf;
         msg[2] = 0x40000000; // IOCTL context
         msg[3] = (u32)reply;
@@ -2445,7 +2440,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                 }
                                 pDev = pHba->channel[bus_no].device[scsi_id];   
                                 if( pDev == NULL){
-                                        pDev =  kmalloc(sizeof(struct adpt_device),GFP_KERNEL);
+                                        pDev =  kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
                                         if(pDev == NULL) {
                                                 return -ENOMEM;
                                         }
@@ -2454,12 +2449,11 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                         while (pDev->next_lun) {
                                                 pDev = pDev->next_lun;
                                         }
-                                        pDev = pDev->next_lun = kmalloc(sizeof(struct adpt_device),GFP_KERNEL);
+                                        pDev = pDev->next_lun = kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
                                         if(pDev == NULL) {
                                                 return -ENOMEM;
                                         }
                                 }
-                                memset(pDev,0,sizeof(struct adpt_device));
                                 pDev->tid = d->lct_data.tid;
                                 pDev->scsi_channel = bus_no;
                                 pDev->scsi_id = scsi_id;
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 6d223dd76440..8ba7dd09d01d 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -892,16 +892,16 @@ static int get_system_info(void)
         if (!rootdn)
                 return -ENOENT;
 
-        model = get_property(rootdn, "model", NULL);
-        id = get_property(rootdn, "system-id", NULL);
+        model = of_get_property(rootdn, "model", NULL);
+        id = of_get_property(rootdn, "system-id", NULL);
         if (model && id)
                 snprintf(system_id, sizeof(system_id), "%s-%s", model, id);
 
-        name = get_property(rootdn, "ibm,partition-name", NULL);
+        name = of_get_property(rootdn, "ibm,partition-name", NULL);
         if (name)
                 strncpy(partition_name, name, sizeof(partition_name));
 
-        num = get_property(rootdn, "ibm,partition-no", NULL);
+        num = of_get_property(rootdn, "ibm,partition-no", NULL);
         if (num)
                 partition_number = *num;
 
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index 0a533f398f52..d8700aaa6114 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -162,11 +162,11 @@ static void gather_partition_info(void)
                 return;
         }
 
-        ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);
+        ppartition_name = of_get_property(rootdn, "ibm,partition-name", NULL);
         if (ppartition_name)
                 strncpy(partition_name, ppartition_name,
                                 sizeof(partition_name));
-        p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);
+        p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL);
         if (p_number_ptr)
                 partition_number = *p_number_ptr;
         of_node_put(rootdn);
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 2b5b8a93bc10..8263f752809d 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -721,19 +721,23 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r
         return ide_stopped;
 }
 
+#ifdef CONFIG_IDE_PROC_FS
 static void idescsi_add_settings(ide_drive_t *drive)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
 
 /*
- *                      drive   setting name    read/write      ioctl   ioctl           data type       min     max     mul_factor      div_factor      data pointer            set function
+ *                      drive   setting name    read/write      data type       min     max     mul_factor      div_factor      data pointer            set function
  */
-        ide_add_setting(drive,  "bios_cyl",     SETTING_RW,     -1,     -1,             TYPE_INT,       0,      1023,   1,              1,              &drive->bios_cyl,       NULL);
-        ide_add_setting(drive,  "bios_head",    SETTING_RW,     -1,     -1,             TYPE_BYTE,      0,      255,    1,              1,              &drive->bios_head,      NULL);
-        ide_add_setting(drive,  "bios_sect",    SETTING_RW,     -1,     -1,             TYPE_BYTE,      0,      63,     1,              1,              &drive->bios_sect,      NULL);
-        ide_add_setting(drive,  "transform",    SETTING_RW,     -1,     -1,             TYPE_INT,       0,      3,      1,              1,              &scsi->transform,       NULL);
-        ide_add_setting(drive,  "log",          SETTING_RW,     -1,     -1,             TYPE_INT,       0,      1,      1,              1,              &scsi->log,             NULL);
+        ide_add_setting(drive,  "bios_cyl",     SETTING_RW,     TYPE_INT,       0,      1023,   1,              1,              &drive->bios_cyl,       NULL);
+        ide_add_setting(drive,  "bios_head",    SETTING_RW,     TYPE_BYTE,      0,      255,    1,              1,              &drive->bios_head,      NULL);
+        ide_add_setting(drive,  "bios_sect",    SETTING_RW,     TYPE_BYTE,      0,      63,     1,              1,              &drive->bios_sect,      NULL);
+        ide_add_setting(drive,  "transform",    SETTING_RW,     TYPE_INT,       0,      3,      1,              1,              &scsi->transform,       NULL);
+        ide_add_setting(drive,  "log",          SETTING_RW,     TYPE_INT,       0,      1,      1,              1,              &scsi->log,             NULL);
 }
+#else
+static inline void idescsi_add_settings(ide_drive_t *drive) { ; }
+#endif
 
 /*
  *      Driver initialization.
@@ -756,7 +760,7 @@ static void ide_scsi_remove(ide_drive_t *drive)
         struct ide_scsi_obj *scsi = scsihost_to_idescsi(scsihost);
         struct gendisk *g = scsi->disk;
 
-        ide_unregister_subdriver(drive, scsi->driver);
+        ide_proc_unregister_driver(drive, scsi->driver);
 
         ide_unregister_region(g);
 
@@ -770,13 +774,11 @@ static void ide_scsi_remove(ide_drive_t *drive)
 
 static int ide_scsi_probe(ide_drive_t *);
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_IDE_PROC_FS
 static ide_proc_entry_t idescsi_proc[] = {
         { "capacity", S_IFREG|S_IRUGO, proc_ide_read_capacity, NULL },
         { NULL, 0, NULL, NULL }
 };
-#else
-# define idescsi_proc   NULL
 #endif
 
 static ide_driver_t idescsi_driver = {
@@ -790,11 +792,13 @@ static ide_driver_t idescsi_driver = {
         .version                = IDESCSI_VERSION,
         .media                  = ide_scsi,
         .supports_dsc_overlap   = 0,
-        .proc                   = idescsi_proc,
         .do_request             = idescsi_do_request,
         .end_request            = idescsi_end_request,
         .error                  = idescsi_atapi_error,
         .abort                  = idescsi_atapi_abort,
+#ifdef CONFIG_IDE_PROC_FS
+        .proc                   = idescsi_proc,
+#endif
 };
 
 static int idescsi_ide_open(struct inode *inode, struct file *filp)
@@ -1153,7 +1157,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
         idescsi->host = host;
         idescsi->disk = g;
         g->private_data = &idescsi->driver;
-        ide_register_subdriver(drive, &idescsi_driver);
+        ide_proc_register_driver(drive, &idescsi_driver);
         err = 0;
         idescsi_setup(drive, idescsi);
         g->fops = &idescsi_ops;
@@ -1165,7 +1169,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
         }
         /* fall through on error */
         ide_unregister_region(g);
-        ide_unregister_subdriver(drive, &idescsi_driver);
+        ide_proc_unregister_driver(drive, &idescsi_driver);
 
         put_disk(g);
 out_host_put:
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 2c7b77e833f9..4baa79e68679 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -92,6 +92,7 @@ static unsigned int ipr_fastfail = 0;
 static unsigned int ipr_transop_timeout = 0;
 static unsigned int ipr_enable_cache = 1;
 static unsigned int ipr_debug = 0;
+static unsigned int ipr_dual_ioa_raid = 1;
 static DEFINE_SPINLOCK(ipr_driver_lock);
 
 /* This table describes the differences between DMA controller chips */
@@ -158,6 +159,8 @@ module_param_named(enable_cache, ipr_enable_cache, int, 0);
 MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)");
 module_param_named(debug, ipr_debug, int, 0);
 MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)");
+module_param_named(dual_ioa_raid, ipr_dual_ioa_raid, int, 0);
+MODULE_PARM_DESC(dual_ioa_raid, "Enable dual adapter RAID support. Set to 1 to enable. (default: 1)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(IPR_DRIVER_VERSION);
 
@@ -206,6 +209,8 @@ struct ipr_error_table_t ipr_error_table[] = {
         "8009: Impending cache battery pack failure"},
         {0x02040400, 0, 0,
         "34FF: Disk device format in progress"},
+        {0x02048000, 0, IPR_DEFAULT_LOG_LEVEL,
+        "9070: IOA requested reset"},
         {0x023F0000, 0, 0,
         "Synchronization required"},
         {0x024E0000, 0, 0,
@@ -951,6 +956,53 @@ static void ipr_process_ccn(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * strip_and_pad_whitespace - Strip and pad trailing whitespace.
+ * @i:          index into buffer
+ * @buf:                string to modify
+ *
+ * This function will strip all trailing whitespace, pad the end
+ * of the string with a single space, and NULL terminate the string.
+ *
+ * Return value:
+ *      new length of string
+ **/
+static int strip_and_pad_whitespace(int i, char *buf)
+{
+        while (i && buf[i] == ' ')
+                i--;
+        buf[i+1] = ' ';
+        buf[i+2] = '\0';
+        return i + 2;
+}
+
+/**
+ * ipr_log_vpd_compact - Log the passed extended VPD compactly.
+ * @prefix:             string to print at start of printk
+ * @hostrcb:    hostrcb pointer
+ * @vpd:                vendor/product id/sn struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_vpd_compact(char *prefix, struct ipr_hostrcb *hostrcb,
+                                struct ipr_vpd *vpd)
+{
+        char buffer[IPR_VENDOR_ID_LEN + IPR_PROD_ID_LEN + IPR_SERIAL_NUM_LEN + 3];
+        int i = 0;
+
+        memcpy(buffer, vpd->vpids.vendor_id, IPR_VENDOR_ID_LEN);
+        i = strip_and_pad_whitespace(IPR_VENDOR_ID_LEN - 1, buffer);
+
+        memcpy(&buffer[i], vpd->vpids.product_id, IPR_PROD_ID_LEN);
+        i = strip_and_pad_whitespace(i + IPR_PROD_ID_LEN - 1, buffer);
+
+        memcpy(&buffer[i], vpd->sn, IPR_SERIAL_NUM_LEN);
+        buffer[IPR_SERIAL_NUM_LEN + i] = '\0';
+
+        ipr_hcam_err(hostrcb, "%s VPID/SN: %s\n", prefix, buffer);
+}
+
+/**
  * ipr_log_vpd - Log the passed VPD to the error log.
  * @vpd:                vendor/product id/sn struct
  *
@@ -974,6 +1026,23 @@ static void ipr_log_vpd(struct ipr_vpd *vpd)
 }
 
 /**
+ * ipr_log_ext_vpd_compact - Log the passed extended VPD compactly.
+ * @prefix:             string to print at start of printk
+ * @hostrcb:    hostrcb pointer
+ * @vpd:                vendor/product id/sn/wwn struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_ext_vpd_compact(char *prefix, struct ipr_hostrcb *hostrcb,
+                                    struct ipr_ext_vpd *vpd)
+{
+        ipr_log_vpd_compact(prefix, hostrcb, &vpd->vpd);
+        ipr_hcam_err(hostrcb, "%s WWN: %08X%08X\n", prefix,
+                     be32_to_cpu(vpd->wwid[0]), be32_to_cpu(vpd->wwid[1]));
+}
+
+/**
  * ipr_log_ext_vpd - Log the passed extended VPD to the error log.
  * @vpd:                vendor/product id/sn/wwn struct
  *
@@ -1287,10 +1356,11 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
 
         error = &hostrcb->hcam.u.error.u.type_17_error;
         error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+        strstrip(error->failure_reason);
 
-        ipr_err("%s\n", error->failure_reason);
-        ipr_err("Remote Adapter VPD:\n");
-        ipr_log_ext_vpd(&error->vpd);
+        ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
+                     be32_to_cpu(hostrcb->hcam.u.error.prc));
+        ipr_log_ext_vpd_compact("Remote IOA", hostrcb, &error->vpd);
         ipr_log_hex_data(ioa_cfg, error->data,
                          be32_to_cpu(hostrcb->hcam.length) -
                          (offsetof(struct ipr_hostrcb_error, u) +
@@ -1312,10 +1382,11 @@ static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
 
         error = &hostrcb->hcam.u.error.u.type_07_error;
         error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+        strstrip(error->failure_reason);
 
-        ipr_err("%s\n", error->failure_reason);
-        ipr_err("Remote Adapter VPD:\n");
-        ipr_log_vpd(&error->vpd);
+        ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
+                     be32_to_cpu(hostrcb->hcam.u.error.prc));
+        ipr_log_vpd_compact("Remote IOA", hostrcb, &error->vpd);
         ipr_log_hex_data(ioa_cfg, error->data,
                          be32_to_cpu(hostrcb->hcam.length) -
                          (offsetof(struct ipr_hostrcb_error, u) +
@@ -1672,12 +1743,15 @@ static void ipr_process_error(struct ipr_cmnd *ipr_cmd)
         struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
         struct ipr_hostrcb *hostrcb = ipr_cmd->u.hostrcb;
         u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
+        u32 fd_ioasc = be32_to_cpu(hostrcb->hcam.u.error.failing_dev_ioasc);
 
         list_del(&hostrcb->queue);
         list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
 
         if (!ioasc) {
                 ipr_handle_log_data(ioa_cfg, hostrcb);
+                if (fd_ioasc == IPR_IOASC_NR_IOA_RESET_REQUIRED)
+                        ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_ABBREV);
         } else if (ioasc != IPR_IOASC_IOA_WAS_RESET) {
                 dev_err(&ioa_cfg->pdev->dev,
                         "Host RCB failed with IOASC: 0x%08X\n", ioasc);
@@ -2635,8 +2709,13 @@ static ssize_t ipr_store_diagnostics(struct class_device *class_dev,
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
         spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        while(ioa_cfg->in_reset_reload) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+                spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        }
+
         ioa_cfg->errors_logged = 0;
         ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NORMAL);
 
@@ -2958,6 +3037,11 @@ static int ipr_update_ioa_ucode(struct ipr_ioa_cfg *ioa_cfg,
         unsigned long lock_flags;
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        while(ioa_cfg->in_reset_reload) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+                spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        }
 
         if (ioa_cfg->ucode_sglist) {
                 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -4656,18 +4740,19 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg,
         struct scsi_cmnd *scsi_cmd = ipr_cmd->scsi_cmd;
         struct ipr_resource_entry *res = scsi_cmd->device->hostdata;
         u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
+        u32 masked_ioasc = ioasc & IPR_IOASC_IOASC_MASK;
 
         if (!res) {
                 ipr_scsi_eh_done(ipr_cmd);
                 return;
         }
 
-        if (!ipr_is_gscsi(res))
+        if (!ipr_is_gscsi(res) && masked_ioasc != IPR_IOASC_HW_DEV_BUS_STATUS)
                 ipr_gen_sense(ipr_cmd);
 
         ipr_dump_ioasa(ioa_cfg, ipr_cmd, res);
 
-        switch (ioasc & IPR_IOASC_IOASC_MASK) {
+        switch (masked_ioasc) {
         case IPR_IOASC_ABORTED_CMD_TERM_BY_HOST:
                 if (ipr_is_naca_model(res))
                         scsi_cmd->result |= (DID_ABORT << 16);
@@ -5363,6 +5448,7 @@ static int ipr_ioa_reset_done(struct ipr_cmnd *ipr_cmd)
                         ipr_send_hcam(ioa_cfg, IPR_HCAM_CDB_OP_CODE_CONFIG_CHANGE, hostrcb);
         }
 
+        scsi_report_bus_reset(ioa_cfg->host, IPR_VSET_BUS);
         dev_info(&ioa_cfg->pdev->dev, "IOA initialized.\n");
 
         ioa_cfg->reset_retries = 0;
@@ -5799,6 +5885,94 @@ static int ipr_ioafp_mode_sense_page28(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_ioafp_mode_select_page24 - Issue Mode Select to IOA
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function enables dual IOA RAID support if possible.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_ioafp_mode_select_page24(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct ipr_mode_pages *mode_pages = &ioa_cfg->vpd_cbs->mode_pages;
+        struct ipr_mode_page24 *mode_page;
+        int length;
+
+        ENTER;
+        mode_page = ipr_get_mode_page(mode_pages, 0x24,
+                                      sizeof(struct ipr_mode_page24));
+
+        if (mode_page)
+                mode_page->flags |= IPR_ENABLE_DUAL_IOA_AF;
+
+        length = mode_pages->hdr.length + 1;
+        mode_pages->hdr.length = 0;
+
+        ipr_build_mode_select(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE), 0x11,
+                              ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, mode_pages),
+                              length);
+
+        ipr_cmd->job_step = ipr_ioafp_mode_sense_page28;
+        ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
+
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
+ * ipr_reset_mode_sense_page24_failed - Handle failure of IOAFP mode sense
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function handles the failure of a Mode Sense to the IOAFP.
+ * Some adapters do not handle all mode pages.
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_mode_sense_page24_failed(struct ipr_cmnd *ipr_cmd)
+{
+        u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
+
+        if (ioasc == IPR_IOASC_IR_INVALID_REQ_TYPE_OR_PKT) {
+                ipr_cmd->job_step = ipr_ioafp_mode_sense_page28;
+                return IPR_RC_JOB_CONTINUE;
+        }
+
+        return ipr_reset_cmd_failed(ipr_cmd);
+}
+
+/**
+ * ipr_ioafp_mode_sense_page24 - Issue Page 24 Mode Sense to IOA
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function send a mode sense to the IOA to retrieve
+ * the IOA Advanced Function Control mode page.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_ioafp_mode_sense_page24(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+
+        ENTER;
+        ipr_build_mode_sense(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE),
+                             0x24, ioa_cfg->vpd_cbs_dma +
+                             offsetof(struct ipr_misc_cbs, mode_pages),
+                             sizeof(struct ipr_mode_pages));
+
+        ipr_cmd->job_step = ipr_ioafp_mode_select_page24;
+        ipr_cmd->job_step_failed = ipr_reset_mode_sense_page24_failed;
+
+        ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
+
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
  * ipr_init_res_table - Initialize the resource table
  * @ipr_cmd:    ipr command struct
  *
@@ -5866,7 +6040,10 @@ static int ipr_init_res_table(struct ipr_cmnd *ipr_cmd)
                 }
         }
 
-        ipr_cmd->job_step = ipr_ioafp_mode_sense_page28;
+        if (ioa_cfg->dual_raid && ipr_dual_ioa_raid)
+                ipr_cmd->job_step = ipr_ioafp_mode_sense_page24;
+        else
+                ipr_cmd->job_step = ipr_ioafp_mode_sense_page28;
 
         LEAVE;
         return IPR_RC_JOB_CONTINUE;
@@ -5888,8 +6065,11 @@ static int ipr_ioafp_query_ioa_cfg(struct ipr_cmnd *ipr_cmd)
         struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
         struct ipr_ioadl_desc *ioadl = ipr_cmd->ioadl;
         struct ipr_inquiry_page3 *ucode_vpd = &ioa_cfg->vpd_cbs->page3_data;
+        struct ipr_inquiry_cap *cap = &ioa_cfg->vpd_cbs->cap;
 
         ENTER;
+        if (cap->cap & IPR_CAP_DUAL_IOA_RAID)
+                ioa_cfg->dual_raid = 1;
         dev_info(&ioa_cfg->pdev->dev, "Adapter firmware version: %02X%02X%02X%02X\n",
                  ucode_vpd->major_release, ucode_vpd->card_type,
                  ucode_vpd->minor_release[0], ucode_vpd->minor_release[1]);
@@ -5973,6 +6153,37 @@ static int ipr_inquiry_page_supported(struct ipr_inquiry_page0 *page0, u8 page)
 }
 
 /**
+ * ipr_ioafp_cap_inquiry - Send a Page 0xD0 Inquiry to the adapter.
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function sends a Page 0xD0 inquiry to the adapter
+ * to retrieve adapter capabilities.
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_ioafp_cap_inquiry(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct ipr_inquiry_page0 *page0 = &ioa_cfg->vpd_cbs->page0_data;
+        struct ipr_inquiry_cap *cap = &ioa_cfg->vpd_cbs->cap;
+
+        ENTER;
+        ipr_cmd->job_step = ipr_ioafp_query_ioa_cfg;
+        memset(cap, 0, sizeof(*cap));
+
+        if (ipr_inquiry_page_supported(page0, 0xD0)) {
+                ipr_ioafp_inquiry(ipr_cmd, 1, 0xD0,
+                                  ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, cap),
+                                  sizeof(struct ipr_inquiry_cap));
+                return IPR_RC_JOB_RETURN;
+        }
+
+        LEAVE;
+        return IPR_RC_JOB_CONTINUE;
+}
+
+/**
  * ipr_ioafp_page3_inquiry - Send a Page 3 Inquiry to the adapter.
  * @ipr_cmd:    ipr command struct
  *
@@ -5992,7 +6203,7 @@ static int ipr_ioafp_page3_inquiry(struct ipr_cmnd *ipr_cmd)
         if (!ipr_inquiry_page_supported(page0, 1))
                 ioa_cfg->cache_state = CACHE_NONE;
 
-        ipr_cmd->job_step = ipr_ioafp_query_ioa_cfg;
+        ipr_cmd->job_step = ipr_ioafp_cap_inquiry;
 
         ipr_ioafp_inquiry(ipr_cmd, 1, 3,
                           ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, page3_data),
@@ -6278,6 +6489,7 @@ static void ipr_get_unit_check_buffer(struct ipr_ioa_cfg *ioa_cfg)
         struct ipr_hostrcb *hostrcb;
         struct ipr_uc_sdt sdt;
         int rc, length;
+        u32 ioasc;
 
         mailbox = readl(ioa_cfg->ioa_mailbox);
 
@@ -6310,9 +6522,13 @@ static void ipr_get_unit_check_buffer(struct ipr_ioa_cfg *ioa_cfg)
                                         (__be32 *)&hostrcb->hcam,
                                         min(length, (int)sizeof(hostrcb->hcam)) / sizeof(__be32));
 
-        if (!rc)
+        if (!rc) {
                 ipr_handle_log_data(ioa_cfg, hostrcb);
-        else
+                ioasc = be32_to_cpu(hostrcb->hcam.u.error.failing_dev_ioasc);
+                if (ioasc == IPR_IOASC_NR_IOA_RESET_REQUIRED &&
+                    ioa_cfg->sdt_state == GET_DUMP)
+                        ioa_cfg->sdt_state = WAIT_FOR_DUMP;
+        } else
                 ipr_unit_check_no_data(ioa_cfg);
 
         list_add_tail(&hostrcb->queue, &ioa_cfg->hostrcb_free_q);
@@ -6425,6 +6641,48 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_reset_slot_reset_done - Clear PCI reset to the adapter
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: This clears PCI reset to the adapter and delays two seconds.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
+{
+        ENTER;
+        pci_set_pcie_reset_state(ipr_cmd->ioa_cfg->pdev, pcie_deassert_reset);
+        ipr_cmd->job_step = ipr_reset_bist_done;
+        ipr_reset_start_timer(ipr_cmd, IPR_WAIT_FOR_BIST_TIMEOUT);
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
+ * ipr_reset_slot_reset - Reset the PCI slot of the adapter.
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: This asserts PCI reset to the adapter.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct pci_dev *pdev = ioa_cfg->pdev;
+
+        ENTER;
+        pci_block_user_cfg_access(pdev);
+        pci_set_pcie_reset_state(pdev, pcie_warm_reset);
+        ipr_cmd->job_step = ipr_reset_slot_reset_done;
+        ipr_reset_start_timer(ipr_cmd, IPR_PCI_RESET_TIMEOUT);
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
  * ipr_reset_allowed - Query whether or not IOA can be reset
  * @ioa_cfg:    ioa config struct
  *
@@ -6463,7 +6721,7 @@ static int ipr_reset_wait_to_start_bist(struct ipr_cmnd *ipr_cmd)
                 ipr_cmd->u.time_left -= IPR_CHECK_FOR_RESET_TIMEOUT;
                 ipr_reset_start_timer(ipr_cmd, IPR_CHECK_FOR_RESET_TIMEOUT);
         } else {
-                ipr_cmd->job_step = ipr_reset_start_bist;
+                ipr_cmd->job_step = ioa_cfg->reset;
                 rc = IPR_RC_JOB_CONTINUE;
         }
 
@@ -6496,7 +6754,7 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
                 writel(IPR_UPROCI_RESET_ALERT, ioa_cfg->regs.set_uproc_interrupt_reg);
                 ipr_cmd->job_step = ipr_reset_wait_to_start_bist;
         } else {
-                ipr_cmd->job_step = ipr_reset_start_bist;
+                ipr_cmd->job_step = ioa_cfg->reset;
         }
 
         ipr_cmd->u.time_left = IPR_WAIT_FOR_RESET_TIMEOUT;
@@ -6591,12 +6849,14 @@ static int ipr_reset_shutdown_ioa(struct ipr_cmnd *ipr_cmd)
                 ipr_cmd->ioarcb.cmd_pkt.cdb[0] = IPR_IOA_SHUTDOWN;
                 ipr_cmd->ioarcb.cmd_pkt.cdb[1] = shutdown_type;
 
-                if (shutdown_type == IPR_SHUTDOWN_ABBREV)
-                        timeout = IPR_ABBREV_SHUTDOWN_TIMEOUT;
+                if (shutdown_type == IPR_SHUTDOWN_NORMAL)
+                        timeout = IPR_SHUTDOWN_TIMEOUT;
                 else if (shutdown_type == IPR_SHUTDOWN_PREPARE_FOR_NORMAL)
                         timeout = IPR_INTERNAL_TIMEOUT;
+                else if (ioa_cfg->dual_raid && ipr_dual_ioa_raid)
+                        timeout = IPR_DUAL_IOA_ABBR_SHUTDOWN_TO;
                 else
-                        timeout = IPR_SHUTDOWN_TIMEOUT;
+                        timeout = IPR_ABBREV_SHUTDOWN_TIMEOUT;
 
                 ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, timeout);
 
@@ -6776,8 +7036,11 @@ static pci_ers_result_t ipr_pci_slot_reset(struct pci_dev *pdev)
         struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
-        _ipr_initiate_ioa_reset(ioa_cfg, ipr_reset_restore_cfg_space,
-                                         IPR_SHUTDOWN_NONE);
+        if (ioa_cfg->needs_warm_reset)
+                ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
+        else
+                _ipr_initiate_ioa_reset(ioa_cfg, ipr_reset_restore_cfg_space,
+                                        IPR_SHUTDOWN_NONE);
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
         return PCI_ERS_RESULT_RECOVERED;
 }
@@ -7226,7 +7489,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
         unsigned long ipr_regs_pci;
         void __iomem *ipr_regs;
         int rc = PCIBIOS_SUCCESSFUL;
-        volatile u32 mask, uproc;
+        volatile u32 mask, uproc, interrupts;
 
         ENTER;
 
@@ -7265,6 +7528,14 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
         else
                 ioa_cfg->transop_timeout = IPR_OPERATIONAL_TIMEOUT;
 
+        rc = pci_read_config_byte(pdev, PCI_REVISION_ID, &ioa_cfg->revid);
+
+        if (rc != PCIBIOS_SUCCESSFUL) {
+                dev_err(&pdev->dev, "Failed to read PCI revision ID\n");
+                rc = -EIO;
+                goto out_scsi_host_put;
+        }
+
         ipr_regs_pci = pci_resource_start(pdev, 0);
 
         rc = pci_request_regions(pdev, IPR_NAME);
@@ -7333,9 +7604,14 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
          * the card is in an unknown state and needs a hard reset
          */
         mask = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
+        interrupts = readl(ioa_cfg->regs.sense_interrupt_reg);
         uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg);
         if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT))
                 ioa_cfg->needs_hard_reset = 1;
+        if (interrupts & IPR_PCII_ERROR_INTERRUPTS)
+                ioa_cfg->needs_hard_reset = 1;
+        if (interrupts & IPR_PCII_IOA_UNIT_CHECKED)
+                ioa_cfg->ioa_unit_checked = 1;
 
         ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
         rc = request_irq(pdev->irq, ipr_isr, IRQF_SHARED, IPR_NAME, ioa_cfg);
@@ -7346,6 +7622,13 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
                 goto cleanup_nolog;
         }
 
+        if ((dev_id->driver_data & IPR_USE_PCI_WARM_RESET) ||
+            (dev_id->device == PCI_DEVICE_ID_IBM_OBSIDIAN_E && !ioa_cfg->revid)) {
+                ioa_cfg->needs_warm_reset = 1;
+                ioa_cfg->reset = ipr_reset_slot_reset;
+        } else
+                ioa_cfg->reset = ipr_reset_start_bist;
+
         spin_lock(&ipr_driver_lock);
         list_add_tail(&ioa_cfg->queue, &ipr_ioa_head);
         spin_unlock(&ipr_driver_lock);
@@ -7428,6 +7711,12 @@ static void __ipr_remove(struct pci_dev *pdev)
         ENTER;
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
+        while(ioa_cfg->in_reset_reload) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
+                wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+                spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
+        }
+
         ipr_initiate_ioa_bringdown(ioa_cfg, IPR_SHUTDOWN_NORMAL);
 
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
@@ -7551,6 +7840,12 @@ static void ipr_shutdown(struct pci_dev *pdev)
         unsigned long lock_flags = 0;
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        while(ioa_cfg->in_reset_reload) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+                spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        }
+
         ipr_initiate_ioa_bringdown(ioa_cfg, IPR_SHUTDOWN_NORMAL);
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
         wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
@@ -7577,19 +7872,22 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0,
               IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT},
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0,
               IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0, 0 },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0,
+              IPR_USE_LONG_TRANSOP_TIMEOUT },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0,
               IPR_USE_LONG_TRANSOP_TIMEOUT },
@@ -7597,7 +7895,7 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0,
-              IPR_USE_LONG_TRANSOP_TIMEOUT },
+              IPR_USE_LONG_TRANSOP_TIMEOUT | IPR_USE_PCI_WARM_RESET },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
@@ -7627,6 +7925,7 @@ static struct pci_driver ipr_driver = {
         .remove = ipr_remove,
         .shutdown = ipr_shutdown,
         .err_handler = &ipr_err_handler,
+        .dynids.use_driver_data = 1
 };
 
 /**
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index bc53d7cebe0a..d93156671e93 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -37,8 +37,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.3.2"
-#define IPR_DRIVER_DATE "(March 23, 2007)"
+#define IPR_DRIVER_VERSION "2.4.1"
+#define IPR_DRIVER_DATE "(April 24, 2007)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -91,6 +91,7 @@
  * IOASCs
  */
 #define IPR_IOASC_NR_INIT_CMD_REQUIRED          0x02040200
+#define IPR_IOASC_NR_IOA_RESET_REQUIRED         0x02048000
 #define IPR_IOASC_SYNC_REQUIRED                 0x023f0000
 #define IPR_IOASC_MED_DO_NOT_REALLOC            0x03110C00
 #define IPR_IOASC_HW_SEL_TIMEOUT                        0x04050000
@@ -111,6 +112,7 @@
 
 /* Driver data flags */
 #define IPR_USE_LONG_TRANSOP_TIMEOUT            0x00000001
+#define IPR_USE_PCI_WARM_RESET                  0x00000002
 
 #define IPR_DEFAULT_MAX_ERROR_DUMP                      984
 #define IPR_NUM_LOG_HCAMS                               2
@@ -179,6 +181,7 @@
 #define IPR_SHUTDOWN_TIMEOUT                    (ipr_fastfail ? 60 * HZ : 10 * 60 * HZ)
 #define IPR_VSET_RW_TIMEOUT                     (ipr_fastfail ? 30 * HZ : 2 * 60 * HZ)
 #define IPR_ABBREV_SHUTDOWN_TIMEOUT             (10 * HZ)
+#define IPR_DUAL_IOA_ABBR_SHUTDOWN_TO   (2 * 60 * HZ)
 #define IPR_DEVICE_RESET_TIMEOUT                (ipr_fastfail ? 10 * HZ : 30 * HZ)
 #define IPR_CANCEL_ALL_TIMEOUT          (ipr_fastfail ? 10 * HZ : 30 * HZ)
 #define IPR_ABORT_TASK_TIMEOUT          (ipr_fastfail ? 10 * HZ : 30 * HZ)
@@ -191,6 +194,7 @@
 #define IPR_WAIT_FOR_RESET_TIMEOUT              (2 * HZ)
 #define IPR_CHECK_FOR_RESET_TIMEOUT             (HZ / 10)
 #define IPR_WAIT_FOR_BIST_TIMEOUT               (2 * HZ)
+#define IPR_PCI_RESET_TIMEOUT                   (HZ / 2)
 #define IPR_DUMP_TIMEOUT                        (15 * HZ)
 
 /*
@@ -602,6 +606,12 @@ struct ipr_mode_page28 {
         struct ipr_dev_bus_entry bus[0];
 }__attribute__((packed));
 
+struct ipr_mode_page24 {
+        struct ipr_mode_page_hdr hdr;
+        u8 flags;
+#define IPR_ENABLE_DUAL_IOA_AF 0x80
+}__attribute__((packed));
+
 struct ipr_ioa_vpd {
         struct ipr_std_inq_data std_inq_data;
         u8 ascii_part_num[12];
@@ -624,6 +634,19 @@ struct ipr_inquiry_page3 {
         u8 patch_number[4];
 }__attribute__((packed));
 
+struct ipr_inquiry_cap {
+        u8 peri_qual_dev_type;
+        u8 page_code;
+        u8 reserved1;
+        u8 page_length;
+        u8 ascii_len;
+        u8 reserved2;
+        u8 sis_version[2];
+        u8 cap;
+#define IPR_CAP_DUAL_IOA_RAID           0x80
+        u8 reserved3[15];
+}__attribute__((packed));
+
 #define IPR_INQUIRY_PAGE0_ENTRIES 20
 struct ipr_inquiry_page0 {
         u8 peri_qual_dev_type;
@@ -962,6 +985,7 @@ struct ipr_misc_cbs {
         struct ipr_ioa_vpd ioa_vpd;
         struct ipr_inquiry_page0 page0_data;
         struct ipr_inquiry_page3 page3_data;
+        struct ipr_inquiry_cap cap;
         struct ipr_mode_pages mode_pages;
         struct ipr_supported_device supp_dev;
 };
@@ -1068,6 +1092,10 @@ struct ipr_ioa_cfg {
         u8 allow_cmds:1;
         u8 allow_ml_add_del:1;
         u8 needs_hard_reset:1;
+        u8 dual_raid:1;
+        u8 needs_warm_reset:1;
+
+        u8 revid;
 
         enum ipr_cache_state cache_state;
         u16 type; /* CCIN of the card */
@@ -1161,6 +1189,7 @@ struct ipr_ioa_cfg {
         struct pci_pool *ipr_cmd_pool;
 
         struct ipr_cmnd *reset_cmd;
+        int (*reset) (struct ipr_cmnd *);
 
         struct ata_host ata_host;
         char ipr_cmd_label[8];
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 897a5e2c55e4..b4b52694497c 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/kthread.h>
+
 #include "sas_internal.h"
 
 #include <scsi/scsi_host.h>
@@ -184,7 +186,7 @@ static int sas_queue_up(struct sas_task *task)
         list_add_tail(&task->list, &core->task_queue);
         core->task_queue_size += 1;
         spin_unlock_irqrestore(&core->task_queue_lock, flags);
-        up(&core->queue_thread_sema);
+        wake_up_process(core->queue_thread);
 
         return 0;
 }
@@ -819,7 +821,7 @@ static void sas_queue(struct sas_ha_struct *sas_ha)
         struct sas_internal *i = to_sas_internal(core->shost->transportt);
 
         spin_lock_irqsave(&core->task_queue_lock, flags);
-        while (!core->queue_thread_kill &&
+        while (!kthread_should_stop() &&
                !list_empty(&core->task_queue)) {
 
                 can_queue = sas_ha->lldd_queue_size - core->task_queue_size;
@@ -858,8 +860,6 @@ static void sas_queue(struct sas_ha_struct *sas_ha)
         spin_unlock_irqrestore(&core->task_queue_lock, flags);
 }
 
-static DECLARE_COMPLETION(queue_th_comp);
-
 /**
  * sas_queue_thread -- The Task Collector thread
  * @_sas_ha: pointer to struct sas_ha
@@ -867,40 +867,33 @@ static DECLARE_COMPLETION(queue_th_comp);
 static int sas_queue_thread(void *_sas_ha)
 {
         struct sas_ha_struct *sas_ha = _sas_ha;
-        struct scsi_core *core = &sas_ha->core;
 
-        daemonize("sas_queue_%d", core->shost->host_no);
         current->flags |= PF_NOFREEZE;
 
-        complete(&queue_th_comp);
-
         while (1) {
-                down_interruptible(&core->queue_thread_sema);
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule();
                 sas_queue(sas_ha);
-                if (core->queue_thread_kill)
+                if (kthread_should_stop())
                         break;
         }
 
-        complete(&queue_th_comp);
-
         return 0;
 }
 
 int sas_init_queue(struct sas_ha_struct *sas_ha)
 {
-        int res;
         struct scsi_core *core = &sas_ha->core;
 
         spin_lock_init(&core->task_queue_lock);
         core->task_queue_size = 0;
         INIT_LIST_HEAD(&core->task_queue);
-        init_MUTEX_LOCKED(&core->queue_thread_sema);
 
-        res = kernel_thread(sas_queue_thread, sas_ha, 0);
-        if (res >= 0)
-                wait_for_completion(&queue_th_comp);
-
-        return res < 0 ? res : 0;
+        core->queue_thread = kthread_run(sas_queue_thread, sas_ha,
+                                         "sas_queue_%d", core->shost->host_no);
+        if (IS_ERR(core->queue_thread))
+                return PTR_ERR(core->queue_thread);
+        return 0;
 }
 
 void sas_shutdown_queue(struct sas_ha_struct *sas_ha)
@@ -909,10 +902,7 @@ void sas_shutdown_queue(struct sas_ha_struct *sas_ha)
         struct scsi_core *core = &sas_ha->core;
         struct sas_task *task, *n;
 
-        init_completion(&queue_th_comp);
-        core->queue_thread_kill = 1;
-        up(&core->queue_thread_sema);
-        wait_for_completion(&queue_th_comp);
+        kthread_stop(core->queue_thread);
 
         if (!list_empty(&core->task_queue))
                 SAS_DPRINTK("HA: %llx: scsi core task queue is NOT empty!?\n",
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index a7de0bca5bdd..82e8f90c4617 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -27,10 +27,6 @@ struct lpfc_sli2_slim;
                                            requests */
 #define LPFC_MAX_NS_RETRY       3       /* Number of retry attempts to contact
                                            the NameServer  before giving up. */
-#define LPFC_DFT_HBA_Q_DEPTH    2048    /* max cmds per hba */
-#define LPFC_LC_HBA_Q_DEPTH     1024    /* max cmds per low cost hba */
-#define LPFC_LP101_HBA_Q_DEPTH  128     /* max cmds per low cost hba */
-
 #define LPFC_CMD_PER_LUN        3       /* max outstanding cmds per lun */
 #define LPFC_SG_SEG_CNT         64      /* sg element count per scsi cmnd */
 #define LPFC_IOCB_LIST_CNT      2250    /* list of IOCBs for fast-path usage. */
@@ -244,28 +240,23 @@ struct lpfc_hba {
 #define FC_FABRIC               0x100   /* We are fabric attached */
 #define FC_ESTABLISH_LINK       0x200   /* Reestablish Link */
 #define FC_RSCN_DISCOVERY       0x400   /* Authenticate all devices after RSCN*/
+#define FC_BLOCK_MGMT_IO        0x800   /* Don't allow mgmt mbx or iocb cmds */
 #define FC_LOADING              0x1000  /* HBA in process of loading drvr */
 #define FC_UNLOADING            0x2000  /* HBA in process of unloading drvr */
 #define FC_SCSI_SCAN_TMO        0x4000  /* scsi scan timer running */
 #define FC_ABORT_DISCOVERY      0x8000  /* we want to abort discovery */
 #define FC_NDISC_ACTIVE         0x10000 /* NPort discovery active */
 #define FC_BYPASSED_MODE        0x20000 /* NPort is in bypassed mode */
+#define FC_LOOPBACK_MODE        0x40000 /* NPort is in Loopback mode */
+                                        /* This flag is set while issuing */
+                                        /* INIT_LINK mailbox command */
+#define FC_IGNORE_ERATT         0x80000 /* intr handler should ignore ERATT */
 
         uint32_t fc_topology;   /* link topology, from LINK INIT */
 
         struct lpfc_stats fc_stat;
 
-        /* These are the head/tail pointers for the bind, plogi, adisc, unmap,
-         *  and map lists.  Their counters are immediately following.
-         */
-        struct list_head fc_plogi_list;
-        struct list_head fc_adisc_list;
-        struct list_head fc_reglogin_list;
-        struct list_head fc_prli_list;
-        struct list_head fc_nlpunmap_list;
-        struct list_head fc_nlpmap_list;
-        struct list_head fc_npr_list;
-        struct list_head fc_unused_list;
+        struct list_head fc_nodes;
 
         /* Keep counters for the number of entries in each list. */
         uint16_t fc_plogi_cnt;
@@ -387,13 +378,17 @@ struct lpfc_hba {
 
         mempool_t *mbox_mem_pool;
         mempool_t *nlp_mem_pool;
-        struct list_head freebufList;
-        struct list_head ctrspbuflist;
-        struct list_head rnidrspbuflist;
 
         struct fc_host_statistics link_stats;
 };
 
+static inline void
+lpfc_set_loopback_flag(struct lpfc_hba *phba) {
+        if (phba->cfg_topology == FLAGS_LOCAL_LB)
+                phba->fc_flag |= FC_LOOPBACK_MODE;
+        else
+                phba->fc_flag &= ~FC_LOOPBACK_MODE;
+}
 
 struct rnidrsp {
         void *buf;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index f247e786af99..95fe77e816f8 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -20,6 +20,7 @@
  *******************************************************************/
 
 #include <linux/ctype.h>
+#include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
@@ -213,6 +214,7 @@ lpfc_issue_lip(struct Scsi_Host *host)
         int mbxstatus = MBXERR_ERROR;
 
         if ((phba->fc_flag & FC_OFFLINE_MODE) ||
+            (phba->fc_flag & FC_BLOCK_MGMT_IO) ||
             (phba->hba_state != LPFC_HBA_READY))
                 return -EPERM;
 
@@ -235,6 +237,7 @@ lpfc_issue_lip(struct Scsi_Host *host)
                                                      phba->fc_ratov * 2);
         }
 
+        lpfc_set_loopback_flag(phba);
         if (mbxstatus == MBX_TIMEOUT)
                 pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
         else
@@ -247,19 +250,62 @@ lpfc_issue_lip(struct Scsi_Host *host)
 }
 
 static int
-lpfc_selective_reset(struct lpfc_hba *phba)
+lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)
 {
         struct completion online_compl;
+        struct lpfc_sli_ring *pring;
+        struct lpfc_sli *psli;
         int status = 0;
+        int cnt = 0;
+        int i;
 
         init_completion(&online_compl);
         lpfc_workq_post_event(phba, &status, &online_compl,
-                              LPFC_EVT_OFFLINE);
+                              LPFC_EVT_OFFLINE_PREP);
+        wait_for_completion(&online_compl);
+
+        if (status != 0)
+                return -EIO;
+
+        psli = &phba->sli;
+
+        for (i = 0; i < psli->num_rings; i++) {
+                pring = &psli->ring[i];
+                /* The linkdown event takes 30 seconds to timeout. */
+                while (pring->txcmplq_cnt) {
+                        msleep(10);
+                        if (cnt++ > 3000) {
+                                lpfc_printf_log(phba,
+                                        KERN_WARNING, LOG_INIT,
+                                        "%d:0466 Outstanding IO when "
+                                        "bringing Adapter offline\n",
+                                        phba->brd_no);
+                                break;
+                        }
+                }
+        }
+
+        init_completion(&online_compl);
+        lpfc_workq_post_event(phba, &status, &online_compl, type);
         wait_for_completion(&online_compl);
 
         if (status != 0)
                 return -EIO;
 
+        return 0;
+}
+
+static int
+lpfc_selective_reset(struct lpfc_hba *phba)
+{
+        struct completion online_compl;
+        int status = 0;
+
+        status = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);
+
+        if (status != 0)
+                return status;
+
         init_completion(&online_compl);
         lpfc_workq_post_event(phba, &status, &online_compl,
                               LPFC_EVT_ONLINE);
@@ -324,23 +370,19 @@ lpfc_board_mode_store(struct class_device *cdev, const char *buf, size_t count)
 
         init_completion(&online_compl);
 
-        if(strncmp(buf, "online", sizeof("online") - 1) == 0)
+        if(strncmp(buf, "online", sizeof("online") - 1) == 0) {
                 lpfc_workq_post_event(phba, &status, &online_compl,
                                       LPFC_EVT_ONLINE);
-        else if (strncmp(buf, "offline", sizeof("offline") - 1) == 0)
-                lpfc_workq_post_event(phba, &status, &online_compl,
-                                      LPFC_EVT_OFFLINE);
+                wait_for_completion(&online_compl);
+        } else if (strncmp(buf, "offline", sizeof("offline") - 1) == 0)
+                status = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);
         else if (strncmp(buf, "warm", sizeof("warm") - 1) == 0)
-                lpfc_workq_post_event(phba, &status, &online_compl,
-                                      LPFC_EVT_WARM_START);
-        else if (strncmp(buf, "error", sizeof("error") - 1) == 0)
-                lpfc_workq_post_event(phba, &status, &online_compl,
-                                      LPFC_EVT_KILL);
+                status = lpfc_do_offline(phba, LPFC_EVT_WARM_START);
+        else if (strncmp(buf, "error", sizeof("error") - 1) == 0)
+                status = lpfc_do_offline(phba, LPFC_EVT_KILL);
         else
                 return -EINVAL;
 
-        wait_for_completion(&online_compl);
-
         if (!status)
                 return strlen(buf);
         else
@@ -645,9 +687,7 @@ lpfc_soft_wwpn_store(struct class_device *cdev, const char *buf, size_t count)
         dev_printk(KERN_NOTICE, &phba->pcidev->dev,
                    "lpfc%d: Reinitializing to use soft_wwpn\n", phba->brd_no);
 
-        init_completion(&online_compl);
-        lpfc_workq_post_event(phba, &stat1, &online_compl, LPFC_EVT_OFFLINE);
-        wait_for_completion(&online_compl);
+        stat1 = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);
         if (stat1)
                 lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                         "%d:0463 lpfc_soft_wwpn attribute set failed to reinit "
@@ -789,6 +829,18 @@ lpfc_nodev_tmo_init(struct lpfc_hba *phba, int val)
         return -EINVAL;
 }
 
+static void
+lpfc_update_rport_devloss_tmo(struct lpfc_hba *phba)
+{
+        struct lpfc_nodelist  *ndlp;
+
+        spin_lock_irq(phba->host->host_lock);
+        list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp)
+                if (ndlp->rport)
+                        ndlp->rport->dev_loss_tmo = phba->cfg_devloss_tmo;
+        spin_unlock_irq(phba->host->host_lock);
+}
+
 static int
 lpfc_nodev_tmo_set(struct lpfc_hba *phba, int val)
 {
@@ -804,6 +856,7 @@ lpfc_nodev_tmo_set(struct lpfc_hba *phba, int val)
         if (val >= LPFC_MIN_DEVLOSS_TMO && val <= LPFC_MAX_DEVLOSS_TMO) {
                 phba->cfg_nodev_tmo = val;
                 phba->cfg_devloss_tmo = val;
+                lpfc_update_rport_devloss_tmo(phba);
                 return 0;
         }
 
@@ -839,6 +892,7 @@ lpfc_devloss_tmo_set(struct lpfc_hba *phba, int val)
                 phba->cfg_nodev_tmo = val;
                 phba->cfg_devloss_tmo = val;
                 phba->dev_loss_tmo_changed = 1;
+                lpfc_update_rport_devloss_tmo(phba);
                 return 0;
         }
 
@@ -931,9 +985,10 @@ LPFC_ATTR_RW(topology, 0, 0, 6, "Select Fibre Channel topology");
 #       1  = 1 Gigabaud
 #       2  = 2 Gigabaud
 #       4  = 4 Gigabaud
-# Value range is [0,4]. Default value is 0.
+#       8  = 8 Gigabaud
+# Value range is [0,8]. Default value is 0.
 */
-LPFC_ATTR_R(link_speed, 0, 0, 4, "Select link speed");
+LPFC_ATTR_R(link_speed, 0, 0, 8, "Select link speed");
 
 /*
 # lpfc_fcp_class:  Determines FC class to use for the FCP protocol.
@@ -958,7 +1013,7 @@ LPFC_ATTR_R(ack0, 0, 0, 1, "Enable ACK0 support");
 /*
 # lpfc_cr_delay & lpfc_cr_count: Default values for I/O colaesing
 # cr_delay (msec) or cr_count outstanding commands. cr_delay can take
-# value [0,63]. cr_count can take value [0,255]. Default value of cr_delay
+# value [0,63]. cr_count can take value [1,255]. Default value of cr_delay
 # is 0. Default value of cr_count is 1. The cr_count feature is disabled if
 # cr_delay is set to 0.
 */
@@ -1227,11 +1282,11 @@ sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
         struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata;
         int rc;
 
-        if (off > sizeof(MAILBOX_t))
+        if (off > MAILBOX_CMD_SIZE)
                 return -ERANGE;
 
-        if ((count + off) > sizeof(MAILBOX_t))
-                count = sizeof(MAILBOX_t) - off;
+        if ((count + off) > MAILBOX_CMD_SIZE)
+                count = MAILBOX_CMD_SIZE - off;
 
         if (off % 4 ||  count % 4 || (unsigned long)buf % 4)
                 return -EINVAL;
@@ -1307,6 +1362,12 @@ sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
                         return -EPERM;
                 }
 
+                if (phba->fc_flag & FC_BLOCK_MGMT_IO) {
+                        sysfs_mbox_idle(phba);
+                        spin_unlock_irq(host->host_lock);
+                        return  -EAGAIN;
+                }
+
                 if ((phba->fc_flag & FC_OFFLINE_MODE) ||
                     (!(phba->sli.sli_flag & LPFC_SLI2_ACTIVE))){
 
@@ -1326,6 +1387,11 @@ sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
                 }
 
                 if (rc != MBX_SUCCESS) {
+                        if (rc == MBX_TIMEOUT) {
+                                phba->sysfs_mbox.mbox->mbox_cmpl =
+                                        lpfc_sli_def_mbox_cmpl;
+                                phba->sysfs_mbox.mbox = NULL;
+                        }
                         sysfs_mbox_idle(phba);
                         spin_unlock_irq(host->host_lock);
                         return  (rc == MBX_TIMEOUT) ? -ETIME : -ENODEV;
@@ -1344,7 +1410,7 @@ sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
 
         phba->sysfs_mbox.offset = off + count;
 
-        if (phba->sysfs_mbox.offset == sizeof(MAILBOX_t))
+        if (phba->sysfs_mbox.offset == MAILBOX_CMD_SIZE)
                 sysfs_mbox_idle(phba);
 
         spin_unlock_irq(phba->host->host_lock);
@@ -1358,7 +1424,7 @@ static struct bin_attribute sysfs_mbox_attr = {
                 .mode = S_IRUSR | S_IWUSR,
                 .owner = THIS_MODULE,
         },
-        .size = sizeof(MAILBOX_t),
+        .size = MAILBOX_CMD_SIZE,
         .read = sysfs_mbox_read,
         .write = sysfs_mbox_write,
 };
@@ -1494,6 +1560,9 @@ lpfc_get_host_speed(struct Scsi_Host *shost)
                         case LA_4GHZ_LINK:
                                 fc_host_speed(shost) = FC_PORTSPEED_4GBIT;
                         break;
+                        case LA_8GHZ_LINK:
+                                fc_host_speed(shost) = FC_PORTSPEED_8GBIT;
+                        break;
                         default:
                                 fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
                         break;
@@ -1546,6 +1615,9 @@ lpfc_get_stats(struct Scsi_Host *shost)
         unsigned long seconds;
         int rc = 0;
 
+        if (phba->fc_flag & FC_BLOCK_MGMT_IO)
+                return NULL;
+
         pmboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
         if (!pmboxq)
                 return NULL;
@@ -1631,6 +1703,8 @@ lpfc_get_stats(struct Scsi_Host *shost)
         else
                 hs->seconds_since_last_reset = seconds - psli->stats_start;
 
+        mempool_free(pmboxq, phba->mbox_mem_pool);
+
         return hs;
 }
 
@@ -1644,6 +1718,9 @@ lpfc_reset_stats(struct Scsi_Host *shost)
         MAILBOX_t *pmb;
         int rc = 0;
 
+        if (phba->fc_flag & FC_BLOCK_MGMT_IO)
+                return;
+
         pmboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
         if (!pmboxq)
                 return;
@@ -1699,6 +1776,8 @@ lpfc_reset_stats(struct Scsi_Host *shost)
 
         psli->stats_start = get_seconds();
 
+        mempool_free(pmboxq, phba->mbox_mem_pool);
+
         return;
 }
 
@@ -1706,67 +1785,51 @@ lpfc_reset_stats(struct Scsi_Host *shost)
  * The LPFC driver treats linkdown handling as target loss events so there
  * are no sysfs handlers for link_down_tmo.
  */
-static void
-lpfc_get_starget_port_id(struct scsi_target *starget)
+
+static struct lpfc_nodelist *
+lpfc_get_node_by_target(struct scsi_target *starget)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
         struct lpfc_hba *phba = (struct lpfc_hba *) shost->hostdata;
-        uint32_t did = -1;
-        struct lpfc_nodelist *ndlp = NULL;
+        struct lpfc_nodelist *ndlp;
 
         spin_lock_irq(shost->host_lock);
-        /* Search the mapped list for this target ID */
-        list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
-                if (starget->id == ndlp->nlp_sid) {
-                        did = ndlp->nlp_DID;
-                        break;
+        /* Search for this, mapped, target ID */
+        list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
+                    starget->id == ndlp->nlp_sid) {
+                        spin_unlock_irq(shost->host_lock);
+                        return ndlp;
                 }
         }
         spin_unlock_irq(shost->host_lock);
+        return NULL;
+}
+
+static void
+lpfc_get_starget_port_id(struct scsi_target *starget)
+{
+        struct lpfc_nodelist *ndlp = lpfc_get_node_by_target(starget);
 
-        fc_starget_port_id(starget) = did;
+        fc_starget_port_id(starget) = ndlp ? ndlp->nlp_DID : -1;
 }
 
 static void
 lpfc_get_starget_node_name(struct scsi_target *starget)
 {
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct lpfc_hba *phba = (struct lpfc_hba *) shost->hostdata;
-        u64 node_name = 0;
-        struct lpfc_nodelist *ndlp = NULL;
-
-        spin_lock_irq(shost->host_lock);
-        /* Search the mapped list for this target ID */
-        list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
-                if (starget->id == ndlp->nlp_sid) {
-                        node_name = wwn_to_u64(ndlp->nlp_nodename.u.wwn);
-                        break;
-                }
-        }
-        spin_unlock_irq(shost->host_lock);
+        struct lpfc_nodelist *ndlp = lpfc_get_node_by_target(starget);
 
-        fc_starget_node_name(starget) = node_name;
+        fc_starget_node_name(starget) =
+                ndlp ? wwn_to_u64(ndlp->nlp_nodename.u.wwn) : 0;
 }
 
 static void
 lpfc_get_starget_port_name(struct scsi_target *starget)
 {
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct lpfc_hba *phba = (struct lpfc_hba *) shost->hostdata;
-        u64 port_name = 0;
-        struct lpfc_nodelist *ndlp = NULL;
-
-        spin_lock_irq(shost->host_lock);
-        /* Search the mapped list for this target ID */
-        list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
-                if (starget->id == ndlp->nlp_sid) {
-                        port_name = wwn_to_u64(ndlp->nlp_portname.u.wwn);
-                        break;
-                }
-        }
-        spin_unlock_irq(shost->host_lock);
+        struct lpfc_nodelist *ndlp = lpfc_get_node_by_target(starget);
 
-        fc_starget_port_name(starget) = port_name;
+        fc_starget_port_name(starget) =
+                ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0;
 }
 
 static void
@@ -1895,25 +1958,8 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
                         sizeof(struct fcp_rsp) +
                         (phba->cfg_sg_seg_cnt * sizeof(struct ulp_bde64));
 
-        switch (phba->pcidev->device) {
-        case PCI_DEVICE_ID_LP101:
-        case PCI_DEVICE_ID_BSMB:
-        case PCI_DEVICE_ID_ZSMB:
-                phba->cfg_hba_queue_depth = LPFC_LP101_HBA_Q_DEPTH;
-                break;
-        case PCI_DEVICE_ID_RFLY:
-        case PCI_DEVICE_ID_PFLY:
-        case PCI_DEVICE_ID_BMID:
-        case PCI_DEVICE_ID_ZMID:
-        case PCI_DEVICE_ID_TFLY:
-                phba->cfg_hba_queue_depth = LPFC_LC_HBA_Q_DEPTH;
-                break;
-        default:
-                phba->cfg_hba_queue_depth = LPFC_DFT_HBA_Q_DEPTH;
-        }
 
-        if (phba->cfg_hba_queue_depth > lpfc_hba_queue_depth)
-                lpfc_hba_queue_depth_init(phba, lpfc_hba_queue_depth);
+        lpfc_hba_queue_depth_init(phba, lpfc_hba_queue_depth);
 
         return;
 }
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 1251788ce2a3..b8c2a8862d8c 100644
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -18,6 +18,8 @@
  * included with this package.                                     *
  *******************************************************************/
 
+typedef int (*node_filter)(struct lpfc_nodelist *ndlp, void *param);
+
 struct fc_rport;
 void lpfc_dump_mem(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t);
 void lpfc_read_nv(struct lpfc_hba *, LPFC_MBOXQ_t *);
@@ -43,20 +45,24 @@ void lpfc_mbx_cmpl_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
-int lpfc_nlp_list(struct lpfc_hba *, struct lpfc_nodelist *, int);
+void lpfc_dequeue_node(struct lpfc_hba *, struct lpfc_nodelist *);
+void lpfc_nlp_set_state(struct lpfc_hba *, struct lpfc_nodelist *, int);
+void lpfc_drop_node(struct lpfc_hba *, struct lpfc_nodelist *);
 void lpfc_set_disctmo(struct lpfc_hba *);
 int lpfc_can_disctmo(struct lpfc_hba *);
 int lpfc_unreg_rpi(struct lpfc_hba *, struct lpfc_nodelist *);
 int lpfc_check_sli_ndlp(struct lpfc_hba *, struct lpfc_sli_ring *,
                     struct lpfc_iocbq *, struct lpfc_nodelist *);
-int lpfc_nlp_remove(struct lpfc_hba *, struct lpfc_nodelist *);
 void lpfc_nlp_init(struct lpfc_hba *, struct lpfc_nodelist *, uint32_t);
+struct lpfc_nodelist *lpfc_nlp_get(struct lpfc_nodelist *);
+int  lpfc_nlp_put(struct lpfc_nodelist *);
 struct lpfc_nodelist *lpfc_setup_disc_node(struct lpfc_hba *, uint32_t);
 void lpfc_disc_list_loopmap(struct lpfc_hba *);
 void lpfc_disc_start(struct lpfc_hba *);
 void lpfc_disc_flush_list(struct lpfc_hba *);
 void lpfc_disc_timeout(unsigned long);
 
+struct lpfc_nodelist *__lpfc_findnode_rpi(struct lpfc_hba * phba, uint16_t rpi);
 struct lpfc_nodelist *lpfc_findnode_rpi(struct lpfc_hba * phba, uint16_t rpi);
 
 int lpfc_workq_post_event(struct lpfc_hba *, void *, void *, uint32_t);
@@ -66,8 +72,7 @@ int lpfc_disc_state_machine(struct lpfc_hba *, struct lpfc_nodelist *, void *,
 
 int lpfc_check_sparm(struct lpfc_hba *, struct lpfc_nodelist *,
                      struct serv_parm *, uint32_t);
-int lpfc_els_abort(struct lpfc_hba *, struct lpfc_nodelist * ndlp,
-                        int);
+int lpfc_els_abort(struct lpfc_hba *, struct lpfc_nodelist * ndlp);
 int lpfc_els_abort_flogi(struct lpfc_hba *);
 int lpfc_initial_flogi(struct lpfc_hba *);
 int lpfc_issue_els_plogi(struct lpfc_hba *, uint32_t, uint8_t);
@@ -113,7 +118,10 @@ void lpfc_hba_init(struct lpfc_hba *, uint32_t *);
 int lpfc_post_buffer(struct lpfc_hba *, struct lpfc_sli_ring *, int, int);
 void lpfc_decode_firmware_rev(struct lpfc_hba *, char *, int);
 int lpfc_online(struct lpfc_hba *);
-int lpfc_offline(struct lpfc_hba *);
+void lpfc_block_mgmt_io(struct lpfc_hba *);
+void lpfc_unblock_mgmt_io(struct lpfc_hba *);
+void lpfc_offline_prep(struct lpfc_hba *);
+void lpfc_offline(struct lpfc_hba *);
 
 int lpfc_sli_setup(struct lpfc_hba *);
 int lpfc_sli_queue_setup(struct lpfc_hba *);
@@ -162,8 +170,8 @@ int lpfc_sli_ringpostbuf_put(struct lpfc_hba *, struct lpfc_sli_ring *,
 struct lpfc_dmabuf *lpfc_sli_ringpostbuf_get(struct lpfc_hba *,
                                              struct lpfc_sli_ring *,
                                              dma_addr_t);
-int lpfc_sli_issue_abort_iotag32(struct lpfc_hba *, struct lpfc_sli_ring *,
-                                 struct lpfc_iocbq *);
+int lpfc_sli_issue_abort_iotag(struct lpfc_hba *, struct lpfc_sli_ring *,
+                               struct lpfc_iocbq *);
 int lpfc_sli_sum_iocb(struct lpfc_hba *, struct lpfc_sli_ring *, uint16_t,
                           uint64_t, lpfc_ctx_cmd);
 int lpfc_sli_abort_iocb(struct lpfc_hba *, struct lpfc_sli_ring *, uint16_t,
@@ -172,9 +180,8 @@ int lpfc_sli_abort_iocb(struct lpfc_hba *, struct lpfc_sli_ring *, uint16_t,
 void lpfc_mbox_timeout(unsigned long);
 void lpfc_mbox_timeout_handler(struct lpfc_hba *);
 
-struct lpfc_nodelist *lpfc_findnode_did(struct lpfc_hba *, uint32_t, uint32_t);
-struct lpfc_nodelist *lpfc_findnode_wwpn(struct lpfc_hba *, uint32_t,
-                                        struct lpfc_name *);
+struct lpfc_nodelist *lpfc_findnode_did(struct lpfc_hba *, uint32_t);
+struct lpfc_nodelist *lpfc_findnode_wwpn(struct lpfc_hba *, struct lpfc_name *);
 
 int lpfc_sli_issue_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq,
                          uint32_t timeout);
@@ -193,6 +200,9 @@ void lpfc_mbuf_free(struct lpfc_hba *, void *, dma_addr_t);
 
 /* Function prototypes. */
 const char* lpfc_info(struct Scsi_Host *);
+void lpfc_scan_start(struct Scsi_Host *);
+int lpfc_scan_finished(struct Scsi_Host *, unsigned long);
+
 void lpfc_get_cfgparam(struct lpfc_hba *);
 int lpfc_alloc_sysfs_attr(struct lpfc_hba *);
 void lpfc_free_sysfs_attr(struct lpfc_hba *);
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index a51a41b7f15d..34a9e3bb2614 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -334,21 +334,22 @@ lpfc_ns_rsp(struct lpfc_hba * phba, struct lpfc_dmabuf * mp, uint32_t Size)
 
         lpfc_set_disctmo(phba);
 
-        Cnt = Size  > FCELSSIZE ? FCELSSIZE : Size;
 
         list_add_tail(&head, &mp->list);
         list_for_each_entry_safe(mp, next_mp, &head, list) {
                 mlast = mp;
 
+                Cnt = Size  > FCELSSIZE ? FCELSSIZE : Size;
+
                 Size -= Cnt;
 
-                if (!ctptr)
+                if (!ctptr) {
                         ctptr = (uint32_t *) mlast->virt;
-                else
+                } else
                         Cnt -= 16;      /* subtract length of CT header */
 
                 /* Loop through entire NameServer list of DIDs */
-                while (Cnt) {
+                while (Cnt >= sizeof (uint32_t)) {
 
                         /* Get next DID from NameServer List */
                         CTentry = *ctptr++;
@@ -442,10 +443,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 if (phba->fc_ns_retry < LPFC_MAX_NS_RETRY) {
                         phba->fc_ns_retry++;
                         /* CT command is being retried */
-                        ndlp =
-                            lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED,
-                                              NameServer_DID);
-                        if (ndlp) {
+                        ndlp = lpfc_findnode_did(phba, NameServer_DID);
+                        if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                                 if (lpfc_ns_cmd(phba, ndlp, SLI_CTNS_GID_FT) ==
                                     0) {
                                         goto out;
@@ -729,7 +728,7 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba * phba,
         uint16_t fdmi_cmd = CTcmd->CommandResponse.bits.CmdRsp;
         uint16_t fdmi_rsp = CTrsp->CommandResponse.bits.CmdRsp;
 
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID);
+        ndlp = lpfc_findnode_did(phba, FDMI_DID);
         if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) {
                 /* FDMI rsp failed */
                 lpfc_printf_log(phba,
@@ -1039,6 +1038,9 @@ lpfc_fdmi_cmd(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, int cmdcode)
                                 case LA_4GHZ_LINK:
                                         ae->un.PortSpeed = HBA_PORTSPEED_4GBIT;
                                 break;
+                                case LA_8GHZ_LINK:
+                                        ae->un.PortSpeed = HBA_PORTSPEED_8GBIT;
+                                break;
                                 default:
                                         ae->un.PortSpeed =
                                                 HBA_PORTSPEED_UNKNOWN;
@@ -1161,7 +1163,7 @@ lpfc_fdmi_tmo_handler(struct lpfc_hba *phba)
 {
         struct lpfc_nodelist *ndlp;
 
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, FDMI_DID);
+        ndlp = lpfc_findnode_did(phba, FDMI_DID);
         if (ndlp) {
                 if (init_utsname()->nodename[0] != '\0') {
                         lpfc_fdmi_cmd(phba, ndlp, SLI_MGMT_DHBA);
diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
index 9766f909c9c6..498059f3f7f4 100644
--- a/drivers/scsi/lpfc/lpfc_disc.h
+++ b/drivers/scsi/lpfc/lpfc_disc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -31,6 +31,7 @@
 /* worker thread events */
 enum lpfc_work_type {
         LPFC_EVT_ONLINE,
+        LPFC_EVT_OFFLINE_PREP,
         LPFC_EVT_OFFLINE,
         LPFC_EVT_WARM_START,
         LPFC_EVT_KILL,
@@ -68,7 +69,6 @@ struct lpfc_nodelist {
         uint16_t        nlp_maxframe;           /* Max RCV frame size */
         uint8_t         nlp_class_sup;          /* Supported Classes */
         uint8_t         nlp_retry;              /* used for ELS retries */
-        uint8_t         nlp_disc_refcnt;        /* used for DSM */
         uint8_t         nlp_fcp_info;           /* class info, bits 0-3 */
 #define NLP_FCP_2_DEVICE   0x10                 /* FCP-2 device */
 
@@ -79,20 +79,10 @@ struct lpfc_nodelist {
         struct lpfc_work_evt els_retry_evt;
         unsigned long last_ramp_up_time;        /* jiffy of last ramp up */
         unsigned long last_q_full_time;         /* jiffy of last queue full */
+        struct kref     kref;
 };
 
 /* Defines for nlp_flag (uint32) */
-#define NLP_NO_LIST        0x0          /* Indicates immediately free node */
-#define NLP_UNUSED_LIST    0x1          /* Flg to indicate node will be freed */
-#define NLP_PLOGI_LIST     0x2          /* Flg to indicate sent PLOGI */
-#define NLP_ADISC_LIST     0x3          /* Flg to indicate sent ADISC */
-#define NLP_REGLOGIN_LIST  0x4          /* Flg to indicate sent REG_LOGIN */
-#define NLP_PRLI_LIST      0x5          /* Flg to indicate sent PRLI */
-#define NLP_UNMAPPED_LIST  0x6          /* Node is now unmapped */
-#define NLP_MAPPED_LIST    0x7          /* Node is now mapped */
-#define NLP_NPR_LIST       0x8          /* Node is in NPort Recovery state */
-#define NLP_JUST_DQ        0x9          /* just deque ndlp in lpfc_nlp_list */
-#define NLP_LIST_MASK      0xf          /* mask to see what list node is on */
 #define NLP_PLOGI_SND      0x20         /* sent PLOGI request for this entry */
 #define NLP_PRLI_SND       0x40         /* sent PRLI request for this entry */
 #define NLP_ADISC_SND      0x80         /* sent ADISC request for this entry */
@@ -108,20 +98,8 @@ struct lpfc_nodelist {
                                            ACC */
 #define NLP_NPR_ADISC      0x2000000    /* Issue ADISC when dq'ed from
                                            NPR list */
-#define NLP_DELAY_REMOVE   0x4000000    /* Defer removal till end of DSM */
 #define NLP_NODEV_REMOVE   0x8000000    /* Defer removal till discovery ends */
 
-/* Defines for list searchs */
-#define NLP_SEARCH_MAPPED    0x1        /* search mapped */
-#define NLP_SEARCH_UNMAPPED  0x2        /* search unmapped */
-#define NLP_SEARCH_PLOGI     0x4        /* search plogi */
-#define NLP_SEARCH_ADISC     0x8        /* search adisc */
-#define NLP_SEARCH_REGLOGIN  0x10       /* search reglogin */
-#define NLP_SEARCH_PRLI      0x20       /* search prli */
-#define NLP_SEARCH_NPR       0x40       /* search npr */
-#define NLP_SEARCH_UNUSED    0x80       /* search mapped */
-#define NLP_SEARCH_ALL       0xff       /* search all lists */
-
 /* There are 4 different double linked lists nodelist entries can reside on.
  * The Port Login (PLOGI) list and Address Discovery (ADISC) list are used
  * when Link Up discovery or Registered State Change Notification (RSCN)
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index a5f33a0dd4e7..638b3cd677bd 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -182,6 +182,7 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba, uint8_t expectRsp,
                 icmd->un.elsreq64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));
                 icmd->un.elsreq64.remoteID = did;       /* DID */
                 icmd->ulpCommand = CMD_ELS_REQUEST64_CR;
+                icmd->ulpTimeout = phba->fc_ratov * 2;
         } else {
                 icmd->un.elsreq64.bdl.bdeSize = sizeof (struct ulp_bde64);
                 icmd->ulpCommand = CMD_XMIT_ELS_RSP64_CX;
@@ -208,9 +209,9 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba, uint8_t expectRsp,
         }
 
         /* Save for completion so we can release these resources */
-        elsiocb->context1 = (uint8_t *) ndlp;
-        elsiocb->context2 = (uint8_t *) pcmd;
-        elsiocb->context3 = (uint8_t *) pbuflist;
+        elsiocb->context1 = lpfc_nlp_get(ndlp);
+        elsiocb->context2 = pcmd;
+        elsiocb->context3 = pbuflist;
         elsiocb->retry = retry;
         elsiocb->drvrTimeout = (phba->fc_ratov << 1) + LPFC_DRVR_TIMEOUT;
 
@@ -222,16 +223,16 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba, uint8_t expectRsp,
                 /* Xmit ELS command <elsCmd> to remote NPORT <did> */
                 lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
                                 "%d:0116 Xmit ELS command x%x to remote "
-                                "NPORT x%x Data: x%x x%x\n",
+                                "NPORT x%x I/O tag: x%x, HBA state: x%x\n",
                                 phba->brd_no, elscmd,
-                                did, icmd->ulpIoTag, phba->hba_state);
+                                did, elsiocb->iotag, phba->hba_state);
         } else {
                 /* Xmit ELS response <elsCmd> to remote NPORT <did> */
                 lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
                                 "%d:0117 Xmit ELS response x%x to remote "
-                                "NPORT x%x Data: x%x x%x\n",
+                                "NPORT x%x I/O tag: x%x, size: x%x\n",
                                 phba->brd_no, elscmd,
-                                ndlp->nlp_DID, icmd->ulpIoTag, cmdSize);
+                                ndlp->nlp_DID, elsiocb->iotag, cmdSize);
         }
 
         return elsiocb;
@@ -304,7 +305,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
                 goto fail_free_mbox;
 
         mbox->mbox_cmpl = lpfc_mbx_cmpl_fabric_reg_login;
-        mbox->context2 = ndlp;
+        mbox->context2 = lpfc_nlp_get(ndlp);
 
         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB);
         if (rc == MBX_NOT_FINISHED)
@@ -313,6 +314,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
         return 0;
 
  fail_issue_reg_login:
+        lpfc_nlp_put(ndlp);
         mp = (struct lpfc_dmabuf *) mbox->context1;
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
         kfree(mp);
@@ -368,9 +370,9 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
                         mempool_free(mbox, phba->mbox_mem_pool);
                         goto fail;
                 }
-                mempool_free(ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
 
-                ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, PT2PT_RemoteID);
+                ndlp = lpfc_findnode_did(phba, PT2PT_RemoteID);
                 if (!ndlp) {
                         /*
                          * Cannot find existing Fabric ndlp, so allocate a
@@ -387,12 +389,11 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
                                 sizeof(struct lpfc_name));
                 memcpy(&ndlp->nlp_nodename, &sp->nodeName,
                                 sizeof(struct lpfc_name));
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                 ndlp->nlp_flag |= NLP_NPR_2B_DISC;
         } else {
                 /* This side will wait for the PLOGI */
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
         }
 
         spin_lock_irq(phba->host->host_lock);
@@ -407,8 +408,8 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
 }
 
 static void
-lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
-                    struct lpfc_iocbq * cmdiocb, struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                    struct lpfc_iocbq *rspiocb)
 {
         IOCB_t *irsp = &rspiocb->iocb;
         struct lpfc_nodelist *ndlp = cmdiocb->context1;
@@ -418,7 +419,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
 
         /* Check to see if link went down during discovery */
         if (lpfc_els_chk_latt(phba)) {
-                lpfc_nlp_remove(phba, ndlp);
+                lpfc_nlp_put(ndlp);
                 goto out;
         }
 
@@ -433,13 +434,12 @@ lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
                 phba->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
                 spin_unlock_irq(phba->host->host_lock);
 
-                /* If private loop, then allow max outstandting els to be
+                /* If private loop, then allow max outstanding els to be
                  * LPFC_MAX_DISC_THREADS (32). Scanning in the case of no
                  * alpa map would take too long otherwise.
                  */
                 if (phba->alpa_map[0] == 0) {
-                        phba->cfg_discovery_threads =
-                            LPFC_MAX_DISC_THREADS;
+                        phba->cfg_discovery_threads = LPFC_MAX_DISC_THREADS;
                 }
 
                 /* FLOGI failure */
@@ -484,7 +484,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
         }
 
 flogifail:
-        lpfc_nlp_remove(phba, ndlp);
+        lpfc_nlp_put(ndlp);
 
         if (irsp->ulpStatus != IOSTAT_LOCAL_REJECT ||
             (irsp->un.ulpWord[4] != IOERR_SLI_ABORTED &&
@@ -582,24 +582,8 @@ lpfc_els_abort_flogi(struct lpfc_hba * phba)
                 icmd = &iocb->iocb;
                 if (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) {
                         ndlp = (struct lpfc_nodelist *)(iocb->context1);
-                        if (ndlp && (ndlp->nlp_DID == Fabric_DID)) {
-                                list_del(&iocb->list);
-                                pring->txcmplq_cnt--;
-
-                                if ((icmd->un.elsreq64.bdl.ulpIoTag32)) {
-                                        lpfc_sli_issue_abort_iotag32
-                                                (phba, pring, iocb);
-                                }
-                                if (iocb->iocb_cmpl) {
-                                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                                        icmd->un.ulpWord[4] =
-                                            IOERR_SLI_ABORTED;
-                                        spin_unlock_irq(phba->host->host_lock);
-                                        (iocb->iocb_cmpl) (phba, iocb, iocb);
-                                        spin_lock_irq(phba->host->host_lock);
-                                } else
-                                        lpfc_sli_release_iocbq(phba, iocb);
-                        }
+                        if (ndlp && (ndlp->nlp_DID == Fabric_DID))
+                                lpfc_sli_issue_abort_iotag(phba, pring, iocb);
                 }
         }
         spin_unlock_irq(phba->host->host_lock);
@@ -608,12 +592,12 @@ lpfc_els_abort_flogi(struct lpfc_hba * phba)
 }
 
 int
-lpfc_initial_flogi(struct lpfc_hba * phba)
+lpfc_initial_flogi(struct lpfc_hba *phba)
 {
         struct lpfc_nodelist *ndlp;
 
         /* First look for the Fabric ndlp */
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, Fabric_DID);
+        ndlp = lpfc_findnode_did(phba, Fabric_DID);
         if (!ndlp) {
                 /* Cannot find existing Fabric ndlp, so allocate a new one */
                 ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
@@ -621,10 +605,10 @@ lpfc_initial_flogi(struct lpfc_hba * phba)
                         return 0;
                 lpfc_nlp_init(phba, ndlp, Fabric_DID);
         } else {
-                lpfc_nlp_list(phba, ndlp, NLP_JUST_DQ);
+                lpfc_dequeue_node(phba, ndlp);
         }
         if (lpfc_issue_els_flogi(phba, ndlp, 0)) {
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
         }
         return 1;
 }
@@ -653,7 +637,7 @@ lpfc_more_plogi(struct lpfc_hba * phba)
 }
 
 static struct lpfc_nodelist *
-lpfc_plogi_confirm_nport(struct lpfc_hba * phba, struct lpfc_dmabuf *prsp,
+lpfc_plogi_confirm_nport(struct lpfc_hba *phba, struct lpfc_dmabuf *prsp,
                          struct lpfc_nodelist *ndlp)
 {
         struct lpfc_nodelist *new_ndlp;
@@ -670,12 +654,12 @@ lpfc_plogi_confirm_nport(struct lpfc_hba * phba, struct lpfc_dmabuf *prsp,
 
         lp = (uint32_t *) prsp->virt;
         sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t));
-        memset(name, 0, sizeof (struct lpfc_name));
+        memset(name, 0, sizeof(struct lpfc_name));
 
-        /* Now we to find out if the NPort we are logging into, matches the WWPN
+        /* Now we find out if the NPort we are logging into, matches the WWPN
          * we have for that ndlp. If not, we have some work to do.
          */
-        new_ndlp = lpfc_findnode_wwpn(phba, NLP_SEARCH_ALL, &sp->portName);
+        new_ndlp = lpfc_findnode_wwpn(phba, &sp->portName);
 
         if (new_ndlp == ndlp)
                 return ndlp;
@@ -695,18 +679,15 @@ lpfc_plogi_confirm_nport(struct lpfc_hba * phba, struct lpfc_dmabuf *prsp,
         lpfc_unreg_rpi(phba, new_ndlp);
         new_ndlp->nlp_DID = ndlp->nlp_DID;
         new_ndlp->nlp_prev_state = ndlp->nlp_prev_state;
-        new_ndlp->nlp_state = ndlp->nlp_state;
-        lpfc_nlp_list(phba, new_ndlp, ndlp->nlp_flag & NLP_LIST_MASK);
+        lpfc_nlp_set_state(phba, new_ndlp, ndlp->nlp_state);
 
         /* Move this back to NPR list */
-        if (memcmp(&ndlp->nlp_portname, name, sizeof(struct lpfc_name)) == 0) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        }
+        if (memcmp(&ndlp->nlp_portname, name, sizeof(struct lpfc_name)) == 0)
+                lpfc_drop_node(phba, ndlp);
         else {
                 lpfc_unreg_rpi(phba, ndlp);
                 ndlp->nlp_DID = 0; /* Two ndlps cannot have the same did */
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         }
         return new_ndlp;
 }
@@ -720,13 +701,11 @@ lpfc_cmpl_els_plogi(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
         struct lpfc_dmabuf *prsp;
         int disc, rc, did, type;
 
-
         /* we pass cmdiocb to state machine which needs rspiocb as well */
         cmdiocb->context_un.rsp_iocb = rspiocb;
 
         irsp = &rspiocb->iocb;
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL,
-                                                irsp->un.elsreq64.remoteID);
+        ndlp = lpfc_findnode_did(phba, irsp->un.elsreq64.remoteID);
         if (!ndlp)
                 goto out;
 
@@ -1354,7 +1333,7 @@ lpfc_issue_els_scr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
         elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry, ndlp,
                                                 ndlp->nlp_DID, ELS_CMD_SCR);
         if (!elsiocb) {
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
                 return 1;
         }
 
@@ -1373,12 +1352,12 @@ lpfc_issue_els_scr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
         spin_lock_irq(phba->host->host_lock);
         if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
                 spin_unlock_irq(phba->host->host_lock);
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
                 lpfc_els_free_iocb(phba, elsiocb);
                 return 1;
         }
         spin_unlock_irq(phba->host->host_lock);
-        mempool_free( ndlp, phba->nlp_mem_pool);
+        lpfc_nlp_put(ndlp);
         return 0;
 }
 
@@ -1407,7 +1386,7 @@ lpfc_issue_els_farpr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
         elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry, ndlp,
                                                 ndlp->nlp_DID, ELS_CMD_RNID);
         if (!elsiocb) {
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
                 return 1;
         }
 
@@ -1428,7 +1407,7 @@ lpfc_issue_els_farpr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
 
         memcpy(&fp->RportName, &phba->fc_portname, sizeof (struct lpfc_name));
         memcpy(&fp->RnodeName, &phba->fc_nodename, sizeof (struct lpfc_name));
-        if ((ondlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, nportid))) {
+        if ((ondlp = lpfc_findnode_did(phba, nportid))) {
                 memcpy(&fp->OportName, &ondlp->nlp_portname,
                        sizeof (struct lpfc_name));
                 memcpy(&fp->OnodeName, &ondlp->nlp_nodename,
@@ -1440,12 +1419,12 @@ lpfc_issue_els_farpr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
         spin_lock_irq(phba->host->host_lock);
         if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
                 spin_unlock_irq(phba->host->host_lock);
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                lpfc_nlp_put(ndlp);
                 lpfc_els_free_iocb(phba, elsiocb);
                 return 1;
         }
         spin_unlock_irq(phba->host->host_lock);
-        mempool_free( ndlp, phba->nlp_mem_pool);
+        lpfc_nlp_put(ndlp);
         return 0;
 }
 
@@ -1554,29 +1533,25 @@ lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)
         case ELS_CMD_PLOGI:
                 if(!lpfc_issue_els_plogi(phba, ndlp->nlp_DID, retry)) {
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
                 }
                 break;
         case ELS_CMD_ADISC:
                 if (!lpfc_issue_els_adisc(phba, ndlp, retry)) {
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_ADISC_ISSUE);
                 }
                 break;
         case ELS_CMD_PRLI:
                 if (!lpfc_issue_els_prli(phba, ndlp, retry)) {
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_PRLI_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PRLI_ISSUE);
                 }
                 break;
         case ELS_CMD_LOGO:
                 if (!lpfc_issue_els_logo(phba, ndlp, retry)) {
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_NPR_NODE;
-                        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                 }
                 break;
         }
@@ -1614,12 +1589,12 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 cmd = *elscmd++;
         }
 
-        if(ndlp)
+        if (ndlp)
                 did = ndlp->nlp_DID;
         else {
                 /* We should only hit this case for retrying PLOGI */
                 did = irsp->un.elsreq64.remoteID;
-                ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, did);
+                ndlp = lpfc_findnode_did(phba, did);
                 if (!ndlp && (cmd != ELS_CMD_PLOGI))
                         return 1;
         }
@@ -1746,8 +1721,7 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                         ndlp->nlp_flag |= NLP_DELAY_TMO;
 
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_NPR_NODE;
-                        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                         ndlp->nlp_last_elscmd = cmd;
 
                         return 1;
@@ -1759,27 +1733,24 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 case ELS_CMD_PLOGI:
                         if (ndlp) {
                                 ndlp->nlp_prev_state = ndlp->nlp_state;
-                                ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                                lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                                lpfc_nlp_set_state(phba, ndlp,
+                                                   NLP_STE_PLOGI_ISSUE);
                         }
                         lpfc_issue_els_plogi(phba, did, cmdiocb->retry);
                         return 1;
                 case ELS_CMD_ADISC:
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_ADISC_ISSUE);
                         lpfc_issue_els_adisc(phba, ndlp, cmdiocb->retry);
                         return 1;
                 case ELS_CMD_PRLI:
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_PRLI_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PRLI_ISSUE);
                         lpfc_issue_els_prli(phba, ndlp, cmdiocb->retry);
                         return 1;
                 case ELS_CMD_LOGO:
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_NPR_NODE;
-                        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                         lpfc_issue_els_logo(phba, ndlp, cmdiocb->retry);
                         return 1;
                 }
@@ -1796,10 +1767,14 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 }
 
 int
-lpfc_els_free_iocb(struct lpfc_hba * phba, struct lpfc_iocbq * elsiocb)
+lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb)
 {
         struct lpfc_dmabuf *buf_ptr, *buf_ptr1;
 
+        if (elsiocb->context1) {
+                lpfc_nlp_put(elsiocb->context1);
+                elsiocb->context1 = NULL;
+        }
         /* context2  = cmd,  context2->next = rsp, context3 = bpl */
         if (elsiocb->context2) {
                 buf_ptr1 = (struct lpfc_dmabuf *) elsiocb->context2;
@@ -1843,7 +1818,7 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 
         switch (ndlp->nlp_state) {
         case NLP_STE_UNUSED_NODE:       /* node is just allocated */
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 break;
         case NLP_STE_NPR_NODE:          /* NPort Recovery mode */
                 lpfc_unreg_rpi(phba, ndlp);
@@ -1856,8 +1831,8 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 }
 
 static void
-lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                  struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                  struct lpfc_iocbq *rspiocb)
 {
         IOCB_t *irsp;
         struct lpfc_nodelist *ndlp;
@@ -1872,14 +1847,14 @@ lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 
 
         /* Check to see if link went down during discovery */
-        if ((lpfc_els_chk_latt(phba)) || !ndlp) {
+        if (lpfc_els_chk_latt(phba) || !ndlp) {
                 if (mbox) {
                         mp = (struct lpfc_dmabuf *) mbox->context1;
                         if (mp) {
                                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                                 kfree(mp);
                         }
-                        mempool_free( mbox, phba->mbox_mem_pool);
+                        mempool_free(mbox, phba->mbox_mem_pool);
                 }
                 goto out;
         }
@@ -1899,15 +1874,15 @@ lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                     && (ndlp->nlp_flag & NLP_ACC_REGLOGIN)) {
                         lpfc_unreg_rpi(phba, ndlp);
                         mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
-                        mbox->context2 = ndlp;
+                        mbox->context2 = lpfc_nlp_get(ndlp);
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_REG_LOGIN_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_REGLOGIN_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_REG_LOGIN_ISSUE);
                         if (lpfc_sli_issue_mbox(phba, mbox,
                                                 (MBX_NOWAIT | MBX_STOP_IOCB))
                             != MBX_NOT_FINISHED) {
                                 goto out;
                         }
+                        lpfc_nlp_put(ndlp);
                         /* NOTE: we should have messages for unsuccessful
                            reglogin */
                 } else {
@@ -1917,7 +1892,7 @@ lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                                (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
                                (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
                                 if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {
-                                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                                        lpfc_drop_node(phba, ndlp);
                                         ndlp = NULL;
                                 }
                         }
@@ -2012,15 +1987,16 @@ lpfc_els_rsp_acc(struct lpfc_hba * phba, uint32_t flag,
                 return 1;
         }
 
-        if (newnode)
+        if (newnode) {
+                lpfc_nlp_put(ndlp);
                 elsiocb->context1 = NULL;
+        }
 
         /* Xmit ELS ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0128 Xmit ELS ACC response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "%d:0128 Xmit ELS ACC response tag x%x, XRI: x%x, "
+                        "DID: x%x, nlp_flag: x%x nlp_state: x%x RPI: x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
@@ -2077,10 +2053,9 @@ lpfc_els_rsp_reject(struct lpfc_hba * phba, uint32_t rejectError,
 
         /* Xmit ELS RJT <err> response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0129 Xmit ELS RJT x%x response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        rejectError, elsiocb->iocb.ulpIoTag,
+                        "%d:0129 Xmit ELS RJT x%x response tag x%x xri x%x, "
+                        "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",
+                        phba->brd_no, rejectError, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
@@ -2119,18 +2094,18 @@ lpfc_els_rsp_adisc_acc(struct lpfc_hba * phba,
         if (!elsiocb)
                 return 1;
 
+        icmd = &elsiocb->iocb;
+        oldcmd = &oldiocb->iocb;
+        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
+
         /* Xmit ADISC ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0130 Xmit ADISC ACC response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "%d:0130 Xmit ADISC ACC response iotag x%x xri: "
+                        "x%x, did x%x, nlp_flag x%x, nlp_state x%x rpi x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
-        icmd = &elsiocb->iocb;
-        oldcmd = &oldiocb->iocb;
-        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
         pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
         *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -2155,8 +2130,8 @@ lpfc_els_rsp_adisc_acc(struct lpfc_hba * phba,
 }
 
 int
-lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,
-                      struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rsp_prli_acc(struct lpfc_hba *phba, struct lpfc_iocbq *oldiocb,
+                      struct lpfc_nodelist *ndlp)
 {
         PRLI *npr;
         lpfc_vpd_t *vpd;
@@ -2178,18 +2153,18 @@ lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,
         if (!elsiocb)
                 return 1;
 
+        icmd = &elsiocb->iocb;
+        oldcmd = &oldiocb->iocb;
+        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
+
         /* Xmit PRLI ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0131 Xmit PRLI ACC response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "%d:0131 Xmit PRLI ACC response tag x%x xri x%x, "
+                        "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
-        icmd = &elsiocb->iocb;
-        oldcmd = &oldiocb->iocb;
-        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
         pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
         *((uint32_t *) (pcmd)) = (ELS_CMD_ACC | (ELS_CMD_PRLI & ~ELS_RSP_MASK));
@@ -2232,9 +2207,8 @@ lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,
 }
 
 static int
-lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
-                      uint8_t format,
-                      struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rsp_rnid_acc(struct lpfc_hba *phba, uint8_t format,
+                      struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)
 {
         RNID *rn;
         IOCB_t *icmd;
@@ -2259,17 +2233,17 @@ lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
         if (!elsiocb)
                 return 1;
 
+        icmd = &elsiocb->iocb;
+        oldcmd = &oldiocb->iocb;
+        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
+
         /* Xmit RNID ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
                         "%d:0132 Xmit RNID ACC response tag x%x "
-                        "Data: x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "xri x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext);
 
-        icmd = &elsiocb->iocb;
-        oldcmd = &oldiocb->iocb;
-        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
         pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
         *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -2301,6 +2275,7 @@ lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
 
         phba->fc_stat.elsXmitACC++;
         elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
+        lpfc_nlp_put(ndlp);
         elsiocb->context1 = NULL;  /* Don't need ndlp for cmpl,
                                     * it could be freed */
 
@@ -2315,32 +2290,31 @@ lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
 }
 
 int
-lpfc_els_disc_adisc(struct lpfc_hba * phba)
+lpfc_els_disc_adisc(struct lpfc_hba *phba)
 {
         int sentadisc;
         struct lpfc_nodelist *ndlp, *next_ndlp;
 
         sentadisc = 0;
-        /* go thru NPR list and issue any remaining ELS ADISCs */
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                        nlp_listp) {
-                if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
-                        if (ndlp->nlp_flag & NLP_NPR_ADISC) {
-                                ndlp->nlp_flag &= ~NLP_NPR_ADISC;
-                                ndlp->nlp_prev_state = ndlp->nlp_state;
-                                ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                                lpfc_nlp_list(phba, ndlp,
-                                        NLP_ADISC_LIST);
-                                lpfc_issue_els_adisc(phba, ndlp, 0);
-                                sentadisc++;
-                                phba->num_disc_nodes++;
-                                if (phba->num_disc_nodes >=
-                                    phba->cfg_discovery_threads) {
-                                        spin_lock_irq(phba->host->host_lock);
-                                        phba->fc_flag |= FC_NLP_MORE;
-                                        spin_unlock_irq(phba->host->host_lock);
-                                        break;
-                                }
+        /* go thru NPR nodes and issue any remaining ELS ADISCs */
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
+                    (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
+                    (ndlp->nlp_flag & NLP_NPR_ADISC) != 0) {
+                        spin_lock_irq(phba->host->host_lock);
+                        ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                        spin_unlock_irq(phba->host->host_lock);
+                        ndlp->nlp_prev_state = ndlp->nlp_state;
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_ADISC_ISSUE);
+                        lpfc_issue_els_adisc(phba, ndlp, 0);
+                        sentadisc++;
+                        phba->num_disc_nodes++;
+                        if (phba->num_disc_nodes >=
+                            phba->cfg_discovery_threads) {
+                                spin_lock_irq(phba->host->host_lock);
+                                phba->fc_flag |= FC_NLP_MORE;
+                                spin_unlock_irq(phba->host->host_lock);
+                                break;
                         }
                 }
         }
@@ -2360,24 +2334,22 @@ lpfc_els_disc_plogi(struct lpfc_hba * phba)
 
         sentplogi = 0;
         /* go thru NPR list and issue any remaining ELS PLOGIs */
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                                nlp_listp) {
-                if ((ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
-                   (!(ndlp->nlp_flag & NLP_DELAY_TMO))) {
-                        if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
-                                ndlp->nlp_prev_state = ndlp->nlp_state;
-                                ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                                lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-                                lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
-                                sentplogi++;
-                                phba->num_disc_nodes++;
-                                if (phba->num_disc_nodes >=
-                                    phba->cfg_discovery_threads) {
-                                        spin_lock_irq(phba->host->host_lock);
-                                        phba->fc_flag |= FC_NLP_MORE;
-                                        spin_unlock_irq(phba->host->host_lock);
-                                        break;
-                                }
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
+                    (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
+                    (ndlp->nlp_flag & NLP_DELAY_TMO) == 0 &&
+                    (ndlp->nlp_flag & NLP_NPR_ADISC) == 0) {
+                        ndlp->nlp_prev_state = ndlp->nlp_state;
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
+                        lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
+                        sentplogi++;
+                        phba->num_disc_nodes++;
+                        if (phba->num_disc_nodes >=
+                            phba->cfg_discovery_threads) {
+                                spin_lock_irq(phba->host->host_lock);
+                                phba->fc_flag |= FC_NLP_MORE;
+                                spin_unlock_irq(phba->host->host_lock);
+                                break;
                         }
                 }
         }
@@ -2479,42 +2451,30 @@ lpfc_rscn_payload_check(struct lpfc_hba * phba, uint32_t did)
 }
 
 static int
-lpfc_rscn_recovery_check(struct lpfc_hba * phba)
+lpfc_rscn_recovery_check(struct lpfc_hba *phba)
 {
-        struct lpfc_nodelist *ndlp = NULL, *next_ndlp;
-        struct list_head *listp;
-        struct list_head *node_list[7];
-        int i;
+        struct lpfc_nodelist *ndlp = NULL;
 
         /* Look at all nodes effected by pending RSCNs and move
-         * them to NPR list.
+         * them to NPR state.
          */
-        node_list[0] = &phba->fc_npr_list;  /* MUST do this list first */
-        node_list[1] = &phba->fc_nlpmap_list;
-        node_list[2] = &phba->fc_nlpunmap_list;
-        node_list[3] = &phba->fc_prli_list;
-        node_list[4] = &phba->fc_reglogin_list;
-        node_list[5] = &phba->fc_adisc_list;
-        node_list[6] = &phba->fc_plogi_list;
-        for (i = 0; i < 7; i++) {
-                listp = node_list[i];
-                if (list_empty(listp))
-                        continue;
 
-                list_for_each_entry_safe(ndlp, next_ndlp, listp, nlp_listp) {
-                        if (!(lpfc_rscn_payload_check(phba, ndlp->nlp_DID)))
-                                continue;
+        list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE ||
+                    lpfc_rscn_payload_check(phba, ndlp->nlp_DID) == 0)
+                        continue;
 
-                        lpfc_disc_state_machine(phba, ndlp, NULL,
+                lpfc_disc_state_machine(phba, ndlp, NULL,
                                         NLP_EVT_DEVICE_RECOVERY);
 
-                        /* Make sure NLP_DELAY_TMO is NOT running
-                         * after a device recovery event.
-                         */
-                        if (ndlp->nlp_flag & NLP_DELAY_TMO)
-                                lpfc_cancel_retry_delay_tmo(phba, ndlp);
-                }
+                /*
+                 * Make sure NLP_DELAY_TMO is NOT running after a device
+                 * recovery event.
+                 */
+                if (ndlp->nlp_flag & NLP_DELAY_TMO)
+                        lpfc_cancel_retry_delay_tmo(phba, ndlp);
         }
+
         return 0;
 }
 
@@ -2639,8 +2599,8 @@ lpfc_els_handle_rscn(struct lpfc_hba * phba)
 
         /* To process RSCN, first compare RSCN data with NameServer */
         phba->fc_ns_retry = 0;
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED, NameServer_DID);
-        if (ndlp) {
+        ndlp = lpfc_findnode_did(phba, NameServer_DID);
+        if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                 /* Good ndlp, issue CT Request to NameServer */
                 if (lpfc_ns_cmd(phba, ndlp, SLI_CTNS_GID_FT) == 0) {
                         /* Wait for NameServer query cmpl before we can
@@ -2650,7 +2610,7 @@ lpfc_els_handle_rscn(struct lpfc_hba * phba)
         } else {
                 /* If login to NameServer does not exist, issue one */
                 /* Good status, issue PLOGI to NameServer */
-                ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, NameServer_DID);
+                ndlp = lpfc_findnode_did(phba, NameServer_DID);
                 if (ndlp) {
                         /* Wait for NameServer login cmpl before we can
                            continue */
@@ -2664,8 +2624,7 @@ lpfc_els_handle_rscn(struct lpfc_hba * phba)
                         lpfc_nlp_init(phba, ndlp, NameServer_DID);
                         ndlp->nlp_type |= NLP_FABRIC;
                         ndlp->nlp_prev_state = ndlp->nlp_state;
-                        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
                         lpfc_issue_els_plogi(phba, NameServer_DID, 0);
                         /* Wait for NameServer login cmpl before we can
                            continue */
@@ -2734,8 +2693,9 @@ lpfc_els_rcv_flogi(struct lpfc_hba * phba,
                         mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                         rc = lpfc_sli_issue_mbox
                                 (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB));
+                        lpfc_set_loopback_flag(phba);
                         if (rc == MBX_NOT_FINISHED) {
-                                mempool_free( mbox, phba->mbox_mem_pool);
+                                mempool_free(mbox, phba->mbox_mem_pool);
                         }
                         return 1;
                 } else if (rc > 0) {    /* greater than */
@@ -2800,8 +2760,8 @@ lpfc_els_rcv_rnid(struct lpfc_hba * phba,
 }
 
 static int
-lpfc_els_rcv_lirr(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                 struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_lirr(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_nodelist *ndlp)
 {
         struct ls_rjt stat;
 
@@ -2815,7 +2775,7 @@ lpfc_els_rcv_lirr(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 }
 
 static void
-lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
+lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
         struct lpfc_sli *psli;
         struct lpfc_sli_ring *pring;
@@ -2838,14 +2798,15 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         pmb->context2 = NULL;
 
         if (mb->mbxStatus) {
-                mempool_free( pmb, phba->mbox_mem_pool);
+                mempool_free(pmb, phba->mbox_mem_pool);
                 return;
         }
 
         cmdsize = sizeof(RPS_RSP) + sizeof(uint32_t);
-        mempool_free( pmb, phba->mbox_mem_pool);
+        mempool_free(pmb, phba->mbox_mem_pool);
         elsiocb = lpfc_prep_els_iocb(phba, 0, cmdsize, lpfc_max_els_tries, ndlp,
                                                 ndlp->nlp_DID, ELS_CMD_ACC);
+        lpfc_nlp_put(ndlp);
         if (!elsiocb)
                 return;
 
@@ -2875,15 +2836,15 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         /* Xmit ELS RPS ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0118 Xmit ELS RPS ACC response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "%d:0118 Xmit ELS RPS ACC response tag x%x xri x%x, "
+                        "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
         elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
         phba->fc_stat.elsXmitACC++;
+
         if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
                 lpfc_els_free_iocb(phba, elsiocb);
         }
@@ -2923,13 +2884,14 @@ lpfc_els_rcv_rps(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                         lpfc_read_lnk_stat(phba, mbox);
                         mbox->context1 =
                             (void *)((unsigned long)cmdiocb->iocb.ulpContext);
-                        mbox->context2 = ndlp;
+                        mbox->context2 = lpfc_nlp_get(ndlp);
                         mbox->mbox_cmpl = lpfc_els_rsp_rps_acc;
                         if (lpfc_sli_issue_mbox (phba, mbox,
                             (MBX_NOWAIT | MBX_STOP_IOCB)) != MBX_NOT_FINISHED) {
                                 /* Mbox completion will send ELS Response */
                                 return 0;
                         }
+                        lpfc_nlp_put(ndlp);
                         mempool_free(mbox, phba->mbox_mem_pool);
                 }
         }
@@ -2984,10 +2946,9 @@ lpfc_els_rsp_rpl_acc(struct lpfc_hba * phba, uint16_t cmdsize,
 
         /* Xmit ELS RPL ACC response tag <ulpIoTag> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d:0120 Xmit ELS RPL ACC response tag x%x "
-                        "Data: x%x x%x x%x x%x x%x\n",
-                        phba->brd_no,
-                        elsiocb->iocb.ulpIoTag,
+                        "%d:0120 Xmit ELS RPL ACC response tag x%x xri x%x, "
+                        "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",
+                        phba->brd_no, elsiocb->iotag,
                         elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                         ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
@@ -3091,8 +3052,8 @@ lpfc_els_rcv_farp(struct lpfc_hba * phba,
                         /* Log back into the node before sending the FARP. */
                         if (fp->Rflags & FARP_REQUEST_PLOGI) {
                                 ndlp->nlp_prev_state = ndlp->nlp_state;
-                                ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                                lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                                lpfc_nlp_set_state(phba, ndlp,
+                                                   NLP_STE_PLOGI_ISSUE);
                                 lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
                         }
 
@@ -3169,14 +3130,15 @@ lpfc_els_rcv_fan(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                          */
 
                         list_for_each_entry_safe(ndlp, next_ndlp,
-                                &phba->fc_npr_list, nlp_listp) {
-
+                                                 &phba->fc_nodes, nlp_listp) {
+                                if (ndlp->nlp_state != NLP_STE_NPR_NODE)
+                                        continue;
                                 if (ndlp->nlp_type & NLP_FABRIC) {
                                         /*
                                          * Clean up old Fabric, Nameserver and
                                          * other NLP_FABRIC logins
                                          */
-                                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                                        lpfc_drop_node(phba, ndlp);
                                 } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
                                         /* Fail outstanding I/O now since this
                                          * device is marked for PLOGI
@@ -3193,20 +3155,22 @@ lpfc_els_rcv_fan(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                 /* Discovery not needed,
                  * move the nodes to their original state.
                  */
-                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                        nlp_listp) {
+                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes,
+                                         nlp_listp) {
+                        if (ndlp->nlp_state != NLP_STE_NPR_NODE)
+                                continue;
 
                         switch (ndlp->nlp_prev_state) {
                         case NLP_STE_UNMAPPED_NODE:
                                 ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-                                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+                                lpfc_nlp_set_state(phba, ndlp,
+                                                   NLP_STE_UNMAPPED_NODE);
                                 break;
 
                         case NLP_STE_MAPPED_NODE:
                                 ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                                ndlp->nlp_state = NLP_STE_MAPPED_NODE;
-                                lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
+                                lpfc_nlp_set_state(phba, ndlp,
+                                                   NLP_STE_MAPPED_NODE);
                                 break;
 
                         default:
@@ -3246,9 +3210,8 @@ lpfc_els_timeout_handler(struct lpfc_hba *phba)
         struct lpfc_iocbq *tmp_iocb, *piocb;
         IOCB_t *cmd = NULL;
         struct lpfc_dmabuf *pcmd;
-        struct list_head *dlp;
         uint32_t *elscmd;
-        uint32_t els_command;
+        uint32_t els_command=0;
         uint32_t timeout;
         uint32_t remote_ID;
 
@@ -3263,17 +3226,20 @@ lpfc_els_timeout_handler(struct lpfc_hba *phba)
         timeout = (uint32_t)(phba->fc_ratov << 1);
 
         pring = &phba->sli.ring[LPFC_ELS_RING];
-        dlp = &pring->txcmplq;
 
         list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
                 cmd = &piocb->iocb;
 
-                if (piocb->iocb_flag & LPFC_IO_LIBDFC) {
+                if ((piocb->iocb_flag & LPFC_IO_LIBDFC) ||
+                        (piocb->iocb.ulpCommand == CMD_ABORT_XRI_CN) ||
+                        (piocb->iocb.ulpCommand == CMD_CLOSE_XRI_CN)) {
                         continue;
                 }
                 pcmd = (struct lpfc_dmabuf *) piocb->context2;
-                elscmd = (uint32_t *) (pcmd->virt);
-                els_command = *elscmd;
+                if (pcmd) {
+                        elscmd = (uint32_t *) (pcmd->virt);
+                        els_command = *elscmd;
+                }
 
                 if ((els_command == ELS_CMD_FARP)
                     || (els_command == ELS_CMD_FARPR)) {
@@ -3289,19 +3255,10 @@ lpfc_els_timeout_handler(struct lpfc_hba *phba)
                         continue;
                 }
 
-                list_del(&piocb->list);
-                pring->txcmplq_cnt--;
-
                 if (cmd->ulpCommand == CMD_GEN_REQUEST64_CR) {
                         struct lpfc_nodelist *ndlp;
-                        spin_unlock_irq(phba->host->host_lock);
-                        ndlp = lpfc_findnode_rpi(phba, cmd->ulpContext);
-                        spin_lock_irq(phba->host->host_lock);
+                        ndlp = __lpfc_findnode_rpi(phba, cmd->ulpContext);
                         remote_ID = ndlp->nlp_DID;
-                        if (cmd->un.elsreq64.bdl.ulpIoTag32) {
-                                lpfc_sli_issue_abort_iotag32(phba,
-                                        pring, piocb);
-                        }
                 } else {
                         remote_ID = cmd->un.elsreq64.remoteID;
                 }
@@ -3313,17 +3270,7 @@ lpfc_els_timeout_handler(struct lpfc_hba *phba)
                                 phba->brd_no, els_command,
                                 remote_ID, cmd->ulpCommand, cmd->ulpIoTag);
 
-                /*
-                 * The iocb has timed out; abort it.
-                 */
-                if (piocb->iocb_cmpl) {
-                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                        cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                        spin_unlock_irq(phba->host->host_lock);
-                        (piocb->iocb_cmpl) (phba, piocb, piocb);
-                        spin_lock_irq(phba->host->host_lock);
-                } else
-                        lpfc_sli_release_iocbq(phba, piocb);
+                lpfc_sli_issue_abort_iotag(phba, pring, piocb);
         }
         if (phba->sli.ring[LPFC_ELS_RING].txcmplq_cnt)
                 mod_timer(&phba->els_tmofunc, jiffies + HZ * timeout);
@@ -3332,16 +3279,13 @@ lpfc_els_timeout_handler(struct lpfc_hba *phba)
 }
 
 void
-lpfc_els_flush_cmd(struct lpfc_hba * phba)
+lpfc_els_flush_cmd(struct lpfc_hba *phba)
 {
-        struct lpfc_sli_ring *pring;
+        LIST_HEAD(completions);
+        struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
         struct lpfc_iocbq *tmp_iocb, *piocb;
         IOCB_t *cmd = NULL;
-        struct lpfc_dmabuf *pcmd;
-        uint32_t *elscmd;
-        uint32_t els_command;
 
-        pring = &phba->sli.ring[LPFC_ELS_RING];
         spin_lock_irq(phba->host->host_lock);
         list_for_each_entry_safe(piocb, tmp_iocb, &pring->txq, list) {
                 cmd = &piocb->iocb;
@@ -3351,29 +3295,15 @@ lpfc_els_flush_cmd(struct lpfc_hba * phba)
                 }
 
                 /* Do not flush out the QUE_RING and ABORT/CLOSE iocbs */
-                if ((cmd->ulpCommand == CMD_QUE_RING_BUF_CN) ||
-                    (cmd->ulpCommand == CMD_QUE_RING_BUF64_CN) ||
-                    (cmd->ulpCommand == CMD_CLOSE_XRI_CN) ||
-                    (cmd->ulpCommand == CMD_ABORT_XRI_CN)) {
+                if (cmd->ulpCommand == CMD_QUE_RING_BUF_CN ||
+                    cmd->ulpCommand == CMD_QUE_RING_BUF64_CN ||
+                    cmd->ulpCommand == CMD_CLOSE_XRI_CN ||
+                    cmd->ulpCommand == CMD_ABORT_XRI_CN)
                         continue;
-                }
 
-                pcmd = (struct lpfc_dmabuf *) piocb->context2;
-                elscmd = (uint32_t *) (pcmd->virt);
-                els_command = *elscmd;
+                list_move_tail(&piocb->list, &completions);
+                pring->txq_cnt--;
 
-                list_del(&piocb->list);
-                pring->txcmplq_cnt--;
-
-                cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-
-                if (piocb->iocb_cmpl) {
-                        spin_unlock_irq(phba->host->host_lock);
-                        (piocb->iocb_cmpl) (phba, piocb, piocb);
-                        spin_lock_irq(phba->host->host_lock);
-                } else
-                        lpfc_sli_release_iocbq(phba, piocb);
         }
 
         list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
@@ -3382,24 +3312,24 @@ lpfc_els_flush_cmd(struct lpfc_hba * phba)
                 if (piocb->iocb_flag & LPFC_IO_LIBDFC) {
                         continue;
                 }
-                pcmd = (struct lpfc_dmabuf *) piocb->context2;
-                elscmd = (uint32_t *) (pcmd->virt);
-                els_command = *elscmd;
 
-                list_del(&piocb->list);
-                pring->txcmplq_cnt--;
+                lpfc_sli_issue_abort_iotag(phba, pring, piocb);
+        }
+        spin_unlock_irq(phba->host->host_lock);
 
-                cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+        while(!list_empty(&completions)) {
+                piocb = list_get_first(&completions, struct lpfc_iocbq, list);
+                cmd = &piocb->iocb;
+                list_del(&piocb->list);
 
                 if (piocb->iocb_cmpl) {
-                        spin_unlock_irq(phba->host->host_lock);
+                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
                         (piocb->iocb_cmpl) (phba, piocb, piocb);
-                        spin_lock_irq(phba->host->host_lock);
                 } else
                         lpfc_sli_release_iocbq(phba, piocb);
         }
-        spin_unlock_irq(phba->host->host_lock);
+
         return;
 }
 
@@ -3468,7 +3398,7 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
         }
 
         did = icmd->un.rcvels.remoteID;
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, did);
+        ndlp = lpfc_findnode_did(phba, did);
         if (!ndlp) {
                 /* Cannot find existing Fabric ndlp, so allocate a new one */
                 ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
@@ -3484,12 +3414,13 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
                 if ((did & Fabric_DID_MASK) == Fabric_DID_MASK) {
                         ndlp->nlp_type |= NLP_FABRIC;
                 }
-                ndlp->nlp_state = NLP_STE_UNUSED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNUSED_NODE);
         }
 
         phba->fc_stat.elsRcvFrame++;
-        elsiocb->context1 = ndlp;
+        if (elsiocb->context1)
+                lpfc_nlp_put(elsiocb->context1);
+        elsiocb->context1 = lpfc_nlp_get(ndlp);
         elsiocb->context2 = mp;
 
         if ((cmd & ELS_CMD_MASK) == ELS_CMD_RSCN) {
@@ -3513,9 +3444,8 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
         case ELS_CMD_FLOGI:
                 phba->fc_stat.elsRcvFLOGI++;
                 lpfc_els_rcv_flogi(phba, elsiocb, ndlp, newnode);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         case ELS_CMD_LOGO:
                 phba->fc_stat.elsRcvLOGO++;
@@ -3536,9 +3466,8 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
         case ELS_CMD_RSCN:
                 phba->fc_stat.elsRcvRSCN++;
                 lpfc_els_rcv_rscn(phba, elsiocb, ndlp, newnode);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         case ELS_CMD_ADISC:
                 phba->fc_stat.elsRcvADISC++;
@@ -3579,30 +3508,26 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
         case ELS_CMD_LIRR:
                 phba->fc_stat.elsRcvLIRR++;
                 lpfc_els_rcv_lirr(phba, elsiocb, ndlp);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         case ELS_CMD_RPS:
                 phba->fc_stat.elsRcvRPS++;
                 lpfc_els_rcv_rps(phba, elsiocb, ndlp);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         case ELS_CMD_RPL:
                 phba->fc_stat.elsRcvRPL++;
                 lpfc_els_rcv_rpl(phba, elsiocb, ndlp);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         case ELS_CMD_RNID:
                 phba->fc_stat.elsRcvRNID++;
                 lpfc_els_rcv_rnid(phba, elsiocb, ndlp);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         default:
                 /* Unsupported ELS command, reject */
@@ -3612,9 +3537,8 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
                 lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
                                 "%d:0115 Unknown ELS command x%x received from "
                                 "NPORT x%x\n", phba->brd_no, cmd, did);
-                if (newnode) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-                }
+                if (newnode)
+                        lpfc_drop_node(phba, ndlp);
                 break;
         }
 
@@ -3627,6 +3551,8 @@ lpfc_els_unsol_event(struct lpfc_hba * phba,
                 lpfc_els_rsp_reject(phba, stat.un.lsRjtError, elsiocb, ndlp);
         }
 
+        lpfc_nlp_put(elsiocb->context1);
+        elsiocb->context1 = NULL;
         if (elsiocb->context2) {
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index c39564e85e94..61caa8d379e2 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -109,6 +109,9 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
                 return;
         }
 
+        if (ndlp->nlp_state == NLP_STE_MAPPED_NODE)
+                return;
+
         name = (uint8_t *)&ndlp->nlp_portname;
         phba = ndlp->nlp_phba;
 
@@ -147,11 +150,17 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
                                 ndlp->nlp_state, ndlp->nlp_rpi);
         }
 
-        ndlp->rport = NULL;
-        rdata->pnode = NULL;
-
-        if (!(phba->fc_flag & FC_UNLOADING))
+        if (!(phba->fc_flag & FC_UNLOADING) &&
+            !(ndlp->nlp_flag & NLP_DELAY_TMO) &&
+            !(ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
+            (ndlp->nlp_state != NLP_STE_UNMAPPED_NODE))
                 lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM);
+        else {
+                rdata->pnode = NULL;
+                ndlp->rport = NULL;
+                lpfc_nlp_put(ndlp);
+                put_device(&rport->dev);
+        }
 
         return;
 }
@@ -182,29 +191,35 @@ lpfc_work_list_done(struct lpfc_hba * phba)
                                 *(int *)(evtp->evt_arg1)  = 0;
                         complete((struct completion *)(evtp->evt_arg2));
                         break;
-                case LPFC_EVT_OFFLINE:
+                case LPFC_EVT_OFFLINE_PREP:
                         if (phba->hba_state >= LPFC_LINK_DOWN)
-                                lpfc_offline(phba);
+                                lpfc_offline_prep(phba);
+                        *(int *)(evtp->evt_arg1) = 0;
+                        complete((struct completion *)(evtp->evt_arg2));
+                        break;
+                case LPFC_EVT_OFFLINE:
+                        lpfc_offline(phba);
                         lpfc_sli_brdrestart(phba);
                         *(int *)(evtp->evt_arg1) =
-                                lpfc_sli_brdready(phba,HS_FFRDY | HS_MBRDY);
+                                lpfc_sli_brdready(phba, HS_FFRDY | HS_MBRDY);
+                        lpfc_unblock_mgmt_io(phba);
                         complete((struct completion *)(evtp->evt_arg2));
                         break;
                 case LPFC_EVT_WARM_START:
-                        if (phba->hba_state >= LPFC_LINK_DOWN)
-                                lpfc_offline(phba);
+                        lpfc_offline(phba);
                         lpfc_reset_barrier(phba);
                         lpfc_sli_brdreset(phba);
                         lpfc_hba_down_post(phba);
                         *(int *)(evtp->evt_arg1) =
                                 lpfc_sli_brdready(phba, HS_MBRDY);
+                        lpfc_unblock_mgmt_io(phba);
                         complete((struct completion *)(evtp->evt_arg2));
                         break;
                 case LPFC_EVT_KILL:
-                        if (phba->hba_state >= LPFC_LINK_DOWN)
-                                lpfc_offline(phba);
+                        lpfc_offline(phba);
                         *(int *)(evtp->evt_arg1)
                                 = (phba->stopped) ? 0 : lpfc_sli_brdkill(phba);
+                        lpfc_unblock_mgmt_io(phba);
                         complete((struct completion *)(evtp->evt_arg2));
                         break;
                 }
@@ -359,13 +374,12 @@ lpfc_workq_post_event(struct lpfc_hba * phba, void *arg1, void *arg2,
 }
 
 int
-lpfc_linkdown(struct lpfc_hba * phba)
+lpfc_linkdown(struct lpfc_hba *phba)
 {
         struct lpfc_sli       *psli;
         struct lpfc_nodelist  *ndlp, *next_ndlp;
-        struct list_head *listp, *node_list[7];
-        LPFC_MBOXQ_t     *mb;
-        int               rc, i;
+        LPFC_MBOXQ_t          *mb;
+        int                   rc;
 
         psli = &phba->sli;
         /* sysfs or selective reset may call this routine to clean up */
@@ -397,31 +411,16 @@ lpfc_linkdown(struct lpfc_hba * phba)
         /* Cleanup any outstanding ELS commands */
         lpfc_els_flush_cmd(phba);
 
-        /* Issue a LINK DOWN event to all nodes */
-        node_list[0] = &phba->fc_npr_list;  /* MUST do this list first */
-        node_list[1] = &phba->fc_nlpmap_list;
-        node_list[2] = &phba->fc_nlpunmap_list;
-        node_list[3] = &phba->fc_prli_list;
-        node_list[4] = &phba->fc_reglogin_list;
-        node_list[5] = &phba->fc_adisc_list;
-        node_list[6] = &phba->fc_plogi_list;
-        for (i = 0; i < 7; i++) {
-                listp = node_list[i];
-                if (list_empty(listp))
-                        continue;
-
-                list_for_each_entry_safe(ndlp, next_ndlp, listp, nlp_listp) {
-
+        /*
+         * Issue a LINK DOWN event to all nodes.
+         */
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes, nlp_listp) {
+                                /* free any ndlp's on unused list */
+                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                        lpfc_drop_node(phba, ndlp);
+                else            /* otherwise, force node recovery. */
                         rc = lpfc_disc_state_machine(phba, ndlp, NULL,
-                                             NLP_EVT_DEVICE_RECOVERY);
-
-                }
-        }
-
-        /* free any ndlp's on unused list */
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_unused_list,
-                                nlp_listp) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                                                     NLP_EVT_DEVICE_RECOVERY);
         }
 
         /* Setup myDID for link up if we are in pt2pt mode */
@@ -452,11 +451,9 @@ lpfc_linkdown(struct lpfc_hba * phba)
 }
 
 static int
-lpfc_linkup(struct lpfc_hba * phba)
+lpfc_linkup(struct lpfc_hba *phba)
 {
         struct lpfc_nodelist *ndlp, *next_ndlp;
-        struct list_head *listp, *node_list[7];
-        int i;
 
         fc_host_post_event(phba->host, fc_get_event_number(),
                         FCH_EVT_LINKUP, 0);
@@ -470,29 +467,20 @@ lpfc_linkup(struct lpfc_hba * phba)
         spin_unlock_irq(phba->host->host_lock);
 
 
-        node_list[0] = &phba->fc_plogi_list;
-        node_list[1] = &phba->fc_adisc_list;
-        node_list[2] = &phba->fc_reglogin_list;
-        node_list[3] = &phba->fc_prli_list;
-        node_list[4] = &phba->fc_nlpunmap_list;
-        node_list[5] = &phba->fc_nlpmap_list;
-        node_list[6] = &phba->fc_npr_list;
-        for (i = 0; i < 7; i++) {
-                listp = node_list[i];
-                if (list_empty(listp))
-                        continue;
-
-                list_for_each_entry_safe(ndlp, next_ndlp, listp, nlp_listp) {
-                        if (phba->fc_flag & FC_LBIT) {
+        if (phba->fc_flag & FC_LBIT) {
+                list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                        if (ndlp->nlp_state != NLP_STE_UNUSED_NODE) {
                                 if (ndlp->nlp_type & NLP_FABRIC) {
-                                        /* On Linkup its safe to clean up the
+                                        /*
+                                         * On Linkup its safe to clean up the
                                          * ndlp from Fabric connections.
                                          */
-                                        lpfc_nlp_list(phba, ndlp,
-                                                        NLP_UNUSED_LIST);
+                                        lpfc_nlp_set_state(phba, ndlp,
+                                                           NLP_STE_UNUSED_NODE);
                                 } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
-                                        /* Fail outstanding IO now since device
-                                         * is marked for PLOGI.
+                                        /*
+                                         * Fail outstanding IO now since
+                                         * device is marked for PLOGI.
                                          */
                                         lpfc_unreg_rpi(phba, ndlp);
                                 }
@@ -501,9 +489,10 @@ lpfc_linkup(struct lpfc_hba * phba)
         }
 
         /* free any ndlp's on unused list */
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_unused_list,
-                                nlp_listp) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes,
+                                 nlp_listp) {
+                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                        lpfc_drop_node(phba, ndlp);
         }
 
         return 0;
@@ -734,6 +723,9 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la)
                 case LA_4GHZ_LINK:
                         phba->fc_linkspeed = LA_4GHZ_LINK;
                         break;
+                case LA_8GHZ_LINK:
+                        phba->fc_linkspeed = LA_8GHZ_LINK;
+                        break;
                 default:
                         phba->fc_linkspeed = LA_UNKNW_LINK;
                         break;
@@ -889,12 +881,21 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         if (la->attType == AT_LINK_UP) {
                 phba->fc_stat.LinkUp++;
-                lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
+                if (phba->fc_flag & FC_LOOPBACK_MODE) {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
+                                "%d:1306 Link Up Event in loop back mode "
+                                "x%x received Data: x%x x%x x%x x%x\n",
+                                phba->brd_no, la->eventTag, phba->fc_eventTag,
+                                la->granted_AL_PA, la->UlnkSpeed,
+                                phba->alpa_map[0]);
+                } else {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                 "%d:1303 Link Up Event x%x received "
                                 "Data: x%x x%x x%x x%x\n",
                                 phba->brd_no, la->eventTag, phba->fc_eventTag,
                                 la->granted_AL_PA, la->UlnkSpeed,
                                 phba->alpa_map[0]);
+                }
                 lpfc_mbx_process_link_up(phba, la);
         } else {
                 phba->fc_stat.LinkDown++;
@@ -940,6 +941,7 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
         kfree(mp);
         mempool_free( pmb, phba->mbox_mem_pool);
+        lpfc_nlp_put(ndlp);
 
         return;
 }
@@ -966,11 +968,14 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         ndlp = (struct lpfc_nodelist *) pmb->context2;
         mp = (struct lpfc_dmabuf *) (pmb->context1);
 
+        pmb->context1 = NULL;
+        pmb->context2 = NULL;
+
         if (mb->mbxStatus) {
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
-                mempool_free( pmb, phba->mbox_mem_pool);
-                mempool_free( ndlp, phba->nlp_mem_pool);
+                mempool_free(pmb, phba->mbox_mem_pool);
+                lpfc_nlp_put(ndlp);
 
                 /* FLOGI failed, so just use loop map to make discovery list */
                 lpfc_disc_list_loopmap(phba);
@@ -980,12 +985,11 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
                 return;
         }
 
-        pmb->context1 = NULL;
-
         ndlp->nlp_rpi = mb->un.varWords[0];
         ndlp->nlp_type |= NLP_FABRIC;
-        ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
+
+        lpfc_nlp_put(ndlp);     /* Drop the reference from the mbox */
 
         if (phba->hba_state == LPFC_FABRIC_CFG_LINK) {
                 /* This NPort has been assigned an NPort_ID by the fabric as a
@@ -996,7 +1000,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
                  */
                 lpfc_issue_els_scr(phba, SCR_DID, 0);
 
-                ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, NameServer_DID);
+                ndlp = lpfc_findnode_did(phba, NameServer_DID);
                 if (!ndlp) {
                         /* Allocate a new node instance. If the pool is empty,
                          * start the discovery process and skip the Nameserver
@@ -1008,15 +1012,14 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
                                 lpfc_disc_start(phba);
                                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                                 kfree(mp);
-                                mempool_free( pmb, phba->mbox_mem_pool);
+                                mempool_free(pmb, phba->mbox_mem_pool);
                                 return;
                         } else {
                                 lpfc_nlp_init(phba, ndlp, NameServer_DID);
                                 ndlp->nlp_type |= NLP_FABRIC;
                         }
                 }
-                ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
                 lpfc_issue_els_plogi(phba, NameServer_DID, 0);
                 if (phba->cfg_fdmi_on) {
                         ndlp_fdmi = mempool_alloc(phba->nlp_mem_pool,
@@ -1032,7 +1035,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
         kfree(mp);
-        mempool_free( pmb, phba->mbox_mem_pool);
+        mempool_free(pmb, phba->mbox_mem_pool);
         return;
 }
 
@@ -1057,10 +1060,11 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
         mp = (struct lpfc_dmabuf *) (pmb->context1);
 
         if (mb->mbxStatus) {
+                lpfc_nlp_put(ndlp);
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
-                mempool_free( pmb, phba->mbox_mem_pool);
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                mempool_free(pmb, phba->mbox_mem_pool);
+                lpfc_drop_node(phba, ndlp);
 
                 /* RegLogin failed, so just use loop map to make discovery
                    list */
@@ -1075,8 +1079,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         ndlp->nlp_rpi = mb->un.varWords[0];
         ndlp->nlp_type |= NLP_FABRIC;
-        ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
 
         if (phba->hba_state < LPFC_HBA_READY) {
                 /* Link up discovery requires Fabrib registration. */
@@ -1093,6 +1096,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
                 lpfc_disc_start(phba);
         }
 
+        lpfc_nlp_put(ndlp);
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
         kfree(mp);
         mempool_free( pmb, phba->mbox_mem_pool);
@@ -1101,8 +1105,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 }
 
 static void
-lpfc_register_remote_port(struct lpfc_hba * phba,
-                            struct lpfc_nodelist * ndlp)
+lpfc_register_remote_port(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 {
         struct fc_rport *rport;
         struct lpfc_rport_data *rdata;
@@ -1114,8 +1117,19 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
         rport_ids.port_id = ndlp->nlp_DID;
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
 
+        /*
+         * We leave our node pointer in rport->dd_data when we unregister a
+         * FCP target port.  But fc_remote_port_add zeros the space to which
+         * rport->dd_data points.  So, if we're reusing a previously
+         * registered port, drop the reference that we took the last time we
+         * registered the port.
+         */
+        if (ndlp->rport && ndlp->rport->dd_data &&
+            *(struct lpfc_rport_data **) ndlp->rport->dd_data) {
+                lpfc_nlp_put(ndlp);
+        }
         ndlp->rport = rport = fc_remote_port_add(phba->host, 0, &rport_ids);
-        if (!rport) {
+        if (!rport || !get_device(&rport->dev)) {
                 dev_printk(KERN_WARNING, &phba->pcidev->dev,
                            "Warning: fc_remote_port_add failed\n");
                 return;
@@ -1125,7 +1139,7 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
         rport->maxframe_size = ndlp->nlp_maxframe;
         rport->supported_classes = ndlp->nlp_class_sup;
         rdata = rport->dd_data;
-        rdata->pnode = ndlp;
+        rdata->pnode = lpfc_nlp_get(ndlp);
 
         if (ndlp->nlp_type & NLP_FCP_TARGET)
                 rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;
@@ -1145,8 +1159,7 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
 }
 
 static void
-lpfc_unregister_remote_port(struct lpfc_hba * phba,
-                            struct lpfc_nodelist * ndlp)
+lpfc_unregister_remote_port(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 {
         struct fc_rport *rport = ndlp->rport;
         struct lpfc_rport_data *rdata = rport->dd_data;
@@ -1154,6 +1167,8 @@ lpfc_unregister_remote_port(struct lpfc_hba * phba,
         if (rport->scsi_target_id == -1) {
                 ndlp->rport = NULL;
                 rdata->pnode = NULL;
+                lpfc_nlp_put(ndlp);
+                put_device(&rport->dev);
         }
 
         fc_remote_port_delete(rport);
@@ -1161,178 +1176,70 @@ lpfc_unregister_remote_port(struct lpfc_hba * phba,
         return;
 }
 
-int
-lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
+static void
+lpfc_nlp_counters(struct lpfc_hba *phba, int state, int count)
 {
-        enum { none, unmapped, mapped } rport_add = none, rport_del = none;
-        struct lpfc_sli      *psli;
-
-        psli = &phba->sli;
-        /* Sanity check to ensure we are not moving to / from the same list */
-        if ((nlp->nlp_flag & NLP_LIST_MASK) == list)
-                if (list != NLP_NO_LIST)
-                        return 0;
-
         spin_lock_irq(phba->host->host_lock);
-        switch (nlp->nlp_flag & NLP_LIST_MASK) {
-        case NLP_NO_LIST: /* Not on any list */
+        switch (state) {
+        case NLP_STE_UNUSED_NODE:
+                phba->fc_unused_cnt += count;
                 break;
-        case NLP_UNUSED_LIST:
-                phba->fc_unused_cnt--;
-                list_del(&nlp->nlp_listp);
+        case NLP_STE_PLOGI_ISSUE:
+                phba->fc_plogi_cnt += count;
                 break;
-        case NLP_PLOGI_LIST:
-                phba->fc_plogi_cnt--;
-                list_del(&nlp->nlp_listp);
+        case NLP_STE_ADISC_ISSUE:
+                phba->fc_adisc_cnt += count;
                 break;
-        case NLP_ADISC_LIST:
-                phba->fc_adisc_cnt--;
-                list_del(&nlp->nlp_listp);
+        case NLP_STE_REG_LOGIN_ISSUE:
+                phba->fc_reglogin_cnt += count;
                 break;
-        case NLP_REGLOGIN_LIST:
-                phba->fc_reglogin_cnt--;
-                list_del(&nlp->nlp_listp);
+        case NLP_STE_PRLI_ISSUE:
+                phba->fc_prli_cnt += count;
                 break;
-        case NLP_PRLI_LIST:
-                phba->fc_prli_cnt--;
-                list_del(&nlp->nlp_listp);
+        case NLP_STE_UNMAPPED_NODE:
+                phba->fc_unmap_cnt += count;
                 break;
-        case NLP_UNMAPPED_LIST:
-                phba->fc_unmap_cnt--;
-                list_del(&nlp->nlp_listp);
-                nlp->nlp_flag &= ~NLP_TGT_NO_SCSIID;
-                nlp->nlp_type &= ~NLP_FC_NODE;
-                phba->nport_event_cnt++;
-                if (nlp->rport)
-                        rport_del = unmapped;
+        case NLP_STE_MAPPED_NODE:
+                phba->fc_map_cnt += count;
                 break;
-        case NLP_MAPPED_LIST:
-                phba->fc_map_cnt--;
-                list_del(&nlp->nlp_listp);
-                phba->nport_event_cnt++;
-                if (nlp->rport)
-                        rport_del = mapped;
-                break;
-        case NLP_NPR_LIST:
-                phba->fc_npr_cnt--;
-                list_del(&nlp->nlp_listp);
-                /* Stop delay tmo if taking node off NPR list */
-                if ((nlp->nlp_flag & NLP_DELAY_TMO) &&
-                   (list != NLP_NPR_LIST)) {
-                        spin_unlock_irq(phba->host->host_lock);
-                        lpfc_cancel_retry_delay_tmo(phba, nlp);
-                        spin_lock_irq(phba->host->host_lock);
-                }
+        case NLP_STE_NPR_NODE:
+                phba->fc_npr_cnt += count;
                 break;
         }
+        spin_unlock_irq(phba->host->host_lock);
+}
 
-        nlp->nlp_flag &= ~NLP_LIST_MASK;
-
-        /* Add NPort <did> to <num> list */
-        lpfc_printf_log(phba,
-                        KERN_INFO,
-                        LOG_NODE,
-                        "%d:0904 Add NPort x%x to %d list Data: x%x\n",
-                        phba->brd_no,
-                        nlp->nlp_DID, list, nlp->nlp_flag);
-
-        switch (list) {
-        case NLP_NO_LIST: /* No list, just remove it */
-                spin_unlock_irq(phba->host->host_lock);
-                lpfc_nlp_remove(phba, nlp);
-                spin_lock_irq(phba->host->host_lock);
-                /* as node removed - stop further transport calls */
-                rport_del = none;
-                break;
-        case NLP_UNUSED_LIST:
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the unused list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_unused_list);
-                phba->fc_unused_cnt++;
-                break;
-        case NLP_PLOGI_LIST:
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the plogi list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_plogi_list);
-                phba->fc_plogi_cnt++;
-                break;
-        case NLP_ADISC_LIST:
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the adisc list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_adisc_list);
-                phba->fc_adisc_cnt++;
-                break;
-        case NLP_REGLOGIN_LIST:
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the reglogin list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_reglogin_list);
-                phba->fc_reglogin_cnt++;
-                break;
-        case NLP_PRLI_LIST:
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the prli list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_prli_list);
-                phba->fc_prli_cnt++;
-                break;
-        case NLP_UNMAPPED_LIST:
-                rport_add = unmapped;
-                /* ensure all vestiges of "mapped" significance are gone */
-                nlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the unmap list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_nlpunmap_list);
-                phba->fc_unmap_cnt++;
-                phba->nport_event_cnt++;
-                nlp->nlp_flag &= ~NLP_NODEV_REMOVE;
-                nlp->nlp_type |= NLP_FC_NODE;
-                break;
-        case NLP_MAPPED_LIST:
-                rport_add = mapped;
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the map list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_nlpmap_list);
-                phba->fc_map_cnt++;
+static void
+lpfc_nlp_state_cleanup(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
+                       int old_state, int new_state)
+{
+        if (new_state == NLP_STE_UNMAPPED_NODE) {
+                ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
+                ndlp->nlp_flag &= ~NLP_NODEV_REMOVE;
+                ndlp->nlp_type |= NLP_FC_NODE;
+        }
+        if (new_state == NLP_STE_MAPPED_NODE)
+                ndlp->nlp_flag &= ~NLP_NODEV_REMOVE;
+        if (new_state == NLP_STE_NPR_NODE)
+                ndlp->nlp_flag &= ~NLP_RCV_PLOGI;
+
+        /* Transport interface */
+        if (ndlp->rport && (old_state == NLP_STE_MAPPED_NODE ||
+                            old_state == NLP_STE_UNMAPPED_NODE)) {
                 phba->nport_event_cnt++;
-                nlp->nlp_flag &= ~NLP_NODEV_REMOVE;
-                break;
-        case NLP_NPR_LIST:
-                nlp->nlp_flag |= list;
-                /* Put it at the end of the npr list */
-                list_add_tail(&nlp->nlp_listp, &phba->fc_npr_list);
-                phba->fc_npr_cnt++;
-
-                nlp->nlp_flag &= ~NLP_RCV_PLOGI;
-                break;
-        case NLP_JUST_DQ:
-                break;
+                lpfc_unregister_remote_port(phba, ndlp);
         }
 
-        spin_unlock_irq(phba->host->host_lock);
-
-        /*
-         * We make all the calls into the transport after we have
-         * moved the node between lists. This so that we don't
-         * release the lock while in-between lists.
-         */
-
-        /* Don't upcall midlayer if we're unloading */
-        if (!(phba->fc_flag & FC_UNLOADING)) {
-                /*
-                 * We revalidate the rport pointer as the "add" function
-                 * may have removed the remote port.
-                 */
-                if ((rport_del != none) && nlp->rport)
-                        lpfc_unregister_remote_port(phba, nlp);
-
-                if (rport_add != none) {
+        if (new_state ==  NLP_STE_MAPPED_NODE ||
+            new_state == NLP_STE_UNMAPPED_NODE) {
+                phba->nport_event_cnt++;
                         /*
                          * Tell the fc transport about the port, if we haven't
                          * already. If we have, and it's a scsi entity, be
                          * sure to unblock any attached scsi devices
                          */
-                        if ((!nlp->rport) || (nlp->rport->port_state ==
-                                        FC_PORTSTATE_BLOCKED))
-                                lpfc_register_remote_port(phba, nlp);
+                        lpfc_register_remote_port(phba, ndlp);
+        }
 
                         /*
                          * if we added to Mapped list, but the remote port
@@ -1340,19 +1247,95 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
                          * our presentable range - move the node to the
                          * Unmapped List
                          */
-                        if ((rport_add == mapped) &&
-                            ((!nlp->rport) ||
-                             (nlp->rport->scsi_target_id == -1) ||
-                             (nlp->rport->scsi_target_id >= LPFC_MAX_TARGET))) {
-                                nlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-                                spin_lock_irq(phba->host->host_lock);
-                                nlp->nlp_flag |= NLP_TGT_NO_SCSIID;
-                                spin_unlock_irq(phba->host->host_lock);
-                                lpfc_nlp_list(phba, nlp, NLP_UNMAPPED_LIST);
-                        }
-                }
+        if (new_state == NLP_STE_MAPPED_NODE &&
+            (!ndlp->rport ||
+             ndlp->rport->scsi_target_id == -1 ||
+             ndlp->rport->scsi_target_id >= LPFC_MAX_TARGET)) {
+                spin_lock_irq(phba->host->host_lock);
+                ndlp->nlp_flag |= NLP_TGT_NO_SCSIID;
+                spin_unlock_irq(phba->host->host_lock);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
         }
-        return 0;
+}
+
+static char *
+lpfc_nlp_state_name(char *buffer, size_t size, int state)
+{
+        static char *states[] = {
+                [NLP_STE_UNUSED_NODE] = "UNUSED",
+                [NLP_STE_PLOGI_ISSUE] = "PLOGI",
+                [NLP_STE_ADISC_ISSUE] = "ADISC",
+                [NLP_STE_REG_LOGIN_ISSUE] = "REGLOGIN",
+                [NLP_STE_PRLI_ISSUE] = "PRLI",
+                [NLP_STE_UNMAPPED_NODE] = "UNMAPPED",
+                [NLP_STE_MAPPED_NODE] = "MAPPED",
+                [NLP_STE_NPR_NODE] = "NPR",
+        };
+
+        if (state < ARRAY_SIZE(states) && states[state])
+                strlcpy(buffer, states[state], size);
+        else
+                snprintf(buffer, size, "unknown (%d)", state);
+        return buffer;
+}
+
+void
+lpfc_nlp_set_state(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp, int state)
+{
+        int  old_state = ndlp->nlp_state;
+        char name1[16], name2[16];
+
+        lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
+                        "%d:0904 NPort state transition x%06x, %s -> %s\n",
+                        phba->brd_no,
+                        ndlp->nlp_DID,
+                        lpfc_nlp_state_name(name1, sizeof(name1), old_state),
+                        lpfc_nlp_state_name(name2, sizeof(name2), state));
+        if (old_state == NLP_STE_NPR_NODE &&
+            (ndlp->nlp_flag & NLP_DELAY_TMO) != 0 &&
+            state != NLP_STE_NPR_NODE)
+                lpfc_cancel_retry_delay_tmo(phba, ndlp);
+        if (old_state == NLP_STE_UNMAPPED_NODE) {
+                ndlp->nlp_flag &= ~NLP_TGT_NO_SCSIID;
+                ndlp->nlp_type &= ~NLP_FC_NODE;
+        }
+
+        if (list_empty(&ndlp->nlp_listp)) {
+                spin_lock_irq(phba->host->host_lock);
+                list_add_tail(&ndlp->nlp_listp, &phba->fc_nodes);
+                spin_unlock_irq(phba->host->host_lock);
+        } else if (old_state)
+                lpfc_nlp_counters(phba, old_state, -1);
+
+        ndlp->nlp_state = state;
+        lpfc_nlp_counters(phba, state, 1);
+        lpfc_nlp_state_cleanup(phba, ndlp, old_state, state);
+}
+
+void
+lpfc_dequeue_node(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
+{
+        if ((ndlp->nlp_flag & NLP_DELAY_TMO) != 0)
+                lpfc_cancel_retry_delay_tmo(phba, ndlp);
+        if (ndlp->nlp_state && !list_empty(&ndlp->nlp_listp))
+                lpfc_nlp_counters(phba, ndlp->nlp_state, -1);
+        spin_lock_irq(phba->host->host_lock);
+        list_del_init(&ndlp->nlp_listp);
+        spin_unlock_irq(phba->host->host_lock);
+        lpfc_nlp_state_cleanup(phba, ndlp, ndlp->nlp_state, 0);
+}
+
+void
+lpfc_drop_node(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
+{
+        if ((ndlp->nlp_flag & NLP_DELAY_TMO) != 0)
+                lpfc_cancel_retry_delay_tmo(phba, ndlp);
+        if (ndlp->nlp_state && !list_empty(&ndlp->nlp_listp))
+                lpfc_nlp_counters(phba, ndlp->nlp_state, -1);
+        spin_lock_irq(phba->host->host_lock);
+        list_del_init(&ndlp->nlp_listp);
+        spin_unlock_irq(phba->host->host_lock);
+        lpfc_nlp_put(ndlp);
 }
 
 /*
@@ -1464,6 +1447,7 @@ lpfc_check_sli_ndlp(struct lpfc_hba * phba,
 static int
 lpfc_no_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
 {
+        LIST_HEAD(completions);
         struct lpfc_sli *psli;
         struct lpfc_sli_ring *pring;
         struct lpfc_iocbq *iocb, *next_iocb;
@@ -1492,29 +1476,29 @@ lpfc_no_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                                      (phba, pring, iocb, ndlp))) {
                                         /* It matches, so deque and call compl
                                            with an error */
-                                        list_del(&iocb->list);
+                                        list_move_tail(&iocb->list,
+                                                       &completions);
                                         pring->txq_cnt--;
-                                        if (iocb->iocb_cmpl) {
-                                                icmd = &iocb->iocb;
-                                                icmd->ulpStatus =
-                                                    IOSTAT_LOCAL_REJECT;
-                                                icmd->un.ulpWord[4] =
-                                                    IOERR_SLI_ABORTED;
-                                                spin_unlock_irq(phba->host->
-                                                                host_lock);
-                                                (iocb->iocb_cmpl) (phba,
-                                                                   iocb, iocb);
-                                                spin_lock_irq(phba->host->
-                                                              host_lock);
-                                        } else
-                                                lpfc_sli_release_iocbq(phba,
-                                                                       iocb);
                                 }
                         }
                         spin_unlock_irq(phba->host->host_lock);
 
                 }
         }
+
+        while (!list_empty(&completions)) {
+                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
+                list_del(&iocb->list);
+
+                if (iocb->iocb_cmpl) {
+                        icmd = &iocb->iocb;
+                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+                        (iocb->iocb_cmpl) (phba, iocb, iocb);
+                } else
+                        lpfc_sli_release_iocbq(phba, iocb);
+        }
+
         return 0;
 }
 
@@ -1554,7 +1538,7 @@ lpfc_unreg_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
  * so it can be freed.
  */
 static int
-lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
+lpfc_cleanup_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
 {
         LPFC_MBOXQ_t       *mb;
         LPFC_MBOXQ_t       *nextmb;
@@ -1567,17 +1551,7 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                         phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag,
                         ndlp->nlp_state, ndlp->nlp_rpi);
 
-        lpfc_nlp_list(phba, ndlp, NLP_JUST_DQ);
-
-        /*
-         * if unloading the driver - just leave the remote port in place.
-         * The driver unload will force the attached devices to detach
-         * and flush cache's w/o generating flush errors.
-         */
-        if ((ndlp->rport) && !(phba->fc_flag & FC_UNLOADING)) {
-                lpfc_unregister_remote_port(phba, ndlp);
-                ndlp->nlp_sid = NLP_NO_SID;
-        }
+        lpfc_dequeue_node(phba, ndlp);
 
         /* cleanup any ndlp on mbox q waiting for reglogin cmpl */
         if ((mb = phba->sli.mbox_active)) {
@@ -1599,11 +1573,12 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                         }
                         list_del(&mb->list);
                         mempool_free(mb, phba->mbox_mem_pool);
+                        lpfc_nlp_put(ndlp);
                 }
         }
         spin_unlock_irq(phba->host->host_lock);
 
-        lpfc_els_abort(phba,ndlp,0);
+        lpfc_els_abort(phba,ndlp);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~NLP_DELAY_TMO;
         spin_unlock_irq(phba->host->host_lock);
@@ -1624,27 +1599,27 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
  * If we are in the middle of using the nlp in the discovery state
  * machine, defer the free till we reach the end of the state machine.
  */
-int
-lpfc_nlp_remove(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
+static void
+lpfc_nlp_remove(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 {
+        struct lpfc_rport_data *rdata;
 
         if (ndlp->nlp_flag & NLP_DELAY_TMO) {
                 lpfc_cancel_retry_delay_tmo(phba, ndlp);
         }
 
-        if (ndlp->nlp_disc_refcnt) {
-                spin_lock_irq(phba->host->host_lock);
-                ndlp->nlp_flag |= NLP_DELAY_REMOVE;
-                spin_unlock_irq(phba->host->host_lock);
-        } else {
-                lpfc_freenode(phba, ndlp);
-                mempool_free( ndlp, phba->nlp_mem_pool);
+        lpfc_cleanup_node(phba, ndlp);
+
+        if ((ndlp->rport) && !(phba->fc_flag & FC_UNLOADING)) {
+                put_device(&ndlp->rport->dev);
+                rdata = ndlp->rport->dd_data;
+                rdata->pnode = NULL;
+                ndlp->rport = NULL;
         }
-        return 0;
 }
 
 static int
-lpfc_matchdid(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, uint32_t did)
+lpfc_matchdid(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp, uint32_t did)
 {
         D_ID mydid;
         D_ID ndlpdid;
@@ -1693,57 +1668,36 @@ lpfc_matchdid(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, uint32_t did)
         return 0;
 }
 
-/* Search for a nodelist entry on a specific list */
+/* Search for a nodelist entry */
 struct lpfc_nodelist *
-lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did)
+lpfc_findnode_did(struct lpfc_hba *phba, uint32_t did)
 {
         struct lpfc_nodelist *ndlp;
-        struct list_head *lists[]={&phba->fc_nlpunmap_list,
-                                   &phba->fc_nlpmap_list,
-                                   &phba->fc_plogi_list,
-                                   &phba->fc_adisc_list,
-                                   &phba->fc_reglogin_list,
-                                   &phba->fc_prli_list,
-                                   &phba->fc_npr_list,
-                                   &phba->fc_unused_list};
-        uint32_t search[]={NLP_SEARCH_UNMAPPED,
-                           NLP_SEARCH_MAPPED,
-                           NLP_SEARCH_PLOGI,
-                           NLP_SEARCH_ADISC,
-                           NLP_SEARCH_REGLOGIN,
-                           NLP_SEARCH_PRLI,
-                           NLP_SEARCH_NPR,
-                           NLP_SEARCH_UNUSED};
-        int i;
         uint32_t data1;
 
         spin_lock_irq(phba->host->host_lock);
-        for (i = 0; i < ARRAY_SIZE(lists); i++ ) {
-                if (!(order & search[i]))
-                        continue;
-                list_for_each_entry(ndlp, lists[i], nlp_listp) {
-                        if (lpfc_matchdid(phba, ndlp, did)) {
-                                data1 = (((uint32_t) ndlp->nlp_state << 24) |
-                                         ((uint32_t) ndlp->nlp_xri << 16) |
-                                         ((uint32_t) ndlp->nlp_type << 8) |
-                                         ((uint32_t) ndlp->nlp_rpi & 0xff));
-                                lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
-                                                "%d:0929 FIND node DID "
-                                                " Data: x%p x%x x%x x%x\n",
-                                                phba->brd_no,
-                                                ndlp, ndlp->nlp_DID,
-                                                ndlp->nlp_flag, data1);
-                                spin_unlock_irq(phba->host->host_lock);
-                                return ndlp;
-                        }
+        list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                if (lpfc_matchdid(phba, ndlp, did)) {
+                        data1 = (((uint32_t) ndlp->nlp_state << 24) |
+                                 ((uint32_t) ndlp->nlp_xri << 16) |
+                                 ((uint32_t) ndlp->nlp_type << 8) |
+                                 ((uint32_t) ndlp->nlp_rpi & 0xff));
+                        lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
+                                        "%d:0929 FIND node DID "
+                                        " Data: x%p x%x x%x x%x\n",
+                                        phba->brd_no,
+                                        ndlp, ndlp->nlp_DID,
+                                        ndlp->nlp_flag, data1);
+                        spin_unlock_irq(phba->host->host_lock);
+                        return ndlp;
                 }
         }
         spin_unlock_irq(phba->host->host_lock);
 
         /* FIND node did <did> NOT FOUND */
         lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
-                        "%d:0932 FIND node did x%x NOT FOUND Data: x%x\n",
-                        phba->brd_no, did, order);
+                        "%d:0932 FIND node did x%x NOT FOUND.\n",
+                        phba->brd_no, did);
         return NULL;
 }
 
@@ -1751,9 +1705,8 @@ struct lpfc_nodelist *
 lpfc_setup_disc_node(struct lpfc_hba * phba, uint32_t did)
 {
         struct lpfc_nodelist *ndlp;
-        uint32_t flg;
 
-        ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, did);
+        ndlp = lpfc_findnode_did(phba, did);
         if (!ndlp) {
                 if ((phba->fc_flag & FC_RSCN_MODE) &&
                    ((lpfc_rscn_payload_check(phba, did) == 0)))
@@ -1763,8 +1716,7 @@ lpfc_setup_disc_node(struct lpfc_hba * phba, uint32_t did)
                 if (!ndlp)
                         return NULL;
                 lpfc_nlp_init(phba, ndlp, did);
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                 ndlp->nlp_flag |= NLP_NPR_2B_DISC;
                 return ndlp;
         }
@@ -1780,11 +1732,10 @@ lpfc_setup_disc_node(struct lpfc_hba * phba, uint32_t did)
                 } else
                         ndlp = NULL;
         } else {
-                flg = ndlp->nlp_flag & NLP_LIST_MASK;
-                if ((flg == NLP_ADISC_LIST) || (flg == NLP_PLOGI_LIST))
+                if (ndlp->nlp_state == NLP_STE_ADISC_ISSUE ||
+                    ndlp->nlp_state == NLP_STE_PLOGI_ISSUE)
                         return NULL;
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                 ndlp->nlp_flag |= NLP_NPR_2B_DISC;
         }
         return ndlp;
@@ -1842,8 +1793,9 @@ lpfc_disc_start(struct lpfc_hba * phba)
         struct lpfc_sli *psli;
         LPFC_MBOXQ_t *mbox;
         struct lpfc_nodelist *ndlp, *next_ndlp;
-        uint32_t did_changed, num_sent;
+        uint32_t num_sent;
         uint32_t clear_la_pending;
+        int did_changed;
         int rc;
 
         psli = &phba->sli;
@@ -1877,14 +1829,13 @@ lpfc_disc_start(struct lpfc_hba * phba)
                         phba->fc_plogi_cnt, phba->fc_adisc_cnt);
 
         /* If our did changed, we MUST do PLOGI */
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                                nlp_listp) {
-                if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
-                        if (did_changed) {
-                                spin_lock_irq(phba->host->host_lock);
-                                ndlp->nlp_flag &= ~NLP_NPR_ADISC;
-                                spin_unlock_irq(phba->host->host_lock);
-                        }
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
+                    (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
+                    did_changed) {
+                        spin_lock_irq(phba->host->host_lock);
+                        ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                        spin_unlock_irq(phba->host->host_lock);
                 }
         }
 
@@ -1944,11 +1895,11 @@ lpfc_disc_start(struct lpfc_hba * phba)
 static void
 lpfc_free_tx(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
 {
+        LIST_HEAD(completions);
         struct lpfc_sli *psli;
         IOCB_t     *icmd;
         struct lpfc_iocbq    *iocb, *next_iocb;
         struct lpfc_sli_ring *pring;
-        struct lpfc_dmabuf   *mp;
 
         psli = &phba->sli;
         pring = &psli->ring[LPFC_ELS_RING];
@@ -1956,6 +1907,7 @@ lpfc_free_tx(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
         /* Error matching iocb on txq or txcmplq
          * First check the txq.
          */
+        spin_lock_irq(phba->host->host_lock);
         list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
                 if (iocb->context1 != ndlp) {
                         continue;
@@ -1964,9 +1916,8 @@ lpfc_free_tx(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                 if ((icmd->ulpCommand == CMD_ELS_REQUEST64_CR) ||
                     (icmd->ulpCommand == CMD_XMIT_ELS_RSP64_CX)) {
 
-                        list_del(&iocb->list);
+                        list_move_tail(&iocb->list, &completions);
                         pring->txq_cnt--;
-                        lpfc_els_free_iocb(phba, iocb);
                 }
         }
 
@@ -1978,43 +1929,22 @@ lpfc_free_tx(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
                 icmd = &iocb->iocb;
                 if ((icmd->ulpCommand == CMD_ELS_REQUEST64_CR) ||
                     (icmd->ulpCommand == CMD_XMIT_ELS_RSP64_CX)) {
+                        lpfc_sli_issue_abort_iotag(phba, pring, iocb);
+                }
+        }
+        spin_unlock_irq(phba->host->host_lock);
 
-                        iocb->iocb_cmpl = NULL;
-                        /* context2 = cmd, context2->next = rsp, context3 =
-                           bpl */
-                        if (iocb->context2) {
-                                /* Free the response IOCB before handling the
-                                   command. */
-
-                                mp = (struct lpfc_dmabuf *) (iocb->context2);
-                                mp = list_get_first(&mp->list,
-                                                    struct lpfc_dmabuf,
-                                                    list);
-                                if (mp) {
-                                        /* Delay before releasing rsp buffer to
-                                         * give UNREG mbox a chance to take
-                                         * effect.
-                                         */
-                                        list_add(&mp->list,
-                                                &phba->freebufList);
-                                }
-                                lpfc_mbuf_free(phba,
-                                               ((struct lpfc_dmabuf *)
-                                                iocb->context2)->virt,
-                                               ((struct lpfc_dmabuf *)
-                                                iocb->context2)->phys);
-                                kfree(iocb->context2);
-                        }
+        while (!list_empty(&completions)) {
+                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
+                list_del(&iocb->list);
 
-                        if (iocb->context3) {
-                                lpfc_mbuf_free(phba,
-                                               ((struct lpfc_dmabuf *)
-                                                iocb->context3)->virt,
-                                               ((struct lpfc_dmabuf *)
-                                                iocb->context3)->phys);
-                                kfree(iocb->context3);
-                        }
-                }
+                if (iocb->iocb_cmpl) {
+                        icmd = &iocb->iocb;
+                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+                        (iocb->iocb_cmpl) (phba, iocb, iocb);
+                } else
+                        lpfc_sli_release_iocbq(phba, iocb);
         }
 
         return;
@@ -2025,21 +1955,16 @@ lpfc_disc_flush_list(struct lpfc_hba * phba)
 {
         struct lpfc_nodelist *ndlp, *next_ndlp;
 
-        if (phba->fc_plogi_cnt) {
-                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_plogi_list,
-                                        nlp_listp) {
-                        lpfc_free_tx(phba, ndlp);
-                        lpfc_nlp_remove(phba, ndlp);
-                }
-        }
-        if (phba->fc_adisc_cnt) {
-                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_adisc_list,
-                                        nlp_listp) {
-                        lpfc_free_tx(phba, ndlp);
-                        lpfc_nlp_remove(phba, ndlp);
+        if (phba->fc_plogi_cnt || phba->fc_adisc_cnt) {
+                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes,
+                                         nlp_listp) {
+                        if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE ||
+                            ndlp->nlp_state == NLP_STE_ADISC_ISSUE) {
+                                lpfc_free_tx(phba, ndlp);
+                                lpfc_nlp_put(ndlp);
+                        }
                 }
         }
-        return;
 }
 
 /*****************************************************************************/
@@ -2108,11 +2033,13 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba)
                                  phba->brd_no);
 
                 /* Start discovery by sending FLOGI, clean up old rpis */
-                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                                        nlp_listp) {
+                list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes,
+                                         nlp_listp) {
+                        if (ndlp->nlp_state != NLP_STE_NPR_NODE)
+                                continue;
                         if (ndlp->nlp_type & NLP_FABRIC) {
                                 /* Clean up the ndlp on Fabric connections */
-                                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                                lpfc_drop_node(phba, ndlp);
                         } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
                                 /* Fail outstanding IO now since device
                                  * is marked for PLOGI.
@@ -2153,9 +2080,9 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba)
                                 "login\n", phba->brd_no);
 
                 /* Next look for NameServer ndlp */
-                ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, NameServer_DID);
+                ndlp = lpfc_findnode_did(phba, NameServer_DID);
                 if (ndlp)
-                        lpfc_nlp_remove(phba, ndlp);
+                        lpfc_nlp_put(ndlp);
                 /* Start discovery */
                 lpfc_disc_start(phba);
                 break;
@@ -2168,9 +2095,8 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba)
                                 phba->brd_no,
                                 phba->fc_ns_retry, LPFC_MAX_NS_RETRY);
 
-                ndlp = lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED,
-                                                                NameServer_DID);
-                if (ndlp) {
+                ndlp = lpfc_findnode_did(phba, NameServer_DID);
+                if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                         if (phba->fc_ns_retry < LPFC_MAX_NS_RETRY) {
                                 /* Try it one more time */
                                 rc = lpfc_ns_cmd(phba, ndlp, SLI_CTNS_GID_FT);
@@ -2220,6 +2146,7 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba)
                 initlinkmbox->mb.un.varInitLnk.lipsr_AL_PA = 0;
                 rc = lpfc_sli_issue_mbox(phba, initlinkmbox,
                                          (MBX_NOWAIT | MBX_STOP_IOCB));
+                lpfc_set_loopback_flag(phba);
                 if (rc == MBX_NOT_FINISHED)
                         mempool_free(initlinkmbox, phba->mbox_mem_pool);
 
@@ -2317,8 +2244,7 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         ndlp->nlp_rpi = mb->un.varWords[0];
         ndlp->nlp_type |= NLP_FABRIC;
-        ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
 
         /* Start issuing Fabric-Device Management Interface (FDMI)
          * command to 0xfffffa (FDMI well known port)
@@ -2333,87 +2259,100 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
                 mod_timer(&phba->fc_fdmitmo, jiffies + HZ * 60);
         }
 
+                                /* Mailbox took a reference to the node */
+        lpfc_nlp_put(ndlp);
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
         kfree(mp);
-        mempool_free( pmb, phba->mbox_mem_pool);
+        mempool_free(pmb, phba->mbox_mem_pool);
 
         return;
 }
 
+static int
+lpfc_filter_by_rpi(struct lpfc_nodelist *ndlp, void *param)
+{
+        uint16_t *rpi = param;
+
+        return ndlp->nlp_rpi == *rpi;
+}
+
+static int
+lpfc_filter_by_wwpn(struct lpfc_nodelist *ndlp, void *param)
+{
+        return memcmp(&ndlp->nlp_portname, param,
+                      sizeof(ndlp->nlp_portname)) == 0;
+}
+
+/*
+ * Search node lists for a remote port matching filter criteria
+ * Caller needs to hold host_lock before calling this routine.
+ */
+struct lpfc_nodelist *
+__lpfc_find_node(struct lpfc_hba *phba, node_filter filter, void *param)
+{
+        struct lpfc_nodelist *ndlp;
+
+        list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                if (ndlp->nlp_state != NLP_STE_UNUSED_NODE &&
+                    filter(ndlp, param))
+                        return ndlp;
+        }
+        return NULL;
+}
+
 /*
- * This routine looks up the ndlp  lists
- * for the given RPI. If rpi found
- * it return the node list pointer
- * else return NULL.
+ * Search node lists for a remote port matching filter criteria
+ * This routine is used when the caller does NOT have host_lock.
  */
 struct lpfc_nodelist *
+lpfc_find_node(struct lpfc_hba *phba, node_filter filter, void *param)
+{
+        struct lpfc_nodelist *ndlp;
+
+        spin_lock_irq(phba->host->host_lock);
+        ndlp = __lpfc_find_node(phba, filter, param);
+        spin_unlock_irq(phba->host->host_lock);
+        return ndlp;
+}
+
+/*
+ * This routine looks up the ndlp lists for the given RPI. If rpi found it
+ * returns the node list pointer else return NULL.
+ */
+struct lpfc_nodelist *
+__lpfc_findnode_rpi(struct lpfc_hba *phba, uint16_t rpi)
+{
+        return __lpfc_find_node(phba, lpfc_filter_by_rpi, &rpi);
+}
+
+struct lpfc_nodelist *
 lpfc_findnode_rpi(struct lpfc_hba * phba, uint16_t rpi)
 {
         struct lpfc_nodelist *ndlp;
-        struct list_head * lists[]={&phba->fc_nlpunmap_list,
-                                    &phba->fc_nlpmap_list,
-                                    &phba->fc_plogi_list,
-                                    &phba->fc_adisc_list,
-                                    &phba->fc_reglogin_list};
-        int i;
 
         spin_lock_irq(phba->host->host_lock);
-        for (i = 0; i < ARRAY_SIZE(lists); i++ )
-                list_for_each_entry(ndlp, lists[i], nlp_listp)
-                        if (ndlp->nlp_rpi == rpi) {
-                                spin_unlock_irq(phba->host->host_lock);
-                                return ndlp;
-                        }
+        ndlp = __lpfc_findnode_rpi(phba, rpi);
         spin_unlock_irq(phba->host->host_lock);
-        return NULL;
+        return ndlp;
 }
 
 /*
- * This routine looks up the ndlp  lists
- * for the given WWPN. If WWPN found
- * it return the node list pointer
- * else return NULL.
+ * This routine looks up the ndlp lists for the given WWPN. If WWPN found it
+ * returns the node list pointer else return NULL.
  */
 struct lpfc_nodelist *
-lpfc_findnode_wwpn(struct lpfc_hba * phba, uint32_t order,
-                   struct lpfc_name * wwpn)
+lpfc_findnode_wwpn(struct lpfc_hba *phba, struct lpfc_name *wwpn)
 {
         struct lpfc_nodelist *ndlp;
-        struct list_head * lists[]={&phba->fc_nlpunmap_list,
-                                    &phba->fc_nlpmap_list,
-                                    &phba->fc_npr_list,
-                                    &phba->fc_plogi_list,
-                                    &phba->fc_adisc_list,
-                                    &phba->fc_reglogin_list,
-                                    &phba->fc_prli_list};
-        uint32_t search[]={NLP_SEARCH_UNMAPPED,
-                           NLP_SEARCH_MAPPED,
-                           NLP_SEARCH_NPR,
-                           NLP_SEARCH_PLOGI,
-                           NLP_SEARCH_ADISC,
-                           NLP_SEARCH_REGLOGIN,
-                           NLP_SEARCH_PRLI};
-        int i;
 
         spin_lock_irq(phba->host->host_lock);
-        for (i = 0; i < ARRAY_SIZE(lists); i++ ) {
-                if (!(order & search[i]))
-                        continue;
-                list_for_each_entry(ndlp, lists[i], nlp_listp) {
-                        if (memcmp(&ndlp->nlp_portname, wwpn,
-                                   sizeof(struct lpfc_name)) == 0) {
-                                spin_unlock_irq(phba->host->host_lock);
-                                return ndlp;
-                        }
-                }
-        }
+        ndlp = __lpfc_find_node(phba, lpfc_filter_by_wwpn, wwpn);
         spin_unlock_irq(phba->host->host_lock);
         return NULL;
 }
 
 void
-lpfc_nlp_init(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
-                 uint32_t did)
+lpfc_nlp_init(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp, uint32_t did)
 {
         memset(ndlp, 0, sizeof (struct lpfc_nodelist));
         INIT_LIST_HEAD(&ndlp->els_retry_evt.evt_listp);
@@ -2423,5 +2362,30 @@ lpfc_nlp_init(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
         ndlp->nlp_DID = did;
         ndlp->nlp_phba = phba;
         ndlp->nlp_sid = NLP_NO_SID;
+        INIT_LIST_HEAD(&ndlp->nlp_listp);
+        kref_init(&ndlp->kref);
         return;
 }
+
+void
+lpfc_nlp_release(struct kref *kref)
+{
+        struct lpfc_nodelist *ndlp = container_of(kref, struct lpfc_nodelist,
+                                                  kref);
+        lpfc_nlp_remove(ndlp->nlp_phba, ndlp);
+        mempool_free(ndlp, ndlp->nlp_phba->nlp_mem_pool);
+}
+
+struct lpfc_nodelist *
+lpfc_nlp_get(struct lpfc_nodelist *ndlp)
+{
+        if (ndlp)
+                kref_get(&ndlp->kref);
+        return ndlp;
+}
+
+int
+lpfc_nlp_put(struct lpfc_nodelist *ndlp)
+{
+        return ndlp ? kref_put(&ndlp->kref, lpfc_nlp_release) : 0;
+}
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index f79cb6136906..2623a9bc7775 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -1078,6 +1078,8 @@ typedef struct {
 /* Start FireFly Register definitions */
 #define PCI_VENDOR_ID_EMULEX        0x10df
 #define PCI_DEVICE_ID_FIREFLY       0x1ae5
+#define PCI_DEVICE_ID_SAT_SMB       0xf011
+#define PCI_DEVICE_ID_SAT_MID       0xf015
 #define PCI_DEVICE_ID_RFLY          0xf095
 #define PCI_DEVICE_ID_PFLY          0xf098
 #define PCI_DEVICE_ID_LP101         0xf0a1
@@ -1089,6 +1091,9 @@ typedef struct {
 #define PCI_DEVICE_ID_NEPTUNE       0xf0f5
 #define PCI_DEVICE_ID_NEPTUNE_SCSP  0xf0f6
 #define PCI_DEVICE_ID_NEPTUNE_DCSP  0xf0f7
+#define PCI_DEVICE_ID_SAT           0xf100
+#define PCI_DEVICE_ID_SAT_SCSP      0xf111
+#define PCI_DEVICE_ID_SAT_DCSP      0xf112
 #define PCI_DEVICE_ID_SUPERFLY      0xf700
 #define PCI_DEVICE_ID_DRAGONFLY     0xf800
 #define PCI_DEVICE_ID_CENTAUR       0xf900
@@ -1098,6 +1103,7 @@ typedef struct {
 #define PCI_DEVICE_ID_LP10000S      0xfc00
 #define PCI_DEVICE_ID_LP11000S      0xfc10
 #define PCI_DEVICE_ID_LPE11000S     0xfc20
+#define PCI_DEVICE_ID_SAT_S         0xfc40
 #define PCI_DEVICE_ID_HELIOS        0xfd00
 #define PCI_DEVICE_ID_HELIOS_SCSP   0xfd11
 #define PCI_DEVICE_ID_HELIOS_DCSP   0xfd12
@@ -1118,6 +1124,7 @@ typedef struct {
 #define HELIOS_JEDEC_ID             0x0364
 #define ZEPHYR_JEDEC_ID             0x0577
 #define VIPER_JEDEC_ID              0x4838
+#define SATURN_JEDEC_ID             0x1004
 
 #define JEDEC_ID_MASK               0x0FFFF000
 #define JEDEC_ID_SHIFT              12
@@ -1565,7 +1572,7 @@ typedef struct {
 #define LINK_SPEED_1G   1       /* 1 Gigabaud */
 #define LINK_SPEED_2G   2       /* 2 Gigabaud */
 #define LINK_SPEED_4G   4       /* 4 Gigabaud */
-#define LINK_SPEED_8G   8       /* 4 Gigabaud */
+#define LINK_SPEED_8G   8       /* 8 Gigabaud */
 #define LINK_SPEED_10G   16      /* 10 Gigabaud */
 
 } INIT_LINK_VAR;
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index dcf6106f557a..dcb4ba0ecee1 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -386,12 +386,12 @@ lpfc_config_port_post(struct lpfc_hba * phba)
          * Setup the ring 0 (els)  timeout handler
          */
         timeout = phba->fc_ratov << 1;
-        phba->els_tmofunc.expires = jiffies + HZ * timeout;
-        add_timer(&phba->els_tmofunc);
+        mod_timer(&phba->els_tmofunc, jiffies + HZ * timeout);
 
         lpfc_init_link(phba, pmb, phba->cfg_topology, phba->cfg_link_speed);
         pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
         rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
+        lpfc_set_loopback_flag(phba);
         if (rc != MBX_SUCCESS) {
                 lpfc_printf_log(phba,
                                 KERN_ERR,
@@ -418,33 +418,6 @@ lpfc_config_port_post(struct lpfc_hba * phba)
         return (0);
 }
 
-static int
-lpfc_discovery_wait(struct lpfc_hba *phba)
-{
-        int i = 0;
-
-        while ((phba->hba_state != LPFC_HBA_READY) ||
-               (phba->num_disc_nodes) || (phba->fc_prli_sent) ||
-               ((phba->fc_map_cnt == 0) && (i<2)) ||
-               (phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE)) {
-                /* Check every second for 30 retries. */
-                i++;
-                if (i > 30) {
-                        return -ETIMEDOUT;
-                }
-                if ((i >= 15) && (phba->hba_state <= LPFC_LINK_DOWN)) {
-                        /* The link is down.  Set linkdown timeout */
-                        return -ETIMEDOUT;
-                }
-
-                /* Delay for 1 second to give discovery time to complete. */
-                msleep(1000);
-
-        }
-
-        return 0;
-}
-
 /************************************************************************/
 /*                                                                      */
 /*    lpfc_hba_down_prep                                                */
@@ -550,12 +523,15 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                  * There was a firmware error.  Take the hba offline and then
                  * attempt to restart it.
                  */
+                lpfc_offline_prep(phba);
                 lpfc_offline(phba);
                 lpfc_sli_brdrestart(phba);
                 if (lpfc_online(phba) == 0) {   /* Initialize the HBA */
                         mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
+                        lpfc_unblock_mgmt_io(phba);
                         return;
                 }
+                lpfc_unblock_mgmt_io(phba);
         } else {
                 /* The if clause above forces this code path when the status
                  * failure is a value other than FFER6.  Do not call the offline
@@ -573,7 +549,9 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                                 SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
 
                 psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+                lpfc_offline_prep(phba);
                 lpfc_offline(phba);
+                lpfc_unblock_mgmt_io(phba);
                 phba->hba_state = LPFC_HBA_ERROR;
                 lpfc_hba_down_post(phba);
         }
@@ -633,7 +611,7 @@ lpfc_handle_latt_free_mbuf:
 lpfc_handle_latt_free_mp:
         kfree(mp);
 lpfc_handle_latt_free_pmb:
-        kfree(pmb);
+        mempool_free(pmb, phba->mbox_mem_pool);
 lpfc_handle_latt_err_exit:
         /* Enable Link attention interrupts */
         spin_lock_irq(phba->host->host_lock);
@@ -925,6 +903,24 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
                 m = (typeof(m)){"LPe11000-S", max_speed,
                         "PCIe"};
                 break;
+        case PCI_DEVICE_ID_SAT:
+                m = (typeof(m)){"LPe12000", max_speed, "PCIe"};
+                break;
+        case PCI_DEVICE_ID_SAT_MID:
+                m = (typeof(m)){"LPe1250", max_speed, "PCIe"};
+                break;
+        case PCI_DEVICE_ID_SAT_SMB:
+                m = (typeof(m)){"LPe121", max_speed, "PCIe"};
+                break;
+        case PCI_DEVICE_ID_SAT_DCSP:
+                m = (typeof(m)){"LPe12002-SP", max_speed, "PCIe"};
+                break;
+        case PCI_DEVICE_ID_SAT_SCSP:
+                m = (typeof(m)){"LPe12000-SP", max_speed, "PCIe"};
+                break;
+        case PCI_DEVICE_ID_SAT_S:
+                m = (typeof(m)){"LPe12000-S", max_speed, "PCIe"};
+                break;
         default:
                 m = (typeof(m)){ NULL };
                 break;
@@ -1174,69 +1170,17 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
 }
 
 static void
-lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
+lpfc_cleanup(struct lpfc_hba * phba)
 {
         struct lpfc_nodelist *ndlp, *next_ndlp;
 
         /* clean up phba - lpfc specific */
         lpfc_can_disctmo(phba);
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpunmap_list,
-                                nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes, nlp_listp)
+                lpfc_nlp_put(ndlp);
 
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpmap_list,
-                                 nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
-
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_unused_list,
-                                nlp_listp) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-        }
-
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_plogi_list,
-                                nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
-
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_adisc_list,
-                                nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
-
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_reglogin_list,
-                                nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
+        INIT_LIST_HEAD(&phba->fc_nodes);
 
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_prli_list,
-                                nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
-
-        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                                nlp_listp) {
-                lpfc_nlp_remove(phba, ndlp);
-        }
-
-        INIT_LIST_HEAD(&phba->fc_nlpmap_list);
-        INIT_LIST_HEAD(&phba->fc_nlpunmap_list);
-        INIT_LIST_HEAD(&phba->fc_unused_list);
-        INIT_LIST_HEAD(&phba->fc_plogi_list);
-        INIT_LIST_HEAD(&phba->fc_adisc_list);
-        INIT_LIST_HEAD(&phba->fc_reglogin_list);
-        INIT_LIST_HEAD(&phba->fc_prli_list);
-        INIT_LIST_HEAD(&phba->fc_npr_list);
-
-        phba->fc_map_cnt   = 0;
-        phba->fc_unmap_cnt = 0;
-        phba->fc_plogi_cnt = 0;
-        phba->fc_adisc_cnt = 0;
-        phba->fc_reglogin_cnt = 0;
-        phba->fc_prli_cnt  = 0;
-        phba->fc_npr_cnt   = 0;
-        phba->fc_unused_cnt= 0;
         return;
 }
 
@@ -1262,21 +1206,6 @@ lpfc_stop_timer(struct lpfc_hba * phba)
 {
         struct lpfc_sli *psli = &phba->sli;
 
-        /* Instead of a timer, this has been converted to a
-         * deferred procedding list.
-         */
-        while (!list_empty(&phba->freebufList)) {
-
-                struct lpfc_dmabuf *mp = NULL;
-
-                list_remove_head((&phba->freebufList), mp,
-                                 struct lpfc_dmabuf, list);
-                if (mp) {
-                        lpfc_mbuf_free(phba, mp->virt, mp->phys);
-                        kfree(mp);
-                }
-        }
-
         del_timer_sync(&phba->fcp_poll_timer);
         del_timer_sync(&phba->fc_estabtmo);
         del_timer_sync(&phba->fc_disctmo);
@@ -1302,60 +1231,76 @@ lpfc_online(struct lpfc_hba * phba)
                        "%d:0458 Bring Adapter online\n",
                        phba->brd_no);
 
-        if (!lpfc_sli_queue_setup(phba))
+        lpfc_block_mgmt_io(phba);
+
+        if (!lpfc_sli_queue_setup(phba)) {
+                lpfc_unblock_mgmt_io(phba);
                 return 1;
+        }
 
-        if (lpfc_sli_hba_setup(phba))   /* Initialize the HBA */
+        if (lpfc_sli_hba_setup(phba)) { /* Initialize the HBA */
+                lpfc_unblock_mgmt_io(phba);
                 return 1;
+        }
 
         spin_lock_irq(phba->host->host_lock);
         phba->fc_flag &= ~FC_OFFLINE_MODE;
         spin_unlock_irq(phba->host->host_lock);
 
+        lpfc_unblock_mgmt_io(phba);
         return 0;
 }
 
-int
-lpfc_offline(struct lpfc_hba * phba)
+void
+lpfc_block_mgmt_io(struct lpfc_hba * phba)
 {
-        struct lpfc_sli_ring *pring;
-        struct lpfc_sli *psli;
         unsigned long iflag;
-        int i;
-        int cnt = 0;
 
-        if (!phba)
-                return 0;
+        spin_lock_irqsave(phba->host->host_lock, iflag);
+        phba->fc_flag |= FC_BLOCK_MGMT_IO;
+        spin_unlock_irqrestore(phba->host->host_lock, iflag);
+}
+
+void
+lpfc_unblock_mgmt_io(struct lpfc_hba * phba)
+{
+        unsigned long iflag;
+
+        spin_lock_irqsave(phba->host->host_lock, iflag);
+        phba->fc_flag &= ~FC_BLOCK_MGMT_IO;
+        spin_unlock_irqrestore(phba->host->host_lock, iflag);
+}
+
+void
+lpfc_offline_prep(struct lpfc_hba * phba)
+{
+        struct lpfc_nodelist  *ndlp, *next_ndlp;
 
         if (phba->fc_flag & FC_OFFLINE_MODE)
-                return 0;
+                return;
 
-        psli = &phba->sli;
+        lpfc_block_mgmt_io(phba);
 
         lpfc_linkdown(phba);
+
+        /* Issue an unreg_login to all nodes */
+        list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nodes, nlp_listp)
+                if (ndlp->nlp_state != NLP_STE_UNUSED_NODE)
+                        lpfc_unreg_rpi(phba, ndlp);
+
         lpfc_sli_flush_mbox_queue(phba);
+}
 
-        for (i = 0; i < psli->num_rings; i++) {
-                pring = &psli->ring[i];
-                /* The linkdown event takes 30 seconds to timeout. */
-                while (pring->txcmplq_cnt) {
-                        mdelay(10);
-                        if (cnt++ > 3000) {
-                                lpfc_printf_log(phba,
-                                        KERN_WARNING, LOG_INIT,
-                                        "%d:0466 Outstanding IO when "
-                                        "bringing Adapter offline\n",
-                                        phba->brd_no);
-                                break;
-                        }
-                }
-        }
+void
+lpfc_offline(struct lpfc_hba * phba)
+{
+        unsigned long iflag;
 
+        if (phba->fc_flag & FC_OFFLINE_MODE)
+                return;
 
         /* stop all timers associated with this hba */
         lpfc_stop_timer(phba);
-        phba->work_hba_events = 0;
-        phba->work_ha = 0;
 
         lpfc_printf_log(phba,
                        KERN_WARNING,
@@ -1366,11 +1311,12 @@ lpfc_offline(struct lpfc_hba * phba)
         /* Bring down the SLI Layer and cleanup.  The HBA is offline
            now.  */
         lpfc_sli_hba_down(phba);
-        lpfc_cleanup(phba, 1);
+        lpfc_cleanup(phba);
         spin_lock_irqsave(phba->host->host_lock, iflag);
+        phba->work_hba_events = 0;
+        phba->work_ha = 0;
         phba->fc_flag |= FC_OFFLINE_MODE;
         spin_unlock_irqrestore(phba->host->host_lock, iflag);
-        return 0;
 }
 
 /******************************************************************************
@@ -1407,6 +1353,156 @@ lpfc_scsi_free(struct lpfc_hba * phba)
         return 0;
 }
 
+void lpfc_remove_device(struct lpfc_hba *phba)
+{
+        unsigned long iflag;
+
+        lpfc_free_sysfs_attr(phba);
+
+        spin_lock_irqsave(phba->host->host_lock, iflag);
+        phba->fc_flag |= FC_UNLOADING;
+
+        spin_unlock_irqrestore(phba->host->host_lock, iflag);
+
+        fc_remove_host(phba->host);
+        scsi_remove_host(phba->host);
+
+        kthread_stop(phba->worker_thread);
+
+        /*
+         * Bring down the SLI Layer. This step disable all interrupts,
+         * clears the rings, discards all mailbox commands, and resets
+         * the HBA.
+         */
+        lpfc_sli_hba_down(phba);
+        lpfc_sli_brdrestart(phba);
+
+        /* Release the irq reservation */
+        free_irq(phba->pcidev->irq, phba);
+        pci_disable_msi(phba->pcidev);
+
+        lpfc_cleanup(phba);
+        lpfc_stop_timer(phba);
+        phba->work_hba_events = 0;
+
+        /*
+         * Call scsi_free before mem_free since scsi bufs are released to their
+         * corresponding pools here.
+         */
+        lpfc_scsi_free(phba);
+        lpfc_mem_free(phba);
+
+        /* Free resources associated with SLI2 interface */
+        dma_free_coherent(&phba->pcidev->dev, SLI2_SLIM_SIZE,
+                          phba->slim2p, phba->slim2p_mapping);
+
+        /* unmap adapter SLIM and Control Registers */
+        iounmap(phba->ctrl_regs_memmap_p);
+        iounmap(phba->slim_memmap_p);
+
+        pci_release_regions(phba->pcidev);
+        pci_disable_device(phba->pcidev);
+
+        idr_remove(&lpfc_hba_index, phba->brd_no);
+        scsi_host_put(phba->host);
+}
+
+void lpfc_scan_start(struct Scsi_Host *host)
+{
+        struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata;
+
+        if (lpfc_alloc_sysfs_attr(phba))
+                goto error;
+
+        phba->MBslimaddr = phba->slim_memmap_p;
+        phba->HAregaddr = phba->ctrl_regs_memmap_p + HA_REG_OFFSET;
+        phba->CAregaddr = phba->ctrl_regs_memmap_p + CA_REG_OFFSET;
+        phba->HSregaddr = phba->ctrl_regs_memmap_p + HS_REG_OFFSET;
+        phba->HCregaddr = phba->ctrl_regs_memmap_p + HC_REG_OFFSET;
+
+        if (lpfc_sli_hba_setup(phba))
+                goto error;
+
+        /*
+         * hba setup may have changed the hba_queue_depth so we need to adjust
+         * the value of can_queue.
+         */
+        host->can_queue = phba->cfg_hba_queue_depth - 10;
+        return;
+
+error:
+        lpfc_remove_device(phba);
+}
+
+int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
+{
+        struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata;
+
+        if (!phba->host)
+                return 1;
+        if (time >= 30 * HZ)
+                goto finished;
+
+        if (phba->hba_state != LPFC_HBA_READY)
+                return 0;
+        if (phba->num_disc_nodes || phba->fc_prli_sent)
+                return 0;
+        if ((phba->fc_map_cnt == 0) && (time < 2 * HZ))
+                return 0;
+        if (phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE)
+                return 0;
+        if ((phba->hba_state > LPFC_LINK_DOWN) || (time < 15 * HZ))
+                return 0;
+
+finished:
+        if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
+                spin_lock_irq(shost->host_lock);
+                lpfc_poll_start_timer(phba);
+                spin_unlock_irq(shost->host_lock);
+        }
+
+        /*
+         * set fixed host attributes
+         * Must done after lpfc_sli_hba_setup()
+         */
+
+        fc_host_node_name(shost) = wwn_to_u64(phba->fc_nodename.u.wwn);
+        fc_host_port_name(shost) = wwn_to_u64(phba->fc_portname.u.wwn);
+        fc_host_supported_classes(shost) = FC_COS_CLASS3;
+
+        memset(fc_host_supported_fc4s(shost), 0,
+                sizeof(fc_host_supported_fc4s(shost)));
+        fc_host_supported_fc4s(shost)[2] = 1;
+        fc_host_supported_fc4s(shost)[7] = 1;
+
+        lpfc_get_hba_sym_node_name(phba, fc_host_symbolic_name(shost));
+
+        fc_host_supported_speeds(shost) = 0;
+        if (phba->lmt & LMT_10Gb)
+                fc_host_supported_speeds(shost) |= FC_PORTSPEED_10GBIT;
+        if (phba->lmt & LMT_4Gb)
+                fc_host_supported_speeds(shost) |= FC_PORTSPEED_4GBIT;
+        if (phba->lmt & LMT_2Gb)
+                fc_host_supported_speeds(shost) |= FC_PORTSPEED_2GBIT;
+        if (phba->lmt & LMT_1Gb)
+                fc_host_supported_speeds(shost) |= FC_PORTSPEED_1GBIT;
+
+        fc_host_maxframe_size(shost) =
+                ((((uint32_t) phba->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
+                 (uint32_t) phba->fc_sparam.cmn.bbRcvSizeLsb);
+
+        /* This value is also unchanging */
+        memset(fc_host_active_fc4s(shost), 0,
+                sizeof(fc_host_active_fc4s(shost)));
+        fc_host_active_fc4s(shost)[2] = 1;
+        fc_host_active_fc4s(shost)[7] = 1;
+
+        spin_lock_irq(shost->host_lock);
+        phba->fc_flag &= ~FC_LOADING;
+        spin_unlock_irq(shost->host_lock);
+
+        return 1;
+}
 
 static int __devinit
 lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
@@ -1445,9 +1541,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                 goto out_put_host;
 
         host->unique_id = phba->brd_no;
-        INIT_LIST_HEAD(&phba->ctrspbuflist);
-        INIT_LIST_HEAD(&phba->rnidrspbuflist);
-        INIT_LIST_HEAD(&phba->freebufList);
 
         /* Initialize timers used by driver */
         init_timer(&phba->fc_estabtmo);
@@ -1482,16 +1575,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         host->max_lun = phba->cfg_max_luns;
         host->this_id = -1;
 
-        /* Initialize all internally managed lists. */
-        INIT_LIST_HEAD(&phba->fc_nlpmap_list);
-        INIT_LIST_HEAD(&phba->fc_nlpunmap_list);
-        INIT_LIST_HEAD(&phba->fc_unused_list);
-        INIT_LIST_HEAD(&phba->fc_plogi_list);
-        INIT_LIST_HEAD(&phba->fc_adisc_list);
-        INIT_LIST_HEAD(&phba->fc_reglogin_list);
-        INIT_LIST_HEAD(&phba->fc_prli_list);
-        INIT_LIST_HEAD(&phba->fc_npr_list);
-
+        INIT_LIST_HEAD(&phba->fc_nodes);
 
         pci_set_master(pdev);
         retval = pci_set_mwi(pdev);
@@ -1609,13 +1693,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 
         host->transportt = lpfc_transport_template;
         pci_set_drvdata(pdev, host);
-        error = scsi_add_host(host, &pdev->dev);
-        if (error)
-                goto out_kthread_stop;
-
-        error = lpfc_alloc_sysfs_attr(phba);
-        if (error)
-                goto out_remove_host;
 
         if (phba->cfg_use_msi) {
                 error = pci_enable_msi(phba->pcidev);
@@ -1631,73 +1708,15 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                 lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                         "%d:0451 Enable interrupt handler failed\n",
                         phba->brd_no);
-                goto out_free_sysfs_attr;
+                goto out_kthread_stop;
         }
-        phba->MBslimaddr = phba->slim_memmap_p;
-        phba->HAregaddr = phba->ctrl_regs_memmap_p + HA_REG_OFFSET;
-        phba->CAregaddr = phba->ctrl_regs_memmap_p + CA_REG_OFFSET;
-        phba->HSregaddr = phba->ctrl_regs_memmap_p + HS_REG_OFFSET;
-        phba->HCregaddr = phba->ctrl_regs_memmap_p + HC_REG_OFFSET;
 
-        error = lpfc_sli_hba_setup(phba);
-        if (error) {
-                error = -ENODEV;
+        error = scsi_add_host(host, &pdev->dev);
+        if (error)
                 goto out_free_irq;
-        }
-
-        /*
-         * hba setup may have changed the hba_queue_depth so we need to adjust
-         * the value of can_queue.
-         */
-        host->can_queue = phba->cfg_hba_queue_depth - 10;
-
-        lpfc_discovery_wait(phba);
 
-        if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-                spin_lock_irq(phba->host->host_lock);
-                lpfc_poll_start_timer(phba);
-                spin_unlock_irq(phba->host->host_lock);
-        }
+        scsi_scan_host(host);
 
-        /*
-         * set fixed host attributes
-         * Must done after lpfc_sli_hba_setup()
-         */
-
-        fc_host_node_name(host) = wwn_to_u64(phba->fc_nodename.u.wwn);
-        fc_host_port_name(host) = wwn_to_u64(phba->fc_portname.u.wwn);
-        fc_host_supported_classes(host) = FC_COS_CLASS3;
-
-        memset(fc_host_supported_fc4s(host), 0,
-                sizeof(fc_host_supported_fc4s(host)));
-        fc_host_supported_fc4s(host)[2] = 1;
-        fc_host_supported_fc4s(host)[7] = 1;
-
-        lpfc_get_hba_sym_node_name(phba, fc_host_symbolic_name(host));
-
-        fc_host_supported_speeds(host) = 0;
-        if (phba->lmt & LMT_10Gb)
-                fc_host_supported_speeds(host) |= FC_PORTSPEED_10GBIT;
-        if (phba->lmt & LMT_4Gb)
-                fc_host_supported_speeds(host) |= FC_PORTSPEED_4GBIT;
-        if (phba->lmt & LMT_2Gb)
-                fc_host_supported_speeds(host) |= FC_PORTSPEED_2GBIT;
-        if (phba->lmt & LMT_1Gb)
-                fc_host_supported_speeds(host) |= FC_PORTSPEED_1GBIT;
-
-        fc_host_maxframe_size(host) =
-                ((((uint32_t) phba->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
-                 (uint32_t) phba->fc_sparam.cmn.bbRcvSizeLsb);
-
-        /* This value is also unchanging */
-        memset(fc_host_active_fc4s(host), 0,
-                sizeof(fc_host_active_fc4s(host)));
-        fc_host_active_fc4s(host)[2] = 1;
-        fc_host_active_fc4s(host)[7] = 1;
-
-        spin_lock_irq(phba->host->host_lock);
-        phba->fc_flag &= ~FC_LOADING;
-        spin_unlock_irq(phba->host->host_lock);
         return 0;
 
 out_free_irq:
@@ -1705,11 +1724,6 @@ out_free_irq:
         phba->work_hba_events = 0;
         free_irq(phba->pcidev->irq, phba);
         pci_disable_msi(phba->pcidev);
-out_free_sysfs_attr:
-        lpfc_free_sysfs_attr(phba);
-out_remove_host:
-        fc_remove_host(phba->host);
-        scsi_remove_host(phba->host);
 out_kthread_stop:
         kthread_stop(phba->worker_thread);
 out_free_iocbq:
@@ -1747,56 +1761,8 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
 {
         struct Scsi_Host   *host = pci_get_drvdata(pdev);
         struct lpfc_hba    *phba = (struct lpfc_hba *)host->hostdata;
-        unsigned long iflag;
-
-        lpfc_free_sysfs_attr(phba);
-
-        spin_lock_irqsave(phba->host->host_lock, iflag);
-        phba->fc_flag |= FC_UNLOADING;
-
-        spin_unlock_irqrestore(phba->host->host_lock, iflag);
 
-        fc_remove_host(phba->host);
-        scsi_remove_host(phba->host);
-
-        kthread_stop(phba->worker_thread);
-
-        /*
-         * Bring down the SLI Layer. This step disable all interrupts,
-         * clears the rings, discards all mailbox commands, and resets
-         * the HBA.
-         */
-        lpfc_sli_hba_down(phba);
-        lpfc_sli_brdrestart(phba);
-
-        /* Release the irq reservation */
-        free_irq(phba->pcidev->irq, phba);
-        pci_disable_msi(phba->pcidev);
-
-        lpfc_cleanup(phba, 0);
-        lpfc_stop_timer(phba);
-        phba->work_hba_events = 0;
-
-        /*
-         * Call scsi_free before mem_free since scsi bufs are released to their
-         * corresponding pools here.
-         */
-        lpfc_scsi_free(phba);
-        lpfc_mem_free(phba);
-
-        /* Free resources associated with SLI2 interface */
-        dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE,
-                          phba->slim2p, phba->slim2p_mapping);
-
-        /* unmap adapter SLIM and Control Registers */
-        iounmap(phba->ctrl_regs_memmap_p);
-        iounmap(phba->slim_memmap_p);
-
-        pci_release_regions(phba->pcidev);
-        pci_disable_device(phba->pcidev);
-
-        idr_remove(&lpfc_hba_index, phba->brd_no);
-        scsi_host_put(phba->host);
+        lpfc_remove_device(phba);
 
         pci_set_drvdata(pdev, NULL);
 }
@@ -1941,6 +1907,18 @@ static struct pci_device_id lpfc_id_table[] = {
                 PCI_ANY_ID, PCI_ANY_ID, },
         {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
                 PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_DCSP,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SCSP,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
+                PCI_ANY_ID, PCI_ANY_ID, },
         { 0 }
 };
 
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 4d016c2a1b26..8041c3f06f7b 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -212,6 +212,7 @@ lpfc_init_link(struct lpfc_hba * phba,
                         case LINK_SPEED_1G:
                         case LINK_SPEED_2G:
                         case LINK_SPEED_4G:
+                        case LINK_SPEED_8G:
                                 mb->un.varInitLnk.link_flags |=
                                                         FLAGS_LINK_SPEED;
                                 mb->un.varInitLnk.link_speed = linkspeed;
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 0c7e731dc45a..b309841e3846 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -168,14 +168,13 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba,
  * routine effectively results in a "software abort".
  */
 int
-lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
-        int send_abts)
+lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp)
 {
+        LIST_HEAD(completions);
         struct lpfc_sli *psli;
         struct lpfc_sli_ring *pring;
         struct lpfc_iocbq *iocb, *next_iocb;
-        IOCB_t *icmd;
-        int    found = 0;
+        IOCB_t *cmd;
 
         /* Abort outstanding I/O on NPort <nlp_DID> */
         lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
@@ -188,75 +187,39 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
         pring = &psli->ring[LPFC_ELS_RING];
 
         /* First check the txq */
-        do {
-                found = 0;
-                spin_lock_irq(phba->host->host_lock);
-                list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
-                        /* Check to see if iocb matches the nport we are looking
-                           for */
-                        if ((lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))) {
-                                found = 1;
-                                /* It matches, so deque and call compl with an
-                                   error */
-                                list_del(&iocb->list);
-                                pring->txq_cnt--;
-                                if (iocb->iocb_cmpl) {
-                                        icmd = &iocb->iocb;
-                                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                                        icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                                        spin_unlock_irq(phba->host->host_lock);
-                                        (iocb->iocb_cmpl) (phba, iocb, iocb);
-                                        spin_lock_irq(phba->host->host_lock);
-                                } else
-                                        lpfc_sli_release_iocbq(phba, iocb);
-                                break;
-                        }
+        spin_lock_irq(phba->host->host_lock);
+        list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
+                /* Check to see if iocb matches the nport we are looking
+                   for */
+                if (lpfc_check_sli_ndlp(phba, pring, iocb, ndlp)) {
+                        /* It matches, so deque and call compl with an
+                           error */
+                        list_move_tail(&iocb->list, &completions);
+                        pring->txq_cnt--;
                 }
-                spin_unlock_irq(phba->host->host_lock);
-        } while (found);
+        }
 
-        /* Everything on txcmplq will be returned by firmware
-         * with a no rpi / linkdown / abort error.  For ring 0,
-         * ELS discovery, we want to get rid of it right here.
-         */
         /* Next check the txcmplq */
-        do {
-                found = 0;
-                spin_lock_irq(phba->host->host_lock);
-                list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq,
-                                         list) {
-                        /* Check to see if iocb matches the nport we are looking
-                           for */
-                        if ((lpfc_check_sli_ndlp (phba, pring, iocb, ndlp))) {
-                                found = 1;
-                                /* It matches, so deque and call compl with an
-                                   error */
-                                list_del(&iocb->list);
-                                pring->txcmplq_cnt--;
-
-                                icmd = &iocb->iocb;
-                                /* If the driver is completing an ELS
-                                 * command early, flush it out of the firmware.
-                                 */
-                                if (send_abts &&
-                                   (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) &&
-                                   (icmd->un.elsreq64.bdl.ulpIoTag32)) {
-                                        lpfc_sli_issue_abort_iotag32(phba,
-                                                             pring, iocb);
-                                }
-                                if (iocb->iocb_cmpl) {
-                                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                                        icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                                        spin_unlock_irq(phba->host->host_lock);
-                                        (iocb->iocb_cmpl) (phba, iocb, iocb);
-                                        spin_lock_irq(phba->host->host_lock);
-                                } else
-                                        lpfc_sli_release_iocbq(phba, iocb);
-                                break;
-                        }
-                }
-                spin_unlock_irq(phba->host->host_lock);
-        } while(found);
+        list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list) {
+                /* Check to see if iocb matches the nport we are looking
+                   for */
+                if (lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))
+                        lpfc_sli_issue_abort_iotag(phba, pring, iocb);
+        }
+        spin_unlock_irq(phba->host->host_lock);
+
+        while (!list_empty(&completions)) {
+                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
+                cmd = &iocb->iocb;
+                list_del(&iocb->list);
+
+                if (iocb->iocb_cmpl) {
+                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+                        (iocb->iocb_cmpl) (phba, iocb, iocb);
+                } else
+                        lpfc_sli_release_iocbq(phba, iocb);
+        }
 
         /* If we are delaying issuing an ELS command, cancel it */
         if (ndlp->nlp_flag & NLP_DELAY_TMO)
@@ -390,7 +353,10 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
          * queue this mbox command to be processed later.
          */
         mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
-        mbox->context2  = ndlp;
+        /*
+         * mbox->context2 = lpfc_nlp_get(ndlp) deferred until mailbox
+         * command issued in lpfc_cmpl_els_acc().
+         */
         ndlp->nlp_flag |= (NLP_ACC_REGLOGIN | NLP_RCV_PLOGI);
 
         /*
@@ -404,7 +370,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
          */
         if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) {
                 /* software abort outstanding PLOGI */
-                lpfc_els_abort(phba, ndlp, 1);
+                lpfc_els_abort(phba, ndlp);
         }
 
         lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox, 0);
@@ -471,8 +437,7 @@ lpfc_rcv_padisc(struct lpfc_hba * phba,
         spin_unlock_irq(phba->host->host_lock);
         ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
         ndlp->nlp_prev_state = ndlp->nlp_state;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         return 0;
 }
 
@@ -502,12 +467,10 @@ lpfc_rcv_logo(struct lpfc_hba * phba,
 
                 ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
                 ndlp->nlp_prev_state = ndlp->nlp_state;
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         } else {
                 ndlp->nlp_prev_state = ndlp->nlp_state;
-                ndlp->nlp_state = NLP_STE_UNUSED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNUSED_NODE);
         }
 
         spin_lock_irq(phba->host->host_lock);
@@ -601,11 +564,10 @@ lpfc_rcv_plogi_unused_node(struct lpfc_hba * phba,
 
         if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
                 ndlp->nlp_prev_state = NLP_STE_UNUSED_NODE;
-                ndlp->nlp_state = NLP_STE_UNUSED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNUSED_NODE);
                 return ndlp->nlp_state;
         }
-        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+        lpfc_drop_node(phba, ndlp);
         return NLP_STE_FREED_NODE;
 }
 
@@ -614,7 +576,7 @@ lpfc_rcv_els_unused_node(struct lpfc_hba * phba,
                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
         lpfc_issue_els_logo(phba, ndlp, 0);
-        lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNUSED_NODE);
         return ndlp->nlp_state;
 }
 
@@ -630,7 +592,7 @@ lpfc_rcv_logo_unused_node(struct lpfc_hba * phba,
         ndlp->nlp_flag |= NLP_LOGO_ACC;
         spin_unlock_irq(phba->host->host_lock);
         lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-        lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNUSED_NODE);
 
         return ndlp->nlp_state;
 }
@@ -639,7 +601,7 @@ static uint32_t
 lpfc_cmpl_logo_unused_node(struct lpfc_hba * phba,
                           struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
-        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+        lpfc_drop_node(phba, ndlp);
         return NLP_STE_FREED_NODE;
 }
 
@@ -647,7 +609,7 @@ static uint32_t
 lpfc_device_rm_unused_node(struct lpfc_hba * phba,
                            struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
-        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+        lpfc_drop_node(phba, ndlp);
         return NLP_STE_FREED_NODE;
 }
 
@@ -697,7 +659,7 @@ lpfc_rcv_logo_plogi_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         /* software abort outstanding PLOGI */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO);
         return ndlp->nlp_state;
@@ -712,7 +674,7 @@ lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         /* software abort outstanding PLOGI */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         if (evt == NLP_EVT_RCV_LOGO) {
                 lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
@@ -727,8 +689,7 @@ lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba,
         spin_unlock_irq(phba->host->host_lock);
         ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
         ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
 
         return ndlp->nlp_state;
 }
@@ -803,32 +764,26 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
                 goto out;
 
         lpfc_unreg_rpi(phba, ndlp);
-        if (lpfc_reg_login
-            (phba, irsp->un.elsreq64.remoteID,
-             (uint8_t *) sp, mbox, 0) == 0) {
+        if (lpfc_reg_login(phba, irsp->un.elsreq64.remoteID, (uint8_t *) sp,
+                           mbox, 0) == 0) {
                 switch (ndlp->nlp_DID) {
                 case NameServer_DID:
-                        mbox->mbox_cmpl =
-                                lpfc_mbx_cmpl_ns_reg_login;
+                        mbox->mbox_cmpl = lpfc_mbx_cmpl_ns_reg_login;
                         break;
                 case FDMI_DID:
-                        mbox->mbox_cmpl =
-                                lpfc_mbx_cmpl_fdmi_reg_login;
+                        mbox->mbox_cmpl = lpfc_mbx_cmpl_fdmi_reg_login;
                         break;
                 default:
-                        mbox->mbox_cmpl =
-                                lpfc_mbx_cmpl_reg_login;
+                        mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
                 }
-                mbox->context2 = ndlp;
+                mbox->context2 = lpfc_nlp_get(ndlp);
                 if (lpfc_sli_issue_mbox(phba, mbox,
                                         (MBX_NOWAIT | MBX_STOP_IOCB))
                     != MBX_NOT_FINISHED) {
-                        ndlp->nlp_state =
-                                NLP_STE_REG_LOGIN_ISSUE;
-                        lpfc_nlp_list(phba, ndlp,
-                                      NLP_REGLOGIN_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_REG_LOGIN_ISSUE);
                         return ndlp->nlp_state;
                 }
+                lpfc_nlp_put(ndlp);
                 mp = (struct lpfc_dmabuf *)mbox->context1;
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
@@ -841,7 +796,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
  out:
         /* Free this node since the driver cannot login or has the wrong
            sparm */
-        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+        lpfc_drop_node(phba, ndlp);
         return NLP_STE_FREED_NODE;
 }
 
@@ -855,9 +810,9 @@ lpfc_device_rm_plogi_issue(struct lpfc_hba * phba,
         }
         else {
                 /* software abort outstanding PLOGI */
-                lpfc_els_abort(phba, ndlp, 1);
+                lpfc_els_abort(phba, ndlp);
 
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
 }
@@ -868,11 +823,10 @@ lpfc_device_recov_plogi_issue(struct lpfc_hba * phba,
                             uint32_t evt)
 {
         /* software abort outstanding PLOGI */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         spin_unlock_irq(phba->host->host_lock);
@@ -888,7 +842,7 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_hba * phba,
         struct lpfc_iocbq *cmdiocb;
 
         /* software abort outstanding ADISC */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         cmdiocb = (struct lpfc_iocbq *) arg;
 
@@ -896,8 +850,7 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_hba * phba,
                 return ndlp->nlp_state;
         }
         ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
-        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
         lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
 
         return ndlp->nlp_state;
@@ -926,7 +879,7 @@ lpfc_rcv_logo_adisc_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         /* software abort outstanding ADISC */
-        lpfc_els_abort(phba, ndlp, 0);
+        lpfc_els_abort(phba, ndlp);
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO);
         return ndlp->nlp_state;
@@ -987,20 +940,17 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
                 memset(&ndlp->nlp_portname, 0, sizeof (struct lpfc_name));
 
                 ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                 lpfc_unreg_rpi(phba, ndlp);
                 return ndlp->nlp_state;
         }
 
         if (ndlp->nlp_type & NLP_FCP_TARGET) {
                 ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
-                ndlp->nlp_state = NLP_STE_MAPPED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_MAPPED_NODE);
         } else {
                 ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
-                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
         }
         return ndlp->nlp_state;
 }
@@ -1016,9 +966,9 @@ lpfc_device_rm_adisc_issue(struct lpfc_hba * phba,
         }
         else {
                 /* software abort outstanding ADISC */
-                lpfc_els_abort(phba, ndlp, 1);
+                lpfc_els_abort(phba, ndlp);
 
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
 }
@@ -1029,11 +979,10 @@ lpfc_device_recov_adisc_issue(struct lpfc_hba * phba,
                             uint32_t evt)
 {
         /* software abort outstanding ADISC */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         ndlp->nlp_flag |= NLP_NPR_ADISC;
@@ -1074,9 +1023,36 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_hba * phba,
                              uint32_t evt)
 {
         struct lpfc_iocbq *cmdiocb;
+        LPFC_MBOXQ_t      *mb;
+        LPFC_MBOXQ_t      *nextmb;
+        struct lpfc_dmabuf *mp;
 
         cmdiocb = (struct lpfc_iocbq *) arg;
 
+        /* cleanup any ndlp on mbox q waiting for reglogin cmpl */
+        if ((mb = phba->sli.mbox_active)) {
+                if ((mb->mb.mbxCommand == MBX_REG_LOGIN64) &&
+                   (ndlp == (struct lpfc_nodelist *) mb->context2)) {
+                        mb->context2 = NULL;
+                        mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                }
+        }
+
+        spin_lock_irq(phba->host->host_lock);
+        list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {
+                if ((mb->mb.mbxCommand == MBX_REG_LOGIN64) &&
+                   (ndlp == (struct lpfc_nodelist *) mb->context2)) {
+                        mp = (struct lpfc_dmabuf *) (mb->context1);
+                        if (mp) {
+                                lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                                kfree(mp);
+                        }
+                        list_del(&mb->list);
+                        mempool_free(mb, phba->mbox_mem_pool);
+                }
+        }
+        spin_unlock_irq(phba->host->host_lock);
+
         lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO);
         return ndlp->nlp_state;
 }
@@ -1133,8 +1109,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
                  */
                 if (mb->mbxStatus == MBXERR_RPI_FULL) {
                         ndlp->nlp_prev_state = NLP_STE_UNUSED_NODE;
-                        ndlp->nlp_state = NLP_STE_UNUSED_NODE;
-                        lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNUSED_NODE);
                         return ndlp->nlp_state;
                 }
 
@@ -1147,8 +1122,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
 
                 lpfc_issue_els_logo(phba, ndlp, 0);
                 ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
-                ndlp->nlp_state = NLP_STE_NPR_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
                 return ndlp->nlp_state;
         }
 
@@ -1157,13 +1131,11 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
         /* Only if we are not a fabric nport do we issue PRLI */
         if (!(ndlp->nlp_type & NLP_FABRIC)) {
                 ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
-                ndlp->nlp_state = NLP_STE_PRLI_ISSUE;
-                lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_PRLI_ISSUE);
                 lpfc_issue_els_prli(phba, ndlp, 0);
         } else {
                 ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
-                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
         }
         return ndlp->nlp_state;
 }
@@ -1178,7 +1150,7 @@ lpfc_device_rm_reglogin_issue(struct lpfc_hba * phba,
                 return ndlp->nlp_state;
         }
         else {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
 }
@@ -1189,8 +1161,7 @@ lpfc_device_recov_reglogin_issue(struct lpfc_hba * phba,
                                uint32_t evt)
 {
         ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         spin_unlock_irq(phba->host->host_lock);
@@ -1230,7 +1201,7 @@ lpfc_rcv_logo_prli_issue(struct lpfc_hba * phba,
         cmdiocb = (struct lpfc_iocbq *) arg;
 
         /* Software abort outstanding PRLI before sending acc */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO);
         return ndlp->nlp_state;
@@ -1279,8 +1250,7 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
         irsp = &rspiocb->iocb;
         if (irsp->ulpStatus) {
                 ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
-                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_UNMAPPED_NODE);
                 return ndlp->nlp_state;
         }
 
@@ -1298,8 +1268,7 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
         }
 
         ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
-        ndlp->nlp_state = NLP_STE_MAPPED_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_MAPPED_NODE);
         return ndlp->nlp_state;
 }
 
@@ -1330,9 +1299,9 @@ lpfc_device_rm_prli_issue(struct lpfc_hba * phba,
         }
         else {
                 /* software abort outstanding PLOGI */
-                lpfc_els_abort(phba, ndlp, 1);
+                lpfc_els_abort(phba, ndlp);
 
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
 }
@@ -1359,11 +1328,10 @@ lpfc_device_recov_prli_issue(struct lpfc_hba * phba,
                            struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
         /* software abort outstanding PRLI */
-        lpfc_els_abort(phba, ndlp, 1);
+        lpfc_els_abort(phba, ndlp);
 
         ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         spin_unlock_irq(phba->host->host_lock);
@@ -1436,8 +1404,7 @@ lpfc_device_recov_unmap_node(struct lpfc_hba * phba,
                            struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
         ndlp->nlp_prev_state = NLP_STE_UNMAPPED_NODE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         lpfc_disc_set_adisc(phba, ndlp);
 
@@ -1518,8 +1485,7 @@ lpfc_device_recov_mapped_node(struct lpfc_hba * phba,
                             uint32_t evt)
 {
         ndlp->nlp_prev_state = NLP_STE_MAPPED_NODE;
-        ndlp->nlp_state = NLP_STE_NPR_NODE;
-        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+        lpfc_nlp_set_state(phba, ndlp, NLP_STE_NPR_NODE);
         spin_lock_irq(phba->host->host_lock);
         ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
         spin_unlock_irq(phba->host->host_lock);
@@ -1551,8 +1517,7 @@ lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba,
         /* send PLOGI immediately, move to PLOGI issue state */
         if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
                 ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
                 lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
         }
 
@@ -1580,16 +1545,13 @@ lpfc_rcv_prli_npr_node(struct lpfc_hba * phba,
                         ndlp->nlp_flag &= ~NLP_NPR_ADISC;
                         spin_unlock_irq(phba->host->host_lock);
                         ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                        ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_ADISC_ISSUE);
                         lpfc_issue_els_adisc(phba, ndlp, 0);
                 } else {
                         ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
                         lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
                 }
-
         }
         return ndlp->nlp_state;
 }
@@ -1627,13 +1589,11 @@ lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba,
                 !(ndlp->nlp_flag & NLP_NPR_2B_DISC)){
                 if (ndlp->nlp_flag & NLP_NPR_ADISC) {
                         ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                        ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_ADISC_ISSUE);
                         lpfc_issue_els_adisc(phba, ndlp, 0);
                 } else {
                         ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
-                        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+                        lpfc_nlp_set_state(phba, ndlp, NLP_STE_PLOGI_ISSUE);
                         lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0);
                 }
         }
@@ -1682,7 +1642,7 @@ lpfc_cmpl_plogi_npr_node(struct lpfc_hba * phba,
 
         irsp = &rspiocb->iocb;
         if (irsp->ulpStatus) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
         return ndlp->nlp_state;
@@ -1700,7 +1660,7 @@ lpfc_cmpl_prli_npr_node(struct lpfc_hba * phba,
 
         irsp = &rspiocb->iocb;
         if (irsp->ulpStatus && (ndlp->nlp_flag & NLP_NODEV_REMOVE)) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
         return ndlp->nlp_state;
@@ -1728,7 +1688,7 @@ lpfc_cmpl_adisc_npr_node(struct lpfc_hba * phba,
 
         irsp = &rspiocb->iocb;
         if (irsp->ulpStatus && (ndlp->nlp_flag & NLP_NODEV_REMOVE)) {
-                lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                lpfc_drop_node(phba, ndlp);
                 return NLP_STE_FREED_NODE;
         }
         return ndlp->nlp_state;
@@ -1749,7 +1709,7 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_hba * phba,
                 ndlp->nlp_rpi = mb->un.varWords[0];
         else {
                 if (ndlp->nlp_flag & NLP_NODEV_REMOVE) {
-                        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                        lpfc_drop_node(phba, ndlp);
                         return NLP_STE_FREED_NODE;
                 }
         }
@@ -1765,7 +1725,7 @@ lpfc_device_rm_npr_node(struct lpfc_hba * phba,
                 ndlp->nlp_flag |= NLP_NODEV_REMOVE;
                 return ndlp->nlp_state;
         }
-        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+        lpfc_drop_node(phba, ndlp);
         return NLP_STE_FREED_NODE;
 }
 
@@ -1964,7 +1924,7 @@ lpfc_disc_state_machine(struct lpfc_hba * phba,
         uint32_t(*func) (struct lpfc_hba *, struct lpfc_nodelist *, void *,
                          uint32_t);
 
-        ndlp->nlp_disc_refcnt++;
+        lpfc_nlp_get(ndlp);
         cur_state = ndlp->nlp_state;
 
         /* DSM in event <evt> on NPort <nlp_DID> in state <cur_state> */
@@ -1987,18 +1947,7 @@ lpfc_disc_state_machine(struct lpfc_hba * phba,
                        phba->brd_no,
                        rc, ndlp->nlp_DID, ndlp->nlp_flag);
 
-        ndlp->nlp_disc_refcnt--;
+        lpfc_nlp_put(ndlp);
 
-        /* Check to see if ndlp removal is deferred */
-        if ((ndlp->nlp_disc_refcnt == 0)
-            && (ndlp->nlp_flag & NLP_DELAY_REMOVE)) {
-                spin_lock_irq(phba->host->host_lock);
-                ndlp->nlp_flag &= ~NLP_DELAY_REMOVE;
-                spin_unlock_irq(phba->host->host_lock);
-                lpfc_nlp_remove(phba, ndlp);
-                return NLP_STE_FREED_NODE;
-        }
-        if (rc == NLP_STE_FREED_NODE)
-                return NLP_STE_FREED_NODE;
         return rc;
 }
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index c3e68e0d8f74..9a12d05e99e4 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -146,6 +146,10 @@ lpfc_get_scsi_buf(struct lpfc_hba * phba)
 
         spin_lock_irqsave(&phba->scsi_buf_list_lock, iflag);
         list_remove_head(scsi_buf_list, lpfc_cmd, struct lpfc_scsi_buf, list);
+        if (lpfc_cmd) {
+                lpfc_cmd->seg_cnt = 0;
+                lpfc_cmd->nonsg_phys = 0;
+        }
         spin_unlock_irqrestore(&phba->scsi_buf_list_lock, iflag);
         return  lpfc_cmd;
 }
@@ -288,13 +292,13 @@ lpfc_scsi_unprep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * psb)
 }
 
 static void
-lpfc_handle_fcp_err(struct lpfc_scsi_buf *lpfc_cmd)
+lpfc_handle_fcp_err(struct lpfc_scsi_buf *lpfc_cmd, struct lpfc_iocbq *rsp_iocb)
 {
         struct scsi_cmnd *cmnd = lpfc_cmd->pCmd;
         struct fcp_cmnd *fcpcmd = lpfc_cmd->fcp_cmnd;
         struct fcp_rsp *fcprsp = lpfc_cmd->fcp_rsp;
         struct lpfc_hba *phba = lpfc_cmd->scsi_hba;
-        uint32_t fcpi_parm = lpfc_cmd->cur_iocbq.iocb.un.fcpi.fcpi_parm;
+        uint32_t fcpi_parm = rsp_iocb->iocb.un.fcpi.fcpi_parm;
         uint32_t resp_info = fcprsp->rspStatus2;
         uint32_t scsi_status = fcprsp->rspStatus3;
         uint32_t *lp;
@@ -356,6 +360,24 @@ lpfc_handle_fcp_err(struct lpfc_scsi_buf *lpfc_cmd)
                                 fcpi_parm, cmnd->cmnd[0], cmnd->underflow);
 
                 /*
+                 * If there is an under run check if under run reported by
+                 * storage array is same as the under run reported by HBA.
+                 * If this is not same, there is a dropped frame.
+                 */
+                if ((cmnd->sc_data_direction == DMA_FROM_DEVICE) &&
+                        fcpi_parm &&
+                        (cmnd->resid != fcpi_parm)) {
+                        lpfc_printf_log(phba, KERN_WARNING,
+                                LOG_FCP | LOG_FCP_ERROR,
+                                "%d:0735 FCP Read Check Error and Underrun "
+                                "Data: x%x x%x x%x x%x\n", phba->brd_no,
+                                be32_to_cpu(fcpcmd->fcpDl),
+                                cmnd->resid,
+                                fcpi_parm, cmnd->cmnd[0]);
+                        cmnd->resid = cmnd->request_bufflen;
+                        host_status = DID_ERROR;
+                }
+                /*
                  * The cmnd->underflow is the minimum number of bytes that must
                  * be transfered for this command.  Provided a sense condition
                  * is not present, make sure the actual amount transferred is at
@@ -435,7 +457,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                 switch (lpfc_cmd->status) {
                 case IOSTAT_FCP_RSP_ERROR:
                         /* Call FCP RSP handler to determine result */
-                        lpfc_handle_fcp_err(lpfc_cmd);
+                        lpfc_handle_fcp_err(lpfc_cmd,pIocbOut);
                         break;
                 case IOSTAT_NPORT_BSY:
                 case IOSTAT_FABRIC_BSY:
@@ -466,10 +488,10 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
 
         result = cmd->result;
         sdev = cmd->device;
+        lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);
         cmd->scsi_done(cmd);
 
         if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {
-                lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);
                 lpfc_release_scsi_buf(phba, lpfc_cmd);
                 return;
         }
@@ -527,7 +549,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                 }
         }
 
-        lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);
         lpfc_release_scsi_buf(phba, lpfc_cmd);
 }
 
@@ -670,6 +691,18 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,
         return (1);
 }
 
+static void
+lpfc_tskmgmt_def_cmpl(struct lpfc_hba *phba,
+                        struct lpfc_iocbq *cmdiocbq,
+                        struct lpfc_iocbq *rspiocbq)
+{
+        struct lpfc_scsi_buf *lpfc_cmd =
+                (struct lpfc_scsi_buf *) cmdiocbq->context1;
+        if (lpfc_cmd)
+                lpfc_release_scsi_buf(phba, lpfc_cmd);
+        return;
+}
+
 static int
 lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba,
                     unsigned  tgt_id, unsigned int lun,
@@ -706,8 +739,9 @@ lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba,
                                        &phba->sli.ring[phba->sli.fcp_ring],
                                        iocbq, iocbqrsp, lpfc_cmd->timeout);
         if (ret != IOCB_SUCCESS) {
+                if (ret == IOCB_TIMEDOUT)
+                        iocbq->iocb_cmpl = lpfc_tskmgmt_def_cmpl;
                 lpfc_cmd->status = IOSTAT_DRIVER_REJECT;
-                ret = FAILED;
         } else {
                 ret = SUCCESS;
                 lpfc_cmd->result = iocbqrsp->iocb.un.ulpWord[4];
@@ -974,7 +1008,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
 }
 
 static int
-lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
+lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
 {
         struct Scsi_Host *shost = cmnd->device->host;
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata;
@@ -984,6 +1018,7 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
         struct lpfc_nodelist *pnode = rdata->pnode;
         uint32_t cmd_result = 0, cmd_status = 0;
         int ret = FAILED;
+        int iocb_status = IOCB_SUCCESS;
         int cnt, loopcnt;
 
         lpfc_block_error_handler(cmnd);
@@ -995,7 +1030,7 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
          */
         while ( 1 ) {
                 if (!pnode)
-                        return FAILED;
+                        goto out;
 
                 if (pnode->nlp_state != NLP_STE_MAPPED_NODE) {
                         spin_unlock_irq(phba->host->host_lock);
@@ -1013,7 +1048,7 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
                         }
                         pnode = rdata->pnode;
                         if (!pnode)
-                                return FAILED;
+                                goto out;
                 }
                 if (pnode->nlp_state == NLP_STE_MAPPED_NODE)
                         break;
@@ -1028,7 +1063,7 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
         lpfc_cmd->rdata = rdata;
 
         ret = lpfc_scsi_prep_task_mgmt_cmd(phba, lpfc_cmd, cmnd->device->lun,
-                                           FCP_LUN_RESET);
+                                           FCP_TARGET_RESET);
         if (!ret)
                 goto out_free_scsi_buf;
 
@@ -1040,16 +1075,21 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
                 goto out_free_scsi_buf;
 
         lpfc_printf_log(phba, KERN_INFO, LOG_FCP,
-                        "%d:0703 Issue LUN Reset to TGT %d LUN %d "
-                        "Data: x%x x%x\n", phba->brd_no, cmnd->device->id,
+                        "%d:0703 Issue target reset to TGT %d LUN %d rpi x%x "
+                        "nlp_flag x%x\n", phba->brd_no, cmnd->device->id,
                         cmnd->device->lun, pnode->nlp_rpi, pnode->nlp_flag);
 
-        ret = lpfc_sli_issue_iocb_wait(phba,
+        iocb_status = lpfc_sli_issue_iocb_wait(phba,
                                        &phba->sli.ring[phba->sli.fcp_ring],
                                        iocbq, iocbqrsp, lpfc_cmd->timeout);
-        if (ret == IOCB_SUCCESS)
-                ret = SUCCESS;
 
+        if (iocb_status == IOCB_TIMEDOUT)
+                iocbq->iocb_cmpl = lpfc_tskmgmt_def_cmpl;
+
+        if (iocb_status == IOCB_SUCCESS)
+                ret = SUCCESS;
+        else
+                ret = iocb_status;
 
         cmd_result = iocbqrsp->iocb.un.ulpWord[4];
         cmd_status = iocbqrsp->iocb.ulpStatus;
@@ -1087,18 +1127,19 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
 
         if (cnt) {
                 lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
-                        "%d:0719 LUN Reset I/O flush failure: cnt x%x\n",
+                        "%d:0719 device reset I/O flush failure: cnt x%x\n",
                         phba->brd_no, cnt);
                 ret = FAILED;
         }
 
 out_free_scsi_buf:
-        lpfc_release_scsi_buf(phba, lpfc_cmd);
-
+        if (iocb_status != IOCB_TIMEDOUT) {
+                lpfc_release_scsi_buf(phba, lpfc_cmd);
+        }
         lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
-                        "%d:0713 SCSI layer issued LUN reset (%d, %d) "
-                        "Data: x%x x%x x%x\n",
-                        phba->brd_no, cmnd->device->id,cmnd->device->lun,
+                        "%d:0713 SCSI layer issued device reset (%d, %d) "
+                        "return x%x status x%x result x%x\n",
+                        phba->brd_no, cmnd->device->id, cmnd->device->lun,
                         ret, cmd_status, cmd_result);
 
 out:
@@ -1107,7 +1148,7 @@ out:
 }
 
 static int
-lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
+lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
 {
         struct Scsi_Host *shost = cmnd->device->host;
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata;
@@ -1134,10 +1175,12 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
          * fail, this routine returns failure to the midlayer.
          */
         for (i = 0; i < LPFC_MAX_TARGET; i++) {
-                /* Search the mapped list for this target ID */
+                /* Search for mapped node by target ID */
                 match = 0;
-                list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
-                        if ((i == ndlp->nlp_sid) && ndlp->rport) {
+                list_for_each_entry(ndlp, &phba->fc_nodes, nlp_listp) {
+                        if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
+                            i == ndlp->nlp_sid &&
+                            ndlp->rport) {
                                 match = 1;
                                 break;
                         }
@@ -1152,13 +1195,17 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
                                 "%d:0700 Bus Reset on target %d failed\n",
                                 phba->brd_no, i);
                         err_count++;
+                        break;
                 }
         }
 
+        if (ret != IOCB_TIMEDOUT)
+                lpfc_release_scsi_buf(phba, lpfc_cmd);
+
         if (err_count == 0)
                 ret = SUCCESS;
-
-        lpfc_release_scsi_buf(phba, lpfc_cmd);
+        else
+                ret = FAILED;
 
         /*
          * All outstanding txcmplq I/Os should have been aborted by
@@ -1299,11 +1346,13 @@ struct scsi_host_template lpfc_template = {
         .info                   = lpfc_info,
         .queuecommand           = lpfc_queuecommand,
         .eh_abort_handler       = lpfc_abort_handler,
-        .eh_device_reset_handler= lpfc_reset_lun_handler,
-        .eh_bus_reset_handler   = lpfc_reset_bus_handler,
+        .eh_device_reset_handler= lpfc_device_reset_handler,
+        .eh_bus_reset_handler   = lpfc_bus_reset_handler,
         .slave_alloc            = lpfc_slave_alloc,
         .slave_configure        = lpfc_slave_configure,
         .slave_destroy          = lpfc_slave_destroy,
+        .scan_finished          = lpfc_scan_finished,
+        .scan_start             = lpfc_scan_start,
         .this_id                = -1,
         .sg_tablesize           = LPFC_SG_SEG_CNT,
         .cmd_per_lun            = LPFC_CMD_PER_LUN,
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 9fb6960a8ada..a1e721459e2b 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -528,6 +528,7 @@ lpfc_sli_wake_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
          * If pdone_q is empty, the driver thread gave up waiting and
          * continued running.
          */
+        pmboxq->mbox_flag |= LPFC_MBX_WAKE;
         pdone_q = (wait_queue_head_t *) pmboxq->context1;
         if (pdone_q)
                 wake_up_interruptible(pdone_q);
@@ -538,11 +539,32 @@ void
 lpfc_sli_def_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
         struct lpfc_dmabuf *mp;
+        uint16_t rpi;
+        int rc;
+
         mp = (struct lpfc_dmabuf *) (pmb->context1);
+
         if (mp) {
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
         }
+
+        /*
+         * If a REG_LOGIN succeeded  after node is destroyed or node
+         * is in re-discovery driver need to cleanup the RPI.
+         */
+        if (!(phba->fc_flag & FC_UNLOADING) &&
+                (pmb->mb.mbxCommand == MBX_REG_LOGIN64) &&
+                (!pmb->mb.mbxStatus)) {
+
+                rpi = pmb->mb.un.varWords[0];
+                lpfc_unreg_login(phba, rpi, pmb);
+                pmb->mbox_cmpl=lpfc_sli_def_mbox_cmpl;
+                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
+                if (rc != MBX_NOT_FINISHED)
+                        return;
+        }
+
         mempool_free( pmb, phba->mbox_mem_pool);
         return;
 }
@@ -693,25 +715,8 @@ lpfc_sli_handle_mb_event(struct lpfc_hba * phba)
                 } else {
                         spin_unlock_irq(phba->host->host_lock);
                         /* Turn on IOCB processing */
-                        for (i = 0; i < phba->sli.num_rings; i++) {
+                        for (i = 0; i < phba->sli.num_rings; i++)
                                 lpfc_sli_turn_on_ring(phba, i);
-                        }
-
-                        /* Free any lpfc_dmabuf's waiting for mbox cmd cmpls */
-                        while (!list_empty(&phba->freebufList)) {
-                                struct lpfc_dmabuf *mp;
-
-                                mp = NULL;
-                                list_remove_head((&phba->freebufList),
-                                                 mp,
-                                                 struct lpfc_dmabuf,
-                                                 list);
-                                if (mp) {
-                                        lpfc_mbuf_free(phba, mp->virt,
-                                                       mp->phys);
-                                        kfree(mp);
-                                }
-                        }
                 }
 
         } while (process_next);
@@ -833,6 +838,14 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba * phba, struct lpfc_sli_ring * pring,
                          * All other are passed to the completion callback.
                          */
                         if (pring->ringno == LPFC_ELS_RING) {
+                                if (cmdiocbp->iocb_flag & LPFC_DRIVER_ABORTED) {
+                                        cmdiocbp->iocb_flag &=
+                                                ~LPFC_DRIVER_ABORTED;
+                                        saveq->iocb.ulpStatus =
+                                                IOSTAT_LOCAL_REJECT;
+                                        saveq->iocb.un.ulpWord[4] =
+                                                IOERR_SLI_ABORTED;
+                                }
                                 spin_unlock_irqrestore(phba->host->host_lock,
                                                        iflag);
                                 (cmdiocbp->iocb_cmpl) (phba, cmdiocbp, saveq);
@@ -1464,8 +1477,9 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba * phba,
 int
 lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
+        LIST_HEAD(completions);
         struct lpfc_iocbq *iocb, *next_iocb;
-        IOCB_t *icmd = NULL, *cmd = NULL;
+        IOCB_t *cmd = NULL;
         int errcnt;
 
         errcnt = 0;
@@ -1474,46 +1488,28 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
          * First do the txq.
          */
         spin_lock_irq(phba->host->host_lock);
-        list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
-                list_del_init(&iocb->list);
-                if (iocb->iocb_cmpl) {
-                        icmd = &iocb->iocb;
-                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                        icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                        spin_unlock_irq(phba->host->host_lock);
-                        (iocb->iocb_cmpl) (phba, iocb, iocb);
-                        spin_lock_irq(phba->host->host_lock);
-                } else
-                        lpfc_sli_release_iocbq(phba, iocb);
-        }
+        list_splice_init(&pring->txq, &completions);
         pring->txq_cnt = 0;
-        INIT_LIST_HEAD(&(pring->txq));
 
         /* Next issue ABTS for everything on the txcmplq */
-        list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list) {
-                cmd = &iocb->iocb;
+        list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list)
+                lpfc_sli_issue_abort_iotag(phba, pring, iocb);
 
-                /*
-                 * Imediate abort of IOCB, deque and call compl
-                 */
+        spin_unlock_irq(phba->host->host_lock);
 
-                list_del_init(&iocb->list);
-                pring->txcmplq_cnt--;
+        while (!list_empty(&completions)) {
+                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
+                cmd = &iocb->iocb;
+                list_del(&iocb->list);
 
                 if (iocb->iocb_cmpl) {
                         cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
                         cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                        spin_unlock_irq(phba->host->host_lock);
                         (iocb->iocb_cmpl) (phba, iocb, iocb);
-                        spin_lock_irq(phba->host->host_lock);
                 } else
                         lpfc_sli_release_iocbq(phba, iocb);
         }
 
-        INIT_LIST_HEAD(&pring->txcmplq);
-        pring->txcmplq_cnt = 0;
-        spin_unlock_irq(phba->host->host_lock);
-
         return errcnt;
 }
 
@@ -1588,6 +1584,7 @@ void lpfc_reset_barrier(struct lpfc_hba * phba)
         hc_copy = readl(phba->HCregaddr);
         writel((hc_copy & ~HC_ERINT_ENA), phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
+        phba->fc_flag |= FC_IGNORE_ERATT;
 
         if (readl(phba->HAregaddr) & HA_ERATT) {
                 /* Clear Chip error bit */
@@ -1630,6 +1627,7 @@ clear_errat:
         }
 
 restore_hc:
+        phba->fc_flag &= ~FC_IGNORE_ERATT;
         writel(hc_copy, phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
 }
@@ -1665,6 +1663,7 @@ lpfc_sli_brdkill(struct lpfc_hba * phba)
         status &= ~HC_ERINT_ENA;
         writel(status, phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
+        phba->fc_flag |= FC_IGNORE_ERATT;
         spin_unlock_irq(phba->host->host_lock);
 
         lpfc_kill_board(phba, pmb);
@@ -1674,6 +1673,9 @@ lpfc_sli_brdkill(struct lpfc_hba * phba)
         if (retval != MBX_SUCCESS) {
                 if (retval != MBX_BUSY)
                         mempool_free(pmb, phba->mbox_mem_pool);
+                spin_lock_irq(phba->host->host_lock);
+                phba->fc_flag &= ~FC_IGNORE_ERATT;
+                spin_unlock_irq(phba->host->host_lock);
                 return 1;
         }
 
@@ -1700,6 +1702,7 @@ lpfc_sli_brdkill(struct lpfc_hba * phba)
         }
         spin_lock_irq(phba->host->host_lock);
         psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
+        phba->fc_flag &= ~FC_IGNORE_ERATT;
         spin_unlock_irq(phba->host->host_lock);
 
         psli->mbox_active = NULL;
@@ -1985,42 +1988,6 @@ lpfc_sli_hba_setup_exit:
         return rc;
 }
 
-static void
-lpfc_mbox_abort(struct lpfc_hba * phba)
-{
-        LPFC_MBOXQ_t *pmbox;
-        MAILBOX_t *mb;
-
-        if (phba->sli.mbox_active) {
-                del_timer_sync(&phba->sli.mbox_tmo);
-                phba->work_hba_events &= ~WORKER_MBOX_TMO;
-                pmbox = phba->sli.mbox_active;
-                mb = &pmbox->mb;
-                phba->sli.mbox_active = NULL;
-                if (pmbox->mbox_cmpl) {
-                        mb->mbxStatus = MBX_NOT_FINISHED;
-                        (pmbox->mbox_cmpl) (phba, pmbox);
-                }
-                phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
-        }
-
-        /* Abort all the non active mailbox commands. */
-        spin_lock_irq(phba->host->host_lock);
-        pmbox = lpfc_mbox_get(phba);
-        while (pmbox) {
-                mb = &pmbox->mb;
-                if (pmbox->mbox_cmpl) {
-                        mb->mbxStatus = MBX_NOT_FINISHED;
-                        spin_unlock_irq(phba->host->host_lock);
-                        (pmbox->mbox_cmpl) (phba, pmbox);
-                        spin_lock_irq(phba->host->host_lock);
-                }
-                pmbox = lpfc_mbox_get(phba);
-        }
-        spin_unlock_irq(phba->host->host_lock);
-        return;
-}
-
 /*! lpfc_mbox_timeout
  *
  * \pre
@@ -2055,6 +2022,8 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
 {
         LPFC_MBOXQ_t *pmbox;
         MAILBOX_t *mb;
+        struct lpfc_sli *psli = &phba->sli;
+        struct lpfc_sli_ring *pring;
 
         spin_lock_irq(phba->host->host_lock);
         if (!(phba->work_hba_events & WORKER_MBOX_TMO)) {
@@ -2062,8 +2031,6 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
                 return;
         }
 
-        phba->work_hba_events &= ~WORKER_MBOX_TMO;
-
         pmbox = phba->sli.mbox_active;
         mb = &pmbox->mb;
 
@@ -2078,17 +2045,32 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
                 phba->sli.sli_flag,
                 phba->sli.mbox_active);
 
-        phba->sli.mbox_active = NULL;
-        if (pmbox->mbox_cmpl) {
-                mb->mbxStatus = MBX_NOT_FINISHED;
-                spin_unlock_irq(phba->host->host_lock);
-                (pmbox->mbox_cmpl) (phba, pmbox);
-                spin_lock_irq(phba->host->host_lock);
-        }
-        phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
-
+        /* Setting state unknown so lpfc_sli_abort_iocb_ring
+         * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing
+         * it to fail all oustanding SCSI IO.
+         */
+        phba->hba_state = LPFC_STATE_UNKNOWN;
+        phba->work_hba_events &= ~WORKER_MBOX_TMO;
+        phba->fc_flag |= FC_ESTABLISH_LINK;
+        psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
         spin_unlock_irq(phba->host->host_lock);
-        lpfc_mbox_abort(phba);
+
+        pring = &psli->ring[psli->fcp_ring];
+        lpfc_sli_abort_iocb_ring(phba, pring);
+
+        lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
+                        "%d:0316 Resetting board due to mailbox timeout\n",
+                        phba->brd_no);
+        /*
+         * lpfc_offline calls lpfc_sli_hba_down which will clean up
+         * on oustanding mailbox commands.
+         */
+        lpfc_offline_prep(phba);
+        lpfc_offline(phba);
+        lpfc_sli_brdrestart(phba);
+        if (lpfc_online(phba) == 0)             /* Initialize the HBA */
+                mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
+        lpfc_unblock_mgmt_io(phba);
         return;
 }
 
@@ -2320,9 +2302,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
                         spin_unlock_irqrestore(phba->host->host_lock,
                                                drvr_flag);
 
-                        /* Can be in interrupt context, do not sleep */
-                        /* (or might be called with interrupts disabled) */
-                        mdelay(1);
+                        msleep(1);
 
                         spin_lock_irqsave(phba->host->host_lock, drvr_flag);
 
@@ -2430,7 +2410,7 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
         if (unlikely(phba->hba_state == LPFC_LINK_DOWN)) {
                 /*
-                 * Only CREATE_XRI, CLOSE_XRI, ABORT_XRI, and QUE_RING_BUF
+                 * Only CREATE_XRI, CLOSE_XRI, and QUE_RING_BUF
                  * can be issued if the link is not up.
                  */
                 switch (piocb->iocb.ulpCommand) {
@@ -2444,6 +2424,8 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                                 piocb->iocb_cmpl = NULL;
                         /*FALLTHROUGH*/
                 case CMD_CREATE_XRI_CR:
+                case CMD_CLOSE_XRI_CN:
+                case CMD_CLOSE_XRI_CX:
                         break;
                 default:
                         goto iocb_busy;
@@ -2637,11 +2619,12 @@ lpfc_sli_queue_setup(struct lpfc_hba * phba)
 int
 lpfc_sli_hba_down(struct lpfc_hba * phba)
 {
+        LIST_HEAD(completions);
         struct lpfc_sli *psli;
         struct lpfc_sli_ring *pring;
         LPFC_MBOXQ_t *pmb;
-        struct lpfc_iocbq *iocb, *next_iocb;
-        IOCB_t *icmd = NULL;
+        struct lpfc_iocbq *iocb;
+        IOCB_t *cmd = NULL;
         int i;
         unsigned long flags = 0;
 
@@ -2649,7 +2632,6 @@ lpfc_sli_hba_down(struct lpfc_hba * phba)
         lpfc_hba_down_prep(phba);
 
         spin_lock_irqsave(phba->host->host_lock, flags);
-
         for (i = 0; i < psli->num_rings; i++) {
                 pring = &psli->ring[i];
                 pring->flag |= LPFC_DEFERRED_RING_EVENT;
@@ -2658,28 +2640,25 @@ lpfc_sli_hba_down(struct lpfc_hba * phba)
                  * Error everything on the txq since these iocbs have not been
                  * given to the FW yet.
                  */
+                list_splice_init(&pring->txq, &completions);
                 pring->txq_cnt = 0;
 
-                list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
-                        list_del_init(&iocb->list);
-                        if (iocb->iocb_cmpl) {
-                                icmd = &iocb->iocb;
-                                icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                                icmd->un.ulpWord[4] = IOERR_SLI_DOWN;
-                                spin_unlock_irqrestore(phba->host->host_lock,
-                                                       flags);
-                                (iocb->iocb_cmpl) (phba, iocb, iocb);
-                                spin_lock_irqsave(phba->host->host_lock, flags);
-                        } else
-                                lpfc_sli_release_iocbq(phba, iocb);
-                }
+        }
+        spin_unlock_irqrestore(phba->host->host_lock, flags);
 
-                INIT_LIST_HEAD(&(pring->txq));
+        while (!list_empty(&completions)) {
+                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
+                cmd = &iocb->iocb;
+                list_del(&iocb->list);
 
+                if (iocb->iocb_cmpl) {
+                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        cmd->un.ulpWord[4] = IOERR_SLI_DOWN;
+                        (iocb->iocb_cmpl) (phba, iocb, iocb);
+                } else
+                        lpfc_sli_release_iocbq(phba, iocb);
         }
 
-        spin_unlock_irqrestore(phba->host->host_lock, flags);
-
         /* Return any active mbox cmds */
         del_timer_sync(&psli->mbox_tmo);
         spin_lock_irqsave(phba->host->host_lock, flags);
@@ -2768,85 +2747,138 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 }
 
 static void
-lpfc_sli_abort_elsreq_cmpl(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                           struct lpfc_iocbq * rspiocb)
+lpfc_sli_abort_els_cmpl(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
+                        struct lpfc_iocbq * rspiocb)
 {
-        struct lpfc_dmabuf *buf_ptr, *buf_ptr1;
-        /* Free the resources associated with the ELS_REQUEST64 IOCB the driver
-         * just aborted.
-         * In this case, context2  = cmd,  context2->next = rsp, context3 = bpl
-         */
-        if (cmdiocb->context2) {
-                buf_ptr1 = (struct lpfc_dmabuf *) cmdiocb->context2;
-
-                /* Free the response IOCB before completing the abort
-                   command.  */
-                buf_ptr = NULL;
-                list_remove_head((&buf_ptr1->list), buf_ptr,
-                                 struct lpfc_dmabuf, list);
-                if (buf_ptr) {
-                        lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
-                        kfree(buf_ptr);
-                }
-                lpfc_mbuf_free(phba, buf_ptr1->virt, buf_ptr1->phys);
-                kfree(buf_ptr1);
-        }
+        IOCB_t *irsp;
+        uint16_t abort_iotag, abort_context;
+        struct lpfc_iocbq *abort_iocb, *rsp_ab_iocb;
+        struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
+
+        abort_iocb = NULL;
+        irsp = &rspiocb->iocb;
+
+        spin_lock_irq(phba->host->host_lock);
 
-        if (cmdiocb->context3) {
-                buf_ptr = (struct lpfc_dmabuf *) cmdiocb->context3;
-                lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
-                kfree(buf_ptr);
+        if (irsp->ulpStatus) {
+                abort_context = cmdiocb->iocb.un.acxri.abortContextTag;
+                abort_iotag = cmdiocb->iocb.un.acxri.abortIoTag;
+
+                if (abort_iotag != 0 && abort_iotag <= phba->sli.last_iotag)
+                        abort_iocb = phba->sli.iocbq_lookup[abort_iotag];
+
+                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                "%d:0327 Cannot abort els iocb %p"
+                                " with tag %x context %x\n",
+                                phba->brd_no, abort_iocb,
+                                abort_iotag, abort_context);
+
+                /*
+                 * make sure we have the right iocbq before taking it
+                 * off the txcmplq and try to call completion routine.
+                 */
+                if (abort_iocb &&
+                    abort_iocb->iocb.ulpContext == abort_context &&
+                    abort_iocb->iocb_flag & LPFC_DRIVER_ABORTED) {
+                        list_del(&abort_iocb->list);
+                        pring->txcmplq_cnt--;
+
+                        rsp_ab_iocb = lpfc_sli_get_iocbq(phba);
+                        if (rsp_ab_iocb == NULL)
+                                lpfc_sli_release_iocbq(phba, abort_iocb);
+                        else {
+                                abort_iocb->iocb_flag &=
+                                        ~LPFC_DRIVER_ABORTED;
+                                rsp_ab_iocb->iocb.ulpStatus =
+                                        IOSTAT_LOCAL_REJECT;
+                                rsp_ab_iocb->iocb.un.ulpWord[4] =
+                                        IOERR_SLI_ABORTED;
+                                spin_unlock_irq(phba->host->host_lock);
+                                (abort_iocb->iocb_cmpl)
+                                        (phba, abort_iocb, rsp_ab_iocb);
+                                spin_lock_irq(phba->host->host_lock);
+                                lpfc_sli_release_iocbq(phba, rsp_ab_iocb);
+                        }
+                }
         }
 
         lpfc_sli_release_iocbq(phba, cmdiocb);
+        spin_unlock_irq(phba->host->host_lock);
         return;
 }
 
 int
-lpfc_sli_issue_abort_iotag32(struct lpfc_hba * phba,
-                             struct lpfc_sli_ring * pring,
-                             struct lpfc_iocbq * cmdiocb)
+lpfc_sli_issue_abort_iotag(struct lpfc_hba * phba,
+                           struct lpfc_sli_ring * pring,
+                           struct lpfc_iocbq * cmdiocb)
 {
         struct lpfc_iocbq *abtsiocbp;
         IOCB_t *icmd = NULL;
         IOCB_t *iabt = NULL;
+        int retval = IOCB_ERROR;
+
+        /* There are certain command types we don't want
+         * to abort.
+         */
+        icmd = &cmdiocb->iocb;
+        if ((icmd->ulpCommand == CMD_ABORT_XRI_CN) ||
+            (icmd->ulpCommand == CMD_CLOSE_XRI_CN))
+                return 0;
+
+        /* If we're unloading, interrupts are disabled so we
+         * need to cleanup the iocb here.
+         */
+        if (phba->fc_flag & FC_UNLOADING)
+                goto abort_iotag_exit;
 
         /* issue ABTS for this IOCB based on iotag */
         abtsiocbp = lpfc_sli_get_iocbq(phba);
         if (abtsiocbp == NULL)
                 return 0;
 
+        /* This signals the response to set the correct status
+         * before calling the completion handler.
+         */
+        cmdiocb->iocb_flag |= LPFC_DRIVER_ABORTED;
+
         iabt = &abtsiocbp->iocb;
-        icmd = &cmdiocb->iocb;
-        switch (icmd->ulpCommand) {
-        case CMD_ELS_REQUEST64_CR:
-                /* Even though we abort the ELS command, the firmware may access
-                 * the BPL or other resources before it processes our
-                 * ABORT_MXRI64. Thus we must delay reusing the cmdiocb
-                 * resources till the actual abort request completes.
-                 */
-                abtsiocbp->context1 = (void *)((unsigned long)icmd->ulpCommand);
-                abtsiocbp->context2 = cmdiocb->context2;
-                abtsiocbp->context3 = cmdiocb->context3;
-                cmdiocb->context2 = NULL;
-                cmdiocb->context3 = NULL;
-                abtsiocbp->iocb_cmpl = lpfc_sli_abort_elsreq_cmpl;
-                break;
-        default:
-                lpfc_sli_release_iocbq(phba, abtsiocbp);
-                return 0;
-        }
+        iabt->un.acxri.abortType = ABORT_TYPE_ABTS;
+        iabt->un.acxri.abortContextTag = icmd->ulpContext;
+        iabt->un.acxri.abortIoTag = icmd->ulpIoTag;
+        iabt->ulpLe = 1;
+        iabt->ulpClass = icmd->ulpClass;
 
-        iabt->un.amxri.abortType = ABORT_TYPE_ABTS;
-        iabt->un.amxri.iotag32 = icmd->un.elsreq64.bdl.ulpIoTag32;
+        if (phba->hba_state >= LPFC_LINK_UP)
+                iabt->ulpCommand = CMD_ABORT_XRI_CN;
+        else
+                iabt->ulpCommand = CMD_CLOSE_XRI_CN;
 
-        iabt->ulpLe = 1;
-        iabt->ulpClass = CLASS3;
-        iabt->ulpCommand = CMD_ABORT_MXRI64_CN;
+        abtsiocbp->iocb_cmpl = lpfc_sli_abort_els_cmpl;
 
-        if (lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0) == IOCB_ERROR) {
-                lpfc_sli_release_iocbq(phba, abtsiocbp);
-                return 0;
+        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                        "%d:0339 Abort xri x%x, original iotag x%x, abort "
+                        "cmd iotag x%x\n",
+                        phba->brd_no, iabt->un.acxri.abortContextTag,
+                        iabt->un.acxri.abortIoTag, abtsiocbp->iotag);
+        retval = lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0);
+
+abort_iotag_exit:
+
+        /* If we could not issue an abort dequeue the iocb and handle
+         * the completion here.
+         */
+        if (retval == IOCB_ERROR) {
+                list_del(&cmdiocb->list);
+                pring->txcmplq_cnt--;
+
+                if (cmdiocb->iocb_cmpl) {
+                        icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+                        spin_unlock_irq(phba->host->host_lock);
+                        (cmdiocb->iocb_cmpl) (phba, cmdiocb, cmdiocb);
+                        spin_lock_irq(phba->host->host_lock);
+                } else
+                        lpfc_sli_release_iocbq(phba, cmdiocb);
         }
 
         return 1;
@@ -2918,9 +2950,11 @@ void
 lpfc_sli_abort_fcp_cmpl(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                            struct lpfc_iocbq * rspiocb)
 {
-        spin_lock_irq(phba->host->host_lock);
+        unsigned long iflags;
+
+        spin_lock_irqsave(phba->host->host_lock, iflags);
         lpfc_sli_release_iocbq(phba, cmdiocb);
-        spin_unlock_irq(phba->host->host_lock);
+        spin_unlock_irqrestore(phba->host->host_lock, iflags);
         return;
 }
 
@@ -3043,22 +3077,22 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba * phba,
                                 timeout_req);
                 spin_lock_irq(phba->host->host_lock);
 
-                if (timeleft == 0) {
+                if (piocb->iocb_flag & LPFC_IO_WAKE) {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                                        "%d:0331 IOCB wake signaled\n",
+                                        phba->brd_no);
+                } else if (timeleft == 0) {
                         lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
                                         "%d:0338 IOCB wait timeout error - no "
                                         "wake response Data x%x\n",
                                         phba->brd_no, timeout);
                         retval = IOCB_TIMEDOUT;
-                } else if (!(piocb->iocb_flag & LPFC_IO_WAKE)) {
+                } else {
                         lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
                                         "%d:0330 IOCB wake NOT set, "
                                         "Data x%x x%lx\n", phba->brd_no,
                                         timeout, (timeleft / jiffies));
                         retval = IOCB_TIMEDOUT;
-                } else {
-                        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                                        "%d:0331 IOCB wake signaled\n",
-                                        phba->brd_no);
                 }
         } else {
                 lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
@@ -3087,8 +3121,6 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq,
                          uint32_t timeout)
 {
         DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_q);
-        DECLARE_WAITQUEUE(wq_entry, current);
-        uint32_t timeleft = 0;
         int retval;
 
         /* The caller must leave context1 empty. */
@@ -3101,27 +3133,25 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq,
         /* setup context field to pass wait_queue pointer to wake function  */
         pmboxq->context1 = &done_q;
 
-        /* start to sleep before we wait, to avoid races */
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&done_q, &wq_entry);
-
         /* now issue the command */
         retval = lpfc_sli_issue_mbox(phba, pmboxq, MBX_NOWAIT);
 
         if (retval == MBX_BUSY || retval == MBX_SUCCESS) {
-                timeleft = schedule_timeout(timeout * HZ);
+                wait_event_interruptible_timeout(done_q,
+                                pmboxq->mbox_flag & LPFC_MBX_WAKE,
+                                timeout * HZ);
+
                 pmboxq->context1 = NULL;
-                /* if schedule_timeout returns 0, we timed out and were not
-                   woken up */
-                if ((timeleft == 0) || signal_pending(current))
-                        retval = MBX_TIMEOUT;
-                else
+                /*
+                 * if LPFC_MBX_WAKE flag is set the mailbox is completed
+                 * else do not free the resources.
+                 */
+                if (pmboxq->mbox_flag & LPFC_MBX_WAKE)
                         retval = MBX_SUCCESS;
+                else
+                        retval = MBX_TIMEOUT;
         }
 
-
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&done_q, &wq_entry);
         return retval;
 }
 
@@ -3184,6 +3214,11 @@ lpfc_intr_handler(int irq, void *dev_id)
          */
         spin_lock(phba->host->host_lock);
         ha_copy = readl(phba->HAregaddr);
+        /* If somebody is waiting to handle an eratt don't process it
+         * here.  The brdkill function will do this.
+         */
+        if (phba->fc_flag & FC_IGNORE_ERATT)
+                ha_copy &= ~HA_ERATT;
         writel((ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr);
         readl(phba->HAregaddr); /* flush */
         spin_unlock(phba->host->host_lock);
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h
index a43549959dc7..41c38d324ab0 100644
--- a/drivers/scsi/lpfc/lpfc_sli.h
+++ b/drivers/scsi/lpfc/lpfc_sli.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -39,9 +39,10 @@ struct lpfc_iocbq {
         IOCB_t iocb;            /* IOCB cmd */
         uint8_t retry;          /* retry counter for IOCB cmd - if needed */
         uint8_t iocb_flag;
-#define LPFC_IO_LIBDFC  1       /* libdfc iocb */
-#define LPFC_IO_WAKE    2       /* High Priority Queue signal flag */
-#define LPFC_IO_FCP     4       /* FCP command -- iocbq in scsi_buf */
+#define LPFC_IO_LIBDFC          1       /* libdfc iocb */
+#define LPFC_IO_WAKE            2       /* High Priority Queue signal flag */
+#define LPFC_IO_FCP             4       /* FCP command -- iocbq in scsi_buf */
+#define LPFC_DRIVER_ABORTED     8       /* driver aborted this request */
 
         uint8_t abort_count;
         uint8_t rsvd2;
@@ -67,6 +68,8 @@ struct lpfc_iocbq {
 #define IOCB_ERROR          2
 #define IOCB_TIMEDOUT       3
 
+#define LPFC_MBX_WAKE   1
+
 typedef struct lpfcMboxq {
         /* MBOXQs are used in single linked lists */
         struct list_head list;  /* ptr to next mailbox command */
@@ -75,6 +78,7 @@ typedef struct lpfcMboxq {
         void *context2;         /* caller context information */
 
         void (*mbox_cmpl) (struct lpfc_hba *, struct lpfcMboxq *);
+        uint8_t mbox_flag;
 
 } LPFC_MBOXQ_t;
 
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index a61ef3d1e7f1..92a9107019d2 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -18,12 +18,12 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.1.11"
+#define LPFC_DRIVER_VERSION "8.1.12"
 
 #define LPFC_DRIVER_NAME "lpfc"
 
 #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \
                 LPFC_DRIVER_VERSION
-#define LPFC_COPYRIGHT "Copyright(c) 2004-2006 Emulex.  All rights reserved."
+#define LPFC_COPYRIGHT "Copyright(c) 2004-2007 Emulex.  All rights reserved."
 
 #define DFC_API_VERSION "0.0.0"
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 753d88306cd1..5806ede120a4 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -471,7 +471,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
                 goto out_free;
         }
 
-        clkprop = get_property(node, "clock-frequency", &proplen);
+        clkprop = of_get_property(node, "clock-frequency", &proplen);
         if (clkprop == NULL || proplen != sizeof(int)) {
                 printk(KERN_ERR "%s: can't get clock frequency, "
                        "assuming 25MHz\n", node->full_name);
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 7fc6e06ea7e1..3cce75d70263 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1754,7 +1754,8 @@ __mega_busywait_mbox (adapter_t *adapter)
         for (counter = 0; counter < 10000; counter++) {
                 if (!mbox->m_in.busy)
                         return 0;
-                udelay(100); yield();
+                udelay(100);
+                cond_resched();
         }
         return -1;              /* give up after 1 second */
 }
@@ -3177,7 +3178,10 @@ proc_rdrv(adapter_t *adapter, char *page, int start, int end )
 
         return len;
 }
-
+#else
+static inline void mega_create_proc_entry(int index, struct proc_dir_entry *parent)
+{
+}
 #endif
 
 
@@ -4342,7 +4346,7 @@ mega_support_cluster(adapter_t *adapter)
         return 0;
 }
 
-
+#ifdef CONFIG_PROC_FS
 /**
  * mega_adapinq()
  * @adapter - pointer to our soft state
@@ -4447,7 +4451,7 @@ mega_internal_dev_inquiry(adapter_t *adapter, u8 ch, u8 tgt,
 
         return rval;
 }
-
+#endif
 
 /**
  * mega_internal_command()
@@ -4965,7 +4969,6 @@ megaraid_remove_one(struct pci_dev *pdev)
 {
         struct Scsi_Host *host = pci_get_drvdata(pdev);
         adapter_t *adapter = (adapter_t *)host->hostdata;
-        char    buf[12] = { 0 };
 
         scsi_remove_host(host);
 
@@ -5011,8 +5014,11 @@ megaraid_remove_one(struct pci_dev *pdev)
                 remove_proc_entry("raiddrives-30-39",
                                 adapter->controller_proc_dir_entry);
 #endif
-                sprintf(buf, "hba%d", adapter->host->host_no);
-                remove_proc_entry(buf, mega_proc_dir_entry);
+                {
+                        char    buf[12] = { 0 };
+                        sprintf(buf, "hba%d", adapter->host->host_no);
+                        remove_proc_entry(buf, mega_proc_dir_entry);
+                }
         }
 #endif
 
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index c6e74643abe2..ee70bd4ae4ba 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -1002,7 +1002,6 @@ static int megaraid_reset(Scsi_Cmnd *);
 static int megaraid_abort_and_reset(adapter_t *, Scsi_Cmnd *, int);
 static int megaraid_biosparam(struct scsi_device *, struct block_device *,
                 sector_t, int []);
-static int mega_print_inquiry(char *, char *);
 
 static int mega_build_sglist (adapter_t *adapter, scb_t *scb,
                               u32 *buffer, u32 *length);
@@ -1024,6 +1023,7 @@ static int mega_init_scb (adapter_t *);
 static int mega_is_bios_enabled (adapter_t *);
 
 #ifdef CONFIG_PROC_FS
+static int mega_print_inquiry(char *, char *);
 static void mega_create_proc_entry(int, struct proc_dir_entry *);
 static int proc_read_config(char *, char **, off_t, int, int *, void *);
 static int proc_read_stat(char *, char **, off_t, int, int *, void *);
@@ -1040,10 +1040,10 @@ static int proc_rdrv_20(char *, char **, off_t, int, int *, void *);
 static int proc_rdrv_30(char *, char **, off_t, int, int *, void *);
 static int proc_rdrv_40(char *, char **, off_t, int, int *, void *);
 static int proc_rdrv(adapter_t *, char *, int, int);
-#endif
 
 static int mega_adapinq(adapter_t *, dma_addr_t);
 static int mega_internal_dev_inquiry(adapter_t *, u8, u8, dma_addr_t);
+#endif
 
 static int mega_support_ext_cdb(adapter_t *);
 static mega_passthru* mega_prepare_passthru(adapter_t *, scb_t *,
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index f33a678f0897..84d9c27133d4 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -14,7 +14,7 @@
  *
  * Common management module
  */
-
+#include <linux/sched.h>
 #include "megaraid_mm.h"
 
 
@@ -60,7 +60,7 @@ EXPORT_SYMBOL(mraid_mm_unregister_adp);
 EXPORT_SYMBOL(mraid_mm_adapter_app_handle);
 
 static int majorno;
-static uint32_t drvr_ver        = 0x02200206;
+static uint32_t drvr_ver        = 0x02200207;
 
 static int adapters_count_g;
 static struct list_head adapters_list_g;
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 1fd3c7590d31..e64d1a19d8d7 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -185,7 +185,7 @@ struct mesh_state {
  * Driver is too messy, we need a few prototypes...
  */
 static void mesh_done(struct mesh_state *ms, int start_next);
-static void mesh_interrupt(int irq, void *dev_id);
+static void mesh_interrupt(struct mesh_state *ms);
 static void cmd_complete(struct mesh_state *ms);
 static void set_dma_cmds(struct mesh_state *ms, struct scsi_cmnd *cmd);
 static void halt_dma(struct mesh_state *ms);
@@ -466,7 +466,7 @@ static void mesh_start_cmd(struct mesh_state *ms, struct scsi_cmnd *cmd)
                                 dlog(ms, "intr b4 arb, intr/exc/err/fc=%.8x",
                                      MKWORD(mr->interrupt, mr->exception,
                                             mr->error, mr->fifo_count));
-                                mesh_interrupt(0, (void *)ms);
+                                mesh_interrupt(ms);
                                 if (ms->phase != arbitrating)
                                         return;
                         }
@@ -504,7 +504,7 @@ static void mesh_start_cmd(struct mesh_state *ms, struct scsi_cmnd *cmd)
                 dlog(ms, "intr after disresel, intr/exc/err/fc=%.8x",
                      MKWORD(mr->interrupt, mr->exception,
                             mr->error, mr->fifo_count));
-                mesh_interrupt(0, (void *)ms);
+                mesh_interrupt(ms);
                 if (ms->phase != arbitrating)
                         return;
                 dlog(ms, "after intr after disresel, intr/exc/err/fc=%.8x",
@@ -1018,10 +1018,11 @@ static void handle_reset(struct mesh_state *ms)
 static irqreturn_t do_mesh_interrupt(int irq, void *dev_id)
 {
         unsigned long flags;
-        struct Scsi_Host *dev = ((struct mesh_state *)dev_id)->host;
+        struct mesh_state *ms = dev_id;
+        struct Scsi_Host *dev = ms->host;
         
         spin_lock_irqsave(dev->host_lock, flags);
-        mesh_interrupt(irq, dev_id);
+        mesh_interrupt(ms);
         spin_unlock_irqrestore(dev->host_lock, flags);
         return IRQ_HANDLED;
 }
@@ -1661,9 +1662,8 @@ static int mesh_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
  * handler (do_mesh_interrupt) or by other functions in
  * exceptional circumstances
  */
-static void mesh_interrupt(int irq, void *dev_id)
+static void mesh_interrupt(struct mesh_state *ms)
 {
-        struct mesh_state *ms = (struct mesh_state *) dev_id;
         volatile struct mesh_regs __iomem *mr = ms->mesh;
         int intr;
 
@@ -1947,7 +1947,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
                 ms->tgts[tgt].current_req = NULL;
         }
 
-        if ((cfp = get_property(mesh, "clock-frequency", NULL)))
+        if ((cfp = of_get_property(mesh, "clock-frequency", NULL)))
                 ms->clk_freq = *cfp;
         else {
                 printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 6777e8a69153..54d8bdf86852 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4293,7 +4293,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ha->devnum = devnum;    /* specifies microcode load address */
 
 #ifdef QLA_64BIT_PTR
-        if (pci_set_dma_mask(ha->pdev, (dma_addr_t) ~ 0ULL)) {
+        if (pci_set_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
                 if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
                         printk(KERN_WARNING "scsi(%li): Unable to set a "
                                "suitable DMA mask - aborting\n", ha->host_no);
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 3e296ab845b6..2a45aec4ff29 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -13,7 +13,6 @@
 
 #ifdef CONFIG_SPARC
 #include <asm/prom.h>
-#include <asm/pbm.h>
 #endif
 
 /* XXX(hch): this is ugly, but we don't want to pull in exioctl.h */
@@ -130,18 +129,17 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
 int
 qla2100_pci_config(scsi_qla_host_t *ha)
 {
-        uint16_t w, mwi;
+        int ret;
+        uint16_t w;
         uint32_t d;
         unsigned long flags;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
         pci_set_master(ha->pdev);
-        mwi = 0;
-        if (pci_set_mwi(ha->pdev))
-                mwi = PCI_COMMAND_INVALIDATE;
+        ret = pci_set_mwi(ha->pdev);
 
         pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
-        w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
+        w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
         pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
         /* Reset expansion ROM address decode enable */
@@ -166,22 +164,22 @@ qla2100_pci_config(scsi_qla_host_t *ha)
 int
 qla2300_pci_config(scsi_qla_host_t *ha)
 {
-        uint16_t        w, mwi;
+        int             ret;
+        uint16_t        w;
         uint32_t        d;
         unsigned long   flags = 0;
         uint32_t        cnt;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
         pci_set_master(ha->pdev);
-        mwi = 0;
-        if (pci_set_mwi(ha->pdev))
-                mwi = PCI_COMMAND_INVALIDATE;
+        ret = pci_set_mwi(ha->pdev);
 
         pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
-        w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
+        w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
 
         if (IS_QLA2322(ha) || IS_QLA6322(ha))
                 w &= ~PCI_COMMAND_INTX_DISABLE;
+        pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
         /*
          * If this is a 2300 card and not 2312, reset the
@@ -210,7 +208,7 @@ qla2300_pci_config(scsi_qla_host_t *ha)
                 ha->fb_rev = RD_FB_CMD_REG(ha, reg);
 
                 if (ha->fb_rev == FPM_2300)
-                        w &= ~PCI_COMMAND_INVALIDATE;
+                        pci_clear_mwi(ha->pdev);
 
                 /* Deselect FPM registers. */
                 WRT_REG_WORD(&reg->ctrl_status, 0x0);
@@ -227,7 +225,6 @@ qla2300_pci_config(scsi_qla_host_t *ha)
 
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
         }
-        pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
         pci_write_config_byte(ha->pdev, PCI_LATENCY_TIMER, 0x80);
 
@@ -253,19 +250,18 @@ qla2300_pci_config(scsi_qla_host_t *ha)
 int
 qla24xx_pci_config(scsi_qla_host_t *ha)
 {
-        uint16_t w, mwi;
+        int ret;
+        uint16_t w;
         uint32_t d;
         unsigned long flags = 0;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
         int pcix_cmd_reg, pcie_dctl_reg;
 
         pci_set_master(ha->pdev);
-        mwi = 0;
-        if (pci_set_mwi(ha->pdev))
-                mwi = PCI_COMMAND_INVALIDATE;
+        ret = pci_set_mwi(ha->pdev);
 
         pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
-        w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
+        w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
         w &= ~PCI_COMMAND_INTX_DISABLE;
         pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
@@ -1400,9 +1396,8 @@ static void qla2xxx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, nvram_t *nv)
 {
 #ifdef CONFIG_SPARC
         struct pci_dev *pdev = ha->pdev;
-        struct pcidev_cookie *pcp = pdev->sysdata;
-        struct device_node *dp = pcp->prom_node;
-        u8 *val;
+        struct device_node *dp = pci_device_to_OF_node(pdev);
+        const u8 *val;
         int len;
 
         val = of_get_property(dp, "port-wwn", &len);
@@ -3373,9 +3368,8 @@ static void qla24xx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, struct nvram_24xx *n
 {
 #ifdef CONFIG_SPARC
         struct pci_dev *pdev = ha->pdev;
-        struct pcidev_cookie *pcp = pdev->sysdata;
-        struct device_node *dp = pcp->prom_node;
-        u8 *val;
+        struct device_node *dp = pci_device_to_OF_node(pdev);
+        const u8 *val;
         int len;
 
         val = of_get_property(dp, "port-wwn", &len);
@@ -3931,6 +3925,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *ha)
 
         if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
                 return;
+        if (!ha->fw_major_version)
+                return;
 
         ret = qla2x00_stop_firmware(ha);
         for (retries = 5; ret != QLA_SUCCESS && retries ; retries--) {
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d4885616cd39..ca463469063d 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1726,6 +1726,17 @@ qla2x00_request_irqs(scsi_qla_host_t *ha)
         qla_printk(KERN_WARNING, ha,
             "MSI-X: Falling back-to INTa mode -- %d.\n", ret);
 skip_msix:
+
+        if (!IS_QLA24XX(ha))
+                goto skip_msi;
+
+        ret = pci_enable_msi(ha->pdev);
+        if (!ret) {
+                DEBUG2(qla_printk(KERN_INFO, ha, "MSI: Enabled.\n"));
+                ha->flags.msi_enabled = 1;
+        }
+skip_msi:
+
         ret = request_irq(ha->pdev->irq, ha->isp_ops.intr_handler,
             IRQF_DISABLED|IRQF_SHARED, QLA2XXX_DRIVER_NAME, ha);
         if (!ret) {
@@ -1746,6 +1757,8 @@ qla2x00_free_irqs(scsi_qla_host_t *ha)
 
         if (ha->flags.msix_enabled)
                 qla24xx_disable_msix(ha);
-        else if (ha->flags.inta_enabled)
+        else if (ha->flags.inta_enabled) {
                 free_irq(ha->host->irq, ha);
+                pci_disable_msi(ha->pdev);
+        }
 }
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b78919a318e2..dd076da86a46 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -36,7 +36,7 @@ module_param(ql2xlogintimeout, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xlogintimeout,
                 "Login timeout value in seconds.");
 
-int qlport_down_retry = 30;
+int qlport_down_retry;
 module_param(qlport_down_retry, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(qlport_down_retry,
                 "Maximum number of command retries to a port that returns "
@@ -1577,9 +1577,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto probe_failed;
         }
 
-        if (qla2x00_initialize_adapter(ha) &&
-            !(ha->device_flags & DFLG_NO_CABLE)) {
-
+        if (qla2x00_initialize_adapter(ha)) {
                 qla_printk(KERN_WARNING, ha,
                     "Failed to initialize adapter\n");
 
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index dc85495c337f..c375a4efbc71 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.07-k6"
+#define QLA2XXX_VERSION      "8.01.07-k7"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
diff --git a/drivers/scsi/qla4xxx/ql4_dbg.c b/drivers/scsi/qla4xxx/ql4_dbg.c
index 7b4e077a39c1..6437d024b0dd 100644
--- a/drivers/scsi/qla4xxx/ql4_dbg.c
+++ b/drivers/scsi/qla4xxx/ql4_dbg.c
@@ -8,6 +8,8 @@
 #include "ql4_def.h"
 #include <scsi/scsi_dbg.h>
 
+#if 0
+
 static void qla4xxx_print_srb_info(struct srb * srb)
 {
         printk("%s: srb = 0x%p, flags=0x%02x\n", __func__, srb, srb->flags);
@@ -195,3 +197,5 @@ void qla4xxx_dump_buffer(void *b, uint32_t size)
         if (cnt % 16)
                 printk(KERN_DEBUG "\n");
 }
+
+#endif  /*  0  */
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index e021eb5db2b2..5b00cb04e7c0 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -43,8 +43,6 @@ int qla4xxx_get_fwddb_entry(struct scsi_qla_host *ha,
                             uint16_t *tcp_source_port_num,
                             uint16_t *connection_id);
 
-struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host * ha,
-                                     uint32_t fw_ddb_index);
 int qla4xxx_set_ddb_entry(struct scsi_qla_host * ha, uint16_t fw_ddb_index,
                           dma_addr_t fw_ddb_entry_dma);
 
@@ -55,18 +53,11 @@ void qla4xxx_get_crash_record(struct scsi_qla_host * ha);
 struct ddb_entry *qla4xxx_alloc_sess(struct scsi_qla_host *ha);
 int qla4xxx_add_sess(struct ddb_entry *);
 void qla4xxx_destroy_sess(struct ddb_entry *ddb_entry);
-int qla4xxx_conn_close_sess_logout(struct scsi_qla_host * ha,
-                                   uint16_t fw_ddb_index,
-                                   uint16_t connection_id,
-                                   uint16_t option);
-int qla4xxx_clear_database_entry(struct scsi_qla_host * ha,
-                                 uint16_t fw_ddb_index);
 int qla4xxx_is_nvram_configuration_valid(struct scsi_qla_host * ha);
 int qla4xxx_get_fw_version(struct scsi_qla_host * ha);
 void qla4xxx_interrupt_service_routine(struct scsi_qla_host * ha,
                                        uint32_t intr_status);
 int qla4xxx_init_rings(struct scsi_qla_host * ha);
-void qla4xxx_dump_buffer(void *b, uint32_t size);
 struct srb * qla4xxx_del_from_active_array(struct scsi_qla_host *ha, uint32_t index);
 void qla4xxx_srb_compl(struct scsi_qla_host *ha, struct srb *srb);
 int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha);
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index b907b06d72ab..6365df268612 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -7,9 +7,8 @@
 
 #include "ql4_def.h"
 
-/*
- * QLogic ISP4xxx Hardware Support Function Prototypes.
- */
+static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
+                                            uint32_t fw_ddb_index);
 
 static void ql4xxx_set_mac_number(struct scsi_qla_host *ha)
 {
@@ -48,7 +47,8 @@ static void ql4xxx_set_mac_number(struct scsi_qla_host *ha)
  * This routine deallocates and unlinks the specified ddb_entry from the
  * adapter's
  **/
-void qla4xxx_free_ddb(struct scsi_qla_host *ha, struct ddb_entry *ddb_entry)
+static void qla4xxx_free_ddb(struct scsi_qla_host *ha,
+                             struct ddb_entry *ddb_entry)
 {
         /* Remove device entry from list */
         list_del_init(&ddb_entry->list);
@@ -370,9 +370,9 @@ static struct ddb_entry* qla4xxx_get_ddb_entry(struct scsi_qla_host *ha,
  * must be initialized prior to calling this routine
  *
  **/
-int qla4xxx_update_ddb_entry(struct scsi_qla_host *ha,
-                             struct ddb_entry *ddb_entry,
-                             uint32_t fw_ddb_index)
+static int qla4xxx_update_ddb_entry(struct scsi_qla_host *ha,
+                                    struct ddb_entry *ddb_entry,
+                                    uint32_t fw_ddb_index)
 {
         struct dev_db_entry *fw_ddb_entry = NULL;
         dma_addr_t fw_ddb_entry_dma;
@@ -450,8 +450,8 @@ int qla4xxx_update_ddb_entry(struct scsi_qla_host *ha,
  * This routine allocates a ddb_entry, ititializes some values, and
  * inserts it into the ddb list.
  **/
-struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
-                                     uint32_t fw_ddb_index)
+static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
+                                            uint32_t fw_ddb_index)
 {
         struct ddb_entry *ddb_entry;
 
diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index d41ce380eedc..a216a1781afb 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -19,8 +19,8 @@
  *      - advances the request_in pointer
  *      - checks for queue full
  **/
-int qla4xxx_get_req_pkt(struct scsi_qla_host *ha,
-                        struct queue_entry **queue_entry)
+static int qla4xxx_get_req_pkt(struct scsi_qla_host *ha,
+                               struct queue_entry **queue_entry)
 {
         uint16_t request_in;
         uint8_t status = QLA_SUCCESS;
@@ -62,8 +62,8 @@ int qla4xxx_get_req_pkt(struct scsi_qla_host *ha,
  *
  * This routine issues a marker IOCB.
  **/
-int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
-                             struct ddb_entry *ddb_entry, int lun)
+static int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
+                                    struct ddb_entry *ddb_entry, int lun)
 {
         struct marker_entry *marker_entry;
         unsigned long flags = 0;
@@ -96,7 +96,7 @@ exit_send_marker:
         return status;
 }
 
-struct continuation_t1_entry* qla4xxx_alloc_cont_entry(
+static struct continuation_t1_entry* qla4xxx_alloc_cont_entry(
         struct scsi_qla_host *ha)
 {
         struct continuation_t1_entry *cont_entry;
@@ -120,7 +120,7 @@ struct continuation_t1_entry* qla4xxx_alloc_cont_entry(
         return cont_entry;
 }
 
-uint16_t qla4xxx_calc_request_entries(uint16_t dsds)
+static uint16_t qla4xxx_calc_request_entries(uint16_t dsds)
 {
         uint16_t iocbs;
 
@@ -133,9 +133,9 @@ uint16_t qla4xxx_calc_request_entries(uint16_t dsds)
         return iocbs;
 }
 
-void qla4xxx_build_scsi_iocbs(struct srb *srb,
-                              struct command_t3_entry *cmd_entry,
-                              uint16_t tot_dsds)
+static void qla4xxx_build_scsi_iocbs(struct srb *srb,
+                                     struct command_t3_entry *cmd_entry,
+                                     uint16_t tot_dsds)
 {
         struct scsi_qla_host *ha;
         uint16_t avail_dsds;
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 7f28657eef3f..f116ff917237 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -20,9 +20,9 @@
  * If outCount is 0, this routine completes successfully WITHOUT waiting
  * for the mailbox command to complete.
  **/
-int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
-                            uint8_t outCount, uint32_t *mbx_cmd,
-                            uint32_t *mbx_sts)
+static int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
+                                   uint8_t outCount, uint32_t *mbx_cmd,
+                                   uint32_t *mbx_sts)
 {
         int status = QLA_ERROR;
         uint8_t i;
@@ -170,6 +170,8 @@ mbox_exit:
 }
 
 
+#if 0
+
 /**
  * qla4xxx_issue_iocb - issue mailbox iocb command
  * @ha: adapter state pointer.
@@ -243,6 +245,8 @@ int qla4xxx_clear_database_entry(struct scsi_qla_host * ha,
         return QLA_SUCCESS;
 }
 
+#endif  /*  0  */
+
 /**
  * qla4xxx_initialize_fw_cb - initializes firmware control block.
  * @ha: Pointer to host adapter structure.
@@ -570,6 +574,7 @@ int qla4xxx_set_ddb_entry(struct scsi_qla_host * ha, uint16_t fw_ddb_index,
         return qla4xxx_mailbox_command(ha, 4, 1, &mbox_cmd[0], &mbox_sts[0]);
 }
 
+#if 0
 int qla4xxx_conn_open_session_login(struct scsi_qla_host * ha,
                                     uint16_t fw_ddb_index)
 {
@@ -594,6 +599,7 @@ int qla4xxx_conn_open_session_login(struct scsi_qla_host * ha,
 
                 return status;
 }
+#endif  /*  0  */
 
 /**
  * qla4xxx_get_crash_record - retrieves crash record.
@@ -649,6 +655,7 @@ exit_get_crash_record:
                                   crash_record, crash_record_dma);
 }
 
+#if 0
 /**
  * qla4xxx_get_conn_event_log - retrieves connection event log
  * @ha: Pointer to host adapter structure.
@@ -738,6 +745,7 @@ exit_get_event_log:
                 dma_free_coherent(&ha->pdev->dev, event_log_size, event_log,
                                   event_log_dma);
 }
+#endif  /*  0  */
 
 /**
  * qla4xxx_reset_lun - issues LUN Reset
@@ -834,7 +842,8 @@ int qla4xxx_get_fw_version(struct scsi_qla_host * ha)
         return QLA_SUCCESS;
 }
 
-int qla4xxx_get_default_ddb(struct scsi_qla_host *ha, dma_addr_t dma_addr)
+static int qla4xxx_get_default_ddb(struct scsi_qla_host *ha,
+                                   dma_addr_t dma_addr)
 {
         uint32_t mbox_cmd[MBOX_REG_COUNT];
         uint32_t mbox_sts[MBOX_REG_COUNT];
@@ -855,7 +864,7 @@ int qla4xxx_get_default_ddb(struct scsi_qla_host *ha, dma_addr_t dma_addr)
         return QLA_SUCCESS;
 }
 
-int qla4xxx_req_ddb_entry(struct scsi_qla_host *ha, uint32_t *ddb_index)
+static int qla4xxx_req_ddb_entry(struct scsi_qla_host *ha, uint32_t *ddb_index)
 {
         uint32_t mbox_cmd[MBOX_REG_COUNT];
         uint32_t mbox_sts[MBOX_REG_COUNT];
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 0bfddf893ed0..da21f5fbbf87 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -14,7 +14,7 @@
 /*
  * Driver version
  */
-char qla4xxx_version_str[40];
+static char qla4xxx_version_str[40];
 
 /*
  * SRB allocation cache
@@ -45,8 +45,7 @@ int ql4_mod_unload = 0;
 /*
  * SCSI host template entry points
  */
-
-void qla4xxx_config_dma_addressing(struct scsi_qla_host *ha);
+static void qla4xxx_config_dma_addressing(struct scsi_qla_host *ha);
 
 /*
  * iSCSI template entry points
@@ -1352,7 +1351,7 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
  * At exit, the @ha's flags.enable_64bit_addressing set to indicated
  * supported addressing method.
  */
-void qla4xxx_config_dma_addressing(struct scsi_qla_host *ha)
+static void qla4xxx_config_dma_addressing(struct scsi_qla_host *ha)
 {
         int retval;
 
@@ -1627,7 +1626,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
 
-struct pci_driver qla4xxx_pci_driver = {
+static struct pci_driver qla4xxx_pci_driver = {
         .name           = DRIVER_NAME,
         .id_table       = qla4xxx_pci_tbl,
         .probe          = qla4xxx_probe_adapter,
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 3e2930b7ee23..06229f225ee9 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -36,7 +36,6 @@
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
 
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 3963e7013bd9..e8350c562d24 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -38,7 +38,6 @@
 #include "scsi_logging.h"
 
 #define SENSE_TIMEOUT           (10*HZ)
-#define START_UNIT_TIMEOUT      (30*HZ)
 
 /*
  * These should *probably* be handled by the host itself.
@@ -936,7 +935,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
 
                 for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
                         rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
-                                                START_UNIT_TIMEOUT, 0);
+                                                scmd->device->timeout, 0);
 
                 if (rtn == SUCCESS)
                         return 0;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 61fbcdcbb009..1f5a07bf2a75 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -173,7 +173,7 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
  * @retries:    number of times to retry request
  * @flags:      or into request flags;
  *
- * returns the req->errors value which is the the scsi_cmnd result
+ * returns the req->errors value which is the scsi_cmnd result
  * field.
  **/
 int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 14c4f065b2b8..b4d1ece46f78 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1718,31 +1718,12 @@ fc_starget_delete(struct work_struct *work)
         struct fc_rport *rport =
                 container_of(work, struct fc_rport, stgt_delete_work);
         struct Scsi_Host *shost = rport_to_shost(rport);
-        unsigned long flags;
         struct fc_internal *i = to_fc_internal(shost->transportt);
 
-        /*
-         * Involve the LLDD if possible. All io on the rport is to
-         * be terminated, either as part of the dev_loss_tmo callback
-         * processing, or via the terminate_rport_io function.
-         */
-        if (i->f->dev_loss_tmo_callbk)
-                i->f->dev_loss_tmo_callbk(rport);
-        else if (i->f->terminate_rport_io)
+        /* Involve the LLDD if possible to terminate all io on the rport. */
+        if (i->f->terminate_rport_io)
                 i->f->terminate_rport_io(rport);
 
-        spin_lock_irqsave(shost->host_lock, flags);
-        if (rport->flags & FC_RPORT_DEVLOSS_PENDING) {
-                spin_unlock_irqrestore(shost->host_lock, flags);
-                if (!cancel_delayed_work(&rport->fail_io_work))
-                        fc_flush_devloss(shost);
-                if (!cancel_delayed_work(&rport->dev_loss_work))
-                        fc_flush_devloss(shost);
-                spin_lock_irqsave(shost->host_lock, flags);
-                rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
-        }
-        spin_unlock_irqrestore(shost->host_lock, flags);
-
         scsi_remove_target(&rport->dev);
 }
 
@@ -1760,6 +1741,7 @@ fc_rport_final_delete(struct work_struct *work)
         struct device *dev = &rport->dev;
         struct Scsi_Host *shost = rport_to_shost(rport);
         struct fc_internal *i = to_fc_internal(shost->transportt);
+        unsigned long flags;
 
         /*
          * if a scan is pending, flush the SCSI Host work_q so that 
@@ -1768,13 +1750,37 @@ fc_rport_final_delete(struct work_struct *work)
         if (rport->flags & FC_RPORT_SCAN_PENDING)
                 scsi_flush_work(shost);
 
+        /* involve the LLDD to terminate all pending i/o */
+        if (i->f->terminate_rport_io)
+                i->f->terminate_rport_io(rport);
+
+        /*
+         * Cancel any outstanding timers. These should really exist
+         * only when rmmod'ing the LLDD and we're asking for
+         * immediate termination of the rports
+         */
+        spin_lock_irqsave(shost->host_lock, flags);
+        if (rport->flags & FC_RPORT_DEVLOSS_PENDING) {
+                spin_unlock_irqrestore(shost->host_lock, flags);
+                if (!cancel_delayed_work(&rport->fail_io_work))
+                        fc_flush_devloss(shost);
+                if (!cancel_delayed_work(&rport->dev_loss_work))
+                        fc_flush_devloss(shost);
+                spin_lock_irqsave(shost->host_lock, flags);
+                rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
+        }
+        spin_unlock_irqrestore(shost->host_lock, flags);
+
         /* Delete SCSI target and sdevs */
         if (rport->scsi_target_id != -1)
                 fc_starget_delete(&rport->stgt_delete_work);
-        else if (i->f->dev_loss_tmo_callbk)
+
+        /*
+         * Notify the driver that the rport is now dead. The LLDD will
+         * also guarantee that any communication to the rport is terminated
+         */
+        if (i->f->dev_loss_tmo_callbk)
                 i->f->dev_loss_tmo_callbk(rport);
-        else if (i->f->terminate_rport_io)
-                i->f->terminate_rport_io(rport);
 
         transport_remove_device(dev);
         device_del(dev);
@@ -1963,8 +1969,6 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
                         }
 
                         if (match) {
-                                struct delayed_work *work =
-                                                        &rport->dev_loss_work;
 
                                 memcpy(&rport->node_name, &ids->node_name,
                                         sizeof(rport->node_name));
@@ -1982,46 +1986,61 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
                                                 fci->f->dd_fcrport_size);
 
                                 /*
-                                 * If we were blocked, we were a target.
-                                 * If no longer a target, we leave the timer
-                                 * running in case the port changes roles
-                                 * prior to the timer expiring. If the timer
-                                 * fires, the target will be torn down.
+                                 * If we were not a target, cancel the
+                                 * io terminate and rport timers, and
+                                 * we're done.
+                                 *
+                                 * If we were a target, but our new role
+                                 * doesn't indicate a target, leave the
+                                 * timers running expecting the role to
+                                 * change as the target fully logs in. If
+                                 * it doesn't, the target will be torn down.
+                                 *
+                                 * If we were a target, and our role shows
+                                 * we're still a target, cancel the timers
+                                 * and kick off a scan.
                                  */
-                                if (!(ids->roles & FC_RPORT_ROLE_FCP_TARGET))
-                                        return rport;
 
-                                /* restart the target */
+                                /* was a target, not in roles */
+                                if ((rport->scsi_target_id != -1) &&
+                                    (!(ids->roles & FC_RPORT_ROLE_FCP_TARGET)))
+                                        return rport;
 
                                 /*
-                                 * Stop the target timers first. Take no action
-                                 * on the del_timer failure as the state
-                                 * machine state change will validate the
-                                 * transaction.
+                                 * Stop the fail io and dev_loss timers.
+                                 * If they flush, the port_state will
+                                 * be checked and will NOOP the function.
                                  */
                                 if (!cancel_delayed_work(&rport->fail_io_work))
                                         fc_flush_devloss(shost);
-                                if (!cancel_delayed_work(work))
+                                if (!cancel_delayed_work(&rport->dev_loss_work))
                                         fc_flush_devloss(shost);
 
                                 spin_lock_irqsave(shost->host_lock, flags);
 
                                 rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
 
-                                /* initiate a scan of the target */
-                                rport->flags |= FC_RPORT_SCAN_PENDING;
-                                scsi_queue_work(shost, &rport->scan_work);
-
-                                spin_unlock_irqrestore(shost->host_lock, flags);
-
-                                scsi_target_unblock(&rport->dev);
+                                /* if target, initiate a scan */
+                                if (rport->scsi_target_id != -1) {
+                                        rport->flags |= FC_RPORT_SCAN_PENDING;
+                                        scsi_queue_work(shost,
+                                                        &rport->scan_work);
+                                        spin_unlock_irqrestore(shost->host_lock,
+                                                        flags);
+                                        scsi_target_unblock(&rport->dev);
+                                } else
+                                        spin_unlock_irqrestore(shost->host_lock,
+                                                        flags);
 
                                 return rport;
                         }
                 }
         }
 
-        /* Search the bindings array */
+        /*
+         * Search the bindings array
+         * Note: if never a FCP target, you won't be on this list
+         */
         if (fc_host->tgtid_bind_type != FC_TGTID_BIND_NONE) {
 
                 /* search for a matching consistent binding */
@@ -2158,15 +2177,24 @@ fc_remote_port_delete(struct fc_rport  *rport)
 
         spin_lock_irqsave(shost->host_lock, flags);
 
-        /* If no scsi target id mapping, delete it */
-        if (rport->scsi_target_id == -1) {
-                list_del(&rport->peers);
-                rport->port_state = FC_PORTSTATE_DELETED;
-                fc_queue_work(shost, &rport->rport_delete_work);
+        if (rport->port_state != FC_PORTSTATE_ONLINE) {
                 spin_unlock_irqrestore(shost->host_lock, flags);
                 return;
         }
 
+        /*
+         * In the past, we if this was not an FCP-Target, we would
+         * unconditionally just jump to deleting the rport.
+         * However, rports can be used as node containers by the LLDD,
+         * and its not appropriate to just terminate the rport at the
+         * first sign of a loss in connectivity. The LLDD may want to
+         * send ELS traffic to re-validate the login. If the rport is
+         * immediately deleted, it makes it inappropriate for a node
+         * container.
+         * So... we now unconditionally wait dev_loss_tmo before
+         * destroying an rport.
+         */
+
         rport->port_state = FC_PORTSTATE_BLOCKED;
 
         rport->flags |= FC_RPORT_DEVLOSS_PENDING;
@@ -2263,11 +2291,11 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)
 EXPORT_SYMBOL(fc_remote_port_rolechg);
 
 /**
- * fc_timeout_deleted_rport - Timeout handler for a deleted remote port that
- *                       was a SCSI target (thus was blocked), and failed
- *                       to return in the alloted time.
+ * fc_timeout_deleted_rport - Timeout handler for a deleted remote port,
+ *                      which we blocked, and has now failed to return
+ *                      in the allotted time.
  * 
- * @work:       rport target that failed to reappear in the alloted time.
+ * @work:       rport target that failed to reappear in the allotted time.
  **/
 static void
 fc_timeout_deleted_rport(struct work_struct *work)
@@ -2283,10 +2311,12 @@ fc_timeout_deleted_rport(struct work_struct *work)
         rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
 
         /*
-         * If the port is ONLINE, then it came back. Validate it's still an
-         * FCP target. If not, tear down the scsi_target on it.
+         * If the port is ONLINE, then it came back. If it was a SCSI
+         * target, validate it still is. If not, tear down the
+         * scsi_target on it.
          */
         if ((rport->port_state == FC_PORTSTATE_ONLINE) &&
+            (rport->scsi_target_id != -1) &&
             !(rport->roles & FC_RPORT_ROLE_FCP_TARGET)) {
                 dev_printk(KERN_ERR, &rport->dev,
                         "blocked FC remote port time out: no longer"
@@ -2297,18 +2327,24 @@ fc_timeout_deleted_rport(struct work_struct *work)
                 return;
         }
 
+        /* NOOP state - we're flushing workq's */
         if (rport->port_state != FC_PORTSTATE_BLOCKED) {
                 spin_unlock_irqrestore(shost->host_lock, flags);
                 dev_printk(KERN_ERR, &rport->dev,
-                        "blocked FC remote port time out: leaving target alone\n");
+                        "blocked FC remote port time out: leaving"
+                        " rport%s alone\n",
+                        (rport->scsi_target_id != -1) ?  " and starget" : "");
                 return;
         }
 
-        if (fc_host->tgtid_bind_type == FC_TGTID_BIND_NONE) {
+        if ((fc_host->tgtid_bind_type == FC_TGTID_BIND_NONE) ||
+            (rport->scsi_target_id == -1)) {
                 list_del(&rport->peers);
                 rport->port_state = FC_PORTSTATE_DELETED;
                 dev_printk(KERN_ERR, &rport->dev,
-                        "blocked FC remote port time out: removing target\n");
+                        "blocked FC remote port time out: removing"
+                        " rport%s\n",
+                        (rport->scsi_target_id != -1) ?  " and starget" : "");
                 fc_queue_work(shost, &rport->rport_delete_work);
                 spin_unlock_irqrestore(shost->host_lock, flags);
                 return;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 570977cf9efb..0c691a60a756 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -41,7 +41,6 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/moduleparam.h>
 #include <linux/cdev.h>
 #include <linux/seq_file.h>
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index a15752b37990..eef82758d047 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -6,87 +6,49 @@
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu)
  * Copyright (C) 2001 Florian Lohoff (flo@rfc822.org)
- * Copyright (C) 2003 Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2003, 07 Ralf Baechle (ralf@linux-mips.org)
  * 
  * (In all truth, Jed Schimmel wrote all this code.)
  */
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/blkdev.h>
+
+#undef DEBUG
+
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/gfp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/spinlock.h>
 
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/sgialib.h>
-#include <asm/sgi/sgi.h>
-#include <asm/sgi/mc.h>
 #include <asm/sgi/hpc3.h>
 #include <asm/sgi/ip22.h>
-#include <asm/irq.h>
-#include <asm/io.h>
+#include <asm/sgi/wd.h>
 
 #include "scsi.h"
-#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 
-#include <linux/stat.h>
-
-#if 0
-#define DPRINTK(args...)        printk(args)
-#else
-#define DPRINTK(args...)
-#endif
-
-#define HDATA(ptr) ((struct ip22_hostdata *)((ptr)->hostdata))
-
 struct ip22_hostdata {
         struct WD33C93_hostdata wh;
         struct hpc_data {
                 dma_addr_t      dma;
-                void            * cpu;
+                void            *cpu;
         } hd;
 };
 
+#define host_to_hostdata(host) ((struct ip22_hostdata *)((host)->hostdata))
+
 struct hpc_chunk {
         struct hpc_dma_desc desc;
         u32 _padding;   /* align to quadword boundary */
 };
 
-struct Scsi_Host *sgiwd93_host;
-struct Scsi_Host *sgiwd93_host1;
-
-/* Wuff wuff, wuff, wd33c93.c, wuff wuff, object oriented, bow wow. */
-static inline void write_wd33c93_count(const wd33c93_regs regs,
-                                      unsigned long value)
-{
-        *regs.SASR = WD_TRANSFER_COUNT_MSB;
-        mb();
-        *regs.SCMD = ((value >> 16) & 0xff);
-        *regs.SCMD = ((value >>  8) & 0xff);
-        *regs.SCMD = ((value >>  0) & 0xff);
-        mb();
-}
-
-static inline unsigned long read_wd33c93_count(const wd33c93_regs regs)
-{
-        unsigned long value;
-
-        *regs.SASR = WD_TRANSFER_COUNT_MSB;
-        mb();
-        value =  ((*regs.SCMD & 0xff) << 16);
-        value |= ((*regs.SCMD & 0xff) <<  8);
-        value |= ((*regs.SCMD & 0xff) <<  0);
-        mb();
-        return value;
-}
-
 static irqreturn_t sgiwd93_intr(int irq, void *dev_id)
 {
-        struct Scsi_Host * host = (struct Scsi_Host *) dev_id;
+        struct Scsi_Host * host = dev_id;
         unsigned long flags;
 
         spin_lock_irqsave(host->host_lock, flags);
@@ -131,12 +93,12 @@ void fill_hpc_entries(struct hpc_chunk *hcp, struct scsi_cmnd *cmd, int datainp)
 
 static int dma_setup(struct scsi_cmnd *cmd, int datainp)
 {
-        struct ip22_hostdata *hdata = HDATA(cmd->device->host);
+        struct ip22_hostdata *hdata = host_to_hostdata(cmd->device->host);
         struct hpc3_scsiregs *hregs =
                 (struct hpc3_scsiregs *) cmd->device->host->base;
         struct hpc_chunk *hcp = (struct hpc_chunk *) hdata->hd.cpu;
 
-        DPRINTK("dma_setup: datainp<%d> hcp<%p> ", datainp, hcp);
+        pr_debug("dma_setup: datainp<%d> hcp<%p> ", datainp, hcp);
 
         hdata->wh.dma_dir = datainp;
 
@@ -151,7 +113,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int datainp)
 
         fill_hpc_entries(hcp, cmd, datainp);
 
-        DPRINTK(" HPCGO\n");
+        pr_debug(" HPCGO\n");
 
         /* Start up the HPC. */
         hregs->ndptr = hdata->hd.dma;
@@ -166,7 +128,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int datainp)
 static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
                      int status)
 {
-        struct ip22_hostdata *hdata = HDATA(instance);
+        struct ip22_hostdata *hdata = host_to_hostdata(instance);
         struct hpc3_scsiregs *hregs;
 
         if (!SCpnt)
@@ -174,7 +136,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
 
         hregs = (struct hpc3_scsiregs *) SCpnt->device->host->base;
 
-        DPRINTK("dma_stop: status<%d> ", status);
+        pr_debug("dma_stop: status<%d> ", status);
 
         /* First stop the HPC and flush it's FIFO. */
         if (hdata->wh.dma_dir) {
@@ -186,7 +148,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
         dma_unmap_single(NULL, SCpnt->SCp.dma_handle, SCpnt->SCp.this_residual,
                          SCpnt->sc_data_direction);
 
-        DPRINTK("\n");
+        pr_debug("\n");
 }
 
 void sgiwd93_reset(unsigned long base)
@@ -216,29 +178,71 @@ static inline void init_hpc_chain(struct hpc_data *hd)
         hcp->desc.pnext = hd->dma;
 }
 
-static struct Scsi_Host * __init sgiwd93_setup_scsi(
-        struct scsi_host_template *SGIblows, int unit, int irq,
-        struct hpc3_scsiregs *hregs, unsigned char *wdregs)
+static int sgiwd93_bus_reset(struct scsi_cmnd *cmd)
+{
+        /* FIXME perform bus-specific reset */
+
+        /* FIXME 2: kill this function, and let midlayer fallback
+           to the same result, calling wd33c93_host_reset() */
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        wd33c93_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return SUCCESS;
+}
+
+/*
+ * Kludge alert - the SCSI code calls the abort and reset method with int
+ * arguments not with pointers.  So this is going to blow up beautyfully
+ * on 64-bit systems with memory outside the compat address spaces.
+ */
+static struct scsi_host_template sgiwd93_template = {
+        .module                 = THIS_MODULE,
+        .proc_name              = "SGIWD93",
+        .name                   = "SGI WD93",
+        .queuecommand           = wd33c93_queuecommand,
+        .eh_abort_handler       = wd33c93_abort,
+        .eh_bus_reset_handler   = sgiwd93_bus_reset,
+        .eh_host_reset_handler  = wd33c93_host_reset,
+        .can_queue              = 16,
+        .this_id                = 7,
+        .sg_tablesize           = SG_ALL,
+        .cmd_per_lun            = 8,
+        .use_clustering         = DISABLE_CLUSTERING,
+};
+
+static int __init sgiwd93_probe(struct platform_device *pdev)
 {
+        struct sgiwd93_platform_data *pd = pdev->dev.platform_data;
+        unsigned char *wdregs = pd->wdregs;
+        struct hpc3_scsiregs *hregs = pd->hregs;
         struct ip22_hostdata *hdata;
         struct Scsi_Host *host;
         wd33c93_regs regs;
-
-        host = scsi_register(SGIblows, sizeof(struct ip22_hostdata));
-        if (!host)
-                return NULL;
+        unsigned int unit = pd->unit;
+        unsigned int irq = pd->irq;
+        int err;
+
+        host = scsi_host_alloc(&sgiwd93_template, sizeof(struct ip22_hostdata));
+        if (!host) {
+                err = -ENOMEM;
+                goto out;
+        }
 
         host->base = (unsigned long) hregs;
         host->irq = irq;
 
-        hdata = HDATA(host);
-        hdata->hd.cpu = dma_alloc_coherent(NULL, PAGE_SIZE, &hdata->hd.dma,
-                                           GFP_KERNEL);
+        hdata = host_to_hostdata(host);
+        hdata->hd.cpu = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
+                                           &hdata->hd.dma, GFP_KERNEL);
         if (!hdata->hd.cpu) {
                 printk(KERN_WARNING "sgiwd93: Could not allocate memory for "
                        "host %d buffer.\n", unit);
-                goto out_unregister;
+                err = -ENOMEM;
+                goto out_put;
         }
+
         init_hpc_chain(&hdata->hd);
 
         regs.SASR = wdregs + 3;
@@ -249,95 +253,67 @@ static struct Scsi_Host * __init sgiwd93_setup_scsi(
         if (hdata->wh.no_sync == 0xff)
                 hdata->wh.no_sync = 0;
 
-        if (request_irq(irq, sgiwd93_intr, 0, "SGI WD93", (void *) host)) {
+        err = request_irq(irq, sgiwd93_intr, 0, "SGI WD93", host);
+        if (err) {
                 printk(KERN_WARNING "sgiwd93: Could not register irq %d "
                        "for host %d.\n", irq, unit);
                 goto out_free;
         }
-        return host;
 
-out_free:
-        dma_free_coherent(NULL, PAGE_SIZE, hdata->hd.cpu, hdata->hd.dma);
-        wd33c93_release();
+        platform_set_drvdata(pdev, host);
 
-out_unregister:
-        scsi_unregister(host);
+        err = scsi_add_host(host, NULL);
+        if (err)
+                goto out_irq;
 
-        return NULL;
-}
-
-static int __init sgiwd93_detect(struct scsi_host_template *SGIblows)
-{
-        int found = 0;
-
-        SGIblows->proc_name = "SGIWD93";
-        sgiwd93_host = sgiwd93_setup_scsi(SGIblows, 0, SGI_WD93_0_IRQ,
-                                          &hpc3c0->scsi_chan0,
-                                          (unsigned char *)hpc3c0->scsi0_ext);
-        if (sgiwd93_host)
-                found++;
-
-        /* Set up second controller on the Indigo2 */
-        if (ip22_is_fullhouse()) {
-                sgiwd93_host1 = sgiwd93_setup_scsi(SGIblows, 1, SGI_WD93_1_IRQ,
-                                          &hpc3c0->scsi_chan1,
-                                          (unsigned char *)hpc3c0->scsi1_ext);
-                if (sgiwd93_host1)
-                        found++;
-        }
-
-        return found;
-}
+        scsi_scan_host(host);
 
-static int sgiwd93_release(struct Scsi_Host *instance)
-{
-        struct ip22_hostdata *hdata = HDATA(instance);
-        int irq = 0;
-
-        if (sgiwd93_host && sgiwd93_host == instance)
-                irq = SGI_WD93_0_IRQ;
-        else if (sgiwd93_host1 && sgiwd93_host1 == instance)
-                irq = SGI_WD93_1_IRQ;
+        return 0;
 
-        free_irq(irq, sgiwd93_intr);
+out_irq:
+        free_irq(irq, host);
+out_free:
         dma_free_coherent(NULL, PAGE_SIZE, hdata->hd.cpu, hdata->hd.dma);
-        wd33c93_release();
+out_put:
+        scsi_host_put(host);
+out:
 
-        return 1;
+        return err;
 }
 
-static int sgiwd93_bus_reset(struct scsi_cmnd *cmd)
+static void __exit sgiwd93_remove(struct platform_device *pdev)
 {
-        /* FIXME perform bus-specific reset */
+        struct Scsi_Host *host = platform_get_drvdata(pdev);
+        struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata;
+        struct sgiwd93_platform_data *pd = pdev->dev.platform_data;
+
+        scsi_remove_host(host);
+        free_irq(pd->irq, host);
+        dma_free_coherent(&pdev->dev, PAGE_SIZE, hdata->hd.cpu, hdata->hd.dma);
+        scsi_host_put(host);
+}
 
-        /* FIXME 2: kill this function, and let midlayer fallback
-           to the same result, calling wd33c93_host_reset() */
+static struct platform_driver sgiwd93_driver = {
+        .probe  = sgiwd93_probe,
+        .remove = __devexit_p(sgiwd93_remove),
+        .driver = {
+                .name   = "sgiwd93"
+        }
+};
 
-        spin_lock_irq(cmd->device->host->host_lock);
-        wd33c93_host_reset(cmd);
-        spin_unlock_irq(cmd->device->host->host_lock);
+static int __init sgiwd93_module_init(void)
+{
+        return platform_driver_register(&sgiwd93_driver);
+}
 
-        return SUCCESS;
+static void __exit sgiwd93_module_exit(void)
+{
+        return platform_driver_unregister(&sgiwd93_driver);
 }
 
-/*
- * Kludge alert - the SCSI code calls the abort and reset method with int
- * arguments not with pointers.  So this is going to blow up beautyfully
- * on 64-bit systems with memory outside the compat address spaces.
- */
-static struct scsi_host_template driver_template = {
-        .proc_name              = "SGIWD93",
-        .name                   = "SGI WD93",
-        .detect                 = sgiwd93_detect,
-        .release                = sgiwd93_release,
-        .queuecommand           = wd33c93_queuecommand,
-        .eh_abort_handler       = wd33c93_abort,
-        .eh_bus_reset_handler   = sgiwd93_bus_reset,
-        .eh_host_reset_handler  = wd33c93_host_reset,
-        .can_queue              = 16,
-        .this_id                = 7,
-        .sg_tablesize           = SG_ALL,
-        .cmd_per_lun            = 8,
-        .use_clustering         = DISABLE_CLUSTERING,
-};
-#include "scsi_module.c"
+module_init(sgiwd93_module_init);
+module_exit(sgiwd93_module_exit);
+
+MODULE_DESCRIPTION("SGI WD33C93 driver");
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 6bc505115841..a7dfb65fb842 100644
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -98,7 +98,7 @@ static int __init snirm710_probe(struct platform_device *dev)
         host->this_id = 7;
         host->base = base;
         host->irq = platform_get_irq(dev, 0);
-        if(request_irq(host->irq, NCR_700_intr, SA_SHIRQ, "snirm710", host)) {
+        if(request_irq(host->irq, NCR_700_intr, IRQF_SHARED, "snirm710", host)) {
                 printk(KERN_ERR "snirm710: request_irq failed!\n");
                 goto out_put_host;
         }
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 3158949ffa62..e7b85e832eb5 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -351,6 +351,27 @@ static u8  dc390_clock_speed[] = {100,80,67,57,50, 40, 31, 20};
  * (DCBs, SRBs, Queueing)
  *
  **********************************************************************/
+static void inline dc390_start_segment(struct dc390_srb* pSRB)
+{
+        struct scatterlist *psgl = pSRB->pSegmentList;
+
+        /* start new sg segment */
+        pSRB->SGBusAddr = sg_dma_address(psgl);
+        pSRB->SGToBeXferLen = sg_dma_len(psgl);
+}
+
+static unsigned long inline dc390_advance_segment(struct dc390_srb* pSRB, u32 residue)
+{
+        unsigned long xfer = pSRB->SGToBeXferLen - residue;
+
+        /* xfer more bytes transferred */
+        pSRB->SGBusAddr += xfer;
+        pSRB->TotalXferredLen += xfer;
+        pSRB->SGToBeXferLen = residue;
+
+        return xfer;
+}
+
 static struct dc390_dcb __inline__ *dc390_findDCB ( struct dc390_acb* pACB, u8 id, u8 lun)
 {
    struct dc390_dcb* pDCB = pACB->pLinkDCB; if (!pDCB) return NULL;
@@ -625,70 +646,6 @@ dc390_StartSCSI( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_sr
     return 0;
 }
 
-//#define DMA_INT EN_DMA_INT /*| EN_PAGE_INT*/
-#define DMA_INT 0
-
-#if DMA_INT
-/* This is similar to AM53C974.c ... */
-static u8 
-dc390_dma_intr (struct dc390_acb* pACB)
-{
-  struct dc390_srb* pSRB;
-  u8 dstate;
-  DEBUG0(u16 pstate; struct pci_dev *pdev = pACB->pdev);
-  
-  DEBUG0(pci_read_config_word(pdev, PCI_STATUS, &pstate));
-  DEBUG0(if (pstate & (PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY))\
-        { printk(KERN_WARNING "DC390: PCI state = %04x!\n", pstate); \
-          pci_write_config_word(pdev, PCI_STATUS, (PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY));});
-
-  dstate = DC390_read8 (DMA_Status); 
-
-  if (! pACB->pActiveDCB || ! pACB->pActiveDCB->pActiveSRB) return dstate;
-  else pSRB  = pACB->pActiveDCB->pActiveSRB;
-  
-  if (dstate & (DMA_XFER_ABORT | DMA_XFER_ERROR | POWER_DOWN | PCI_MS_ABORT))
-    {
-        printk (KERN_ERR "DC390: DMA error (%02x)!\n", dstate);
-        return dstate;
-    }
-  if (dstate & DMA_XFER_DONE)
-    {
-        u32 residual, xferCnt; int ctr = 6000000;
-        if (! (DC390_read8 (DMA_Cmd) & READ_DIRECTION))
-          {
-            do
-              {
-                DEBUG1(printk (KERN_DEBUG "DC390: read residual bytes ... \n"));
-                dstate = DC390_read8 (DMA_Status);
-                residual = DC390_read8 (CtcReg_Low) | DC390_read8 (CtcReg_Mid) << 8 |
-                  DC390_read8 (CtcReg_High) << 16;
-                residual += DC390_read8 (Current_Fifo) & 0x1f;
-              } while (residual && ! (dstate & SCSI_INTERRUPT) && --ctr);
-            if (!ctr) printk (KERN_CRIT "DC390: dma_intr: DMA aborted unfinished: %06x bytes remain!!\n", DC390_read32 (DMA_Wk_ByteCntr));
-            /* residual =  ... */
-          }
-        else
-            residual = 0;
-        
-        /* ??? */
-        
-        xferCnt = pSRB->SGToBeXferLen - residual;
-        pSRB->SGBusAddr += xferCnt;
-        pSRB->TotalXferredLen += xferCnt;
-        pSRB->SGToBeXferLen = residual;
-# ifdef DC390_DEBUG0
-        printk (KERN_INFO "DC390: DMA: residual = %i, xfer = %i\n", 
-                (unsigned int)residual, (unsigned int)xferCnt);
-# endif
-        
-        DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-    }
-  dc390_laststatus &= ~0xff000000; dc390_laststatus |= dstate << 24;
-  return dstate;
-}
-#endif
-
 
 static void __inline__
 dc390_InvalidCmd(struct dc390_acb* pACB)
@@ -708,9 +665,6 @@ DC390_Interrupt(void *dev_id)
     u8  phase;
     void   (*stateV)( struct dc390_acb*, struct dc390_srb*, u8 *);
     u8  istate, istatus;
-#if DMA_INT
-    u8  dstatus;
-#endif
 
     sstatus = DC390_read8 (Scsi_Status);
     if( !(sstatus & INTERRUPT) )
@@ -718,22 +672,9 @@ DC390_Interrupt(void *dev_id)
 
     DEBUG1(printk (KERN_DEBUG "sstatus=%02x,", sstatus));
 
-#if DMA_INT
-    spin_lock_irq(pACB->pScsiHost->host_lock);
-    dstatus = dc390_dma_intr (pACB);
-    spin_unlock_irq(pACB->pScsiHost->host_lock);
-
-    DEBUG1(printk (KERN_DEBUG "dstatus=%02x,", dstatus));
-    if (! (dstatus & SCSI_INTERRUPT))
-      {
-        DEBUG0(printk (KERN_WARNING "DC390 Int w/o SCSI actions (only DMA?)\n"));
-        return IRQ_NONE;
-      }
-#else
     //DC390_write32 (DMA_ScsiBusCtrl, WRT_ERASE_DMA_STAT | EN_INT_ON_PCI_ABORT);
     //dstatus = DC390_read8 (DMA_Status);
     //DC390_write32 (DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT);
-#endif
 
     spin_lock_irq(pACB->pScsiHost->host_lock);
 
@@ -821,11 +762,10 @@ static irqreturn_t do_DC390_Interrupt(int irq, void *dev_id)
 }
 
 static void
-dc390_DataOut_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
+dc390_DataOut_0(struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
 {
     u8   sstatus;
-    struct scatterlist *psgl;
-    u32    ResidCnt, xferCnt;
+    u32  ResidCnt;
     u8   dstate = 0;
 
     sstatus = *psstatus;
@@ -856,42 +796,35 @@ dc390_DataOut_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
             if( pSRB->SGIndex < pSRB->SGcount )
             {
                 pSRB->pSegmentList++;
-                psgl = pSRB->pSegmentList;
 
-                pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-                pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
+                dc390_start_segment(pSRB);
             }
             else
                 pSRB->SGToBeXferLen = 0;
         }
         else
         {
-            ResidCnt  = (u32) DC390_read8 (Current_Fifo) & 0x1f;
-            ResidCnt |= (u32) DC390_read8 (CtcReg_High) << 16;
-            ResidCnt |= (u32) DC390_read8 (CtcReg_Mid) << 8; 
-            ResidCnt += (u32) DC390_read8 (CtcReg_Low);
-
-            xferCnt = pSRB->SGToBeXferLen - ResidCnt;
-            pSRB->SGBusAddr += xferCnt;
-            pSRB->TotalXferredLen += xferCnt;
-            pSRB->SGToBeXferLen = ResidCnt;
+            ResidCnt = ((u32) DC390_read8 (Current_Fifo) & 0x1f) +
+                    (((u32) DC390_read8 (CtcReg_High) << 16) |
+                     ((u32) DC390_read8 (CtcReg_Mid) << 8) |
+                     (u32) DC390_read8 (CtcReg_Low));
+
+            dc390_advance_segment(pSRB, ResidCnt);
         }
     }
     if ((*psstatus & 7) != SCSI_DATA_OUT)
     {
-            DC390_write8 (DMA_Cmd, WRITE_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
+            DC390_write8 (DMA_Cmd, WRITE_DIRECTION+DMA_IDLE_CMD);
             DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
     }       
 }
 
 static void
-dc390_DataIn_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
+dc390_DataIn_0(struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
 {
     u8   sstatus, residual, bval;
-    struct scatterlist *psgl;
-    u32    ResidCnt, i;
+    u32  ResidCnt, i;
     unsigned long   xferCnt;
-    u8      *ptr;
 
     sstatus = *psstatus;
 
@@ -922,19 +855,17 @@ dc390_DataIn_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
             DEBUG1(ResidCnt = ((unsigned long) DC390_read8 (CtcReg_High) << 16) \
                 + ((unsigned long) DC390_read8 (CtcReg_Mid) << 8)               \
                 + ((unsigned long) DC390_read8 (CtcReg_Low)));
-            DEBUG1(printk (KERN_DEBUG "Count_2_Zero (ResidCnt=%i,ToBeXfer=%li),", ResidCnt, pSRB->SGToBeXferLen));
+            DEBUG1(printk (KERN_DEBUG "Count_2_Zero (ResidCnt=%u,ToBeXfer=%lu),", ResidCnt, pSRB->SGToBeXferLen));
 
-            DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
+            DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD);
 
             pSRB->TotalXferredLen += pSRB->SGToBeXferLen;
             pSRB->SGIndex++;
             if( pSRB->SGIndex < pSRB->SGcount )
             {
                 pSRB->pSegmentList++;
-                psgl = pSRB->pSegmentList;
 
-                pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-                pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
+                dc390_start_segment(pSRB);
             }
             else
                 pSRB->SGToBeXferLen = 0;
@@ -973,47 +904,45 @@ din_1:
             }
             /* It seems a DMA Blast abort isn't that bad ... */
             if (!i) printk (KERN_ERR "DC390: DMA Blast aborted unfinished!\n");
-            //DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
-            dc390_laststatus &= ~0xff000000; dc390_laststatus |= bval << 24;
+            //DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD);
+            dc390_laststatus &= ~0xff000000;
+            dc390_laststatus |= bval << 24;
 
             DEBUG1(printk (KERN_DEBUG "Blast: Read %i times DMA_Status %02x", 0xa000-i, bval));
-            ResidCnt = (u32) DC390_read8 (CtcReg_High);
-            ResidCnt <<= 8;
-            ResidCnt |= (u32) DC390_read8 (CtcReg_Mid);
-            ResidCnt <<= 8;
-            ResidCnt |= (u32) DC390_read8 (CtcReg_Low);
-
-            xferCnt = pSRB->SGToBeXferLen - ResidCnt;
-            pSRB->SGBusAddr += xferCnt;
-            pSRB->TotalXferredLen += xferCnt;
-            pSRB->SGToBeXferLen = ResidCnt;
-
-            if( residual )
-            {
-                static int feedback_requested;
+            ResidCnt = (((u32) DC390_read8 (CtcReg_High) << 16) |
+                        ((u32) DC390_read8 (CtcReg_Mid) << 8)) |
+                    (u32) DC390_read8 (CtcReg_Low);
+
+            xferCnt = dc390_advance_segment(pSRB, ResidCnt);
+
+            if (residual) {
+                size_t count = 1;
+                size_t offset = pSRB->SGBusAddr - sg_dma_address(pSRB->pSegmentList);
+                unsigned long flags;
+                u8 *ptr;
+
                 bval = DC390_read8 (ScsiFifo);      /* get one residual byte */
 
-                if (!feedback_requested) {
-                        feedback_requested = 1;
-                        printk(KERN_WARNING "%s: Please, contact <linux-scsi@vger.kernel.org> "
-                               "to help improve support for your system.\n", __FILE__);
+                local_irq_save(flags);
+                ptr = scsi_kmap_atomic_sg(pSRB->pSegmentList, pSRB->SGcount, &offset, &count);
+                if (likely(ptr)) {
+                        *(ptr + offset) = bval;
+                        scsi_kunmap_atomic_sg(ptr);
                 }
+                local_irq_restore(flags);
+                WARN_ON(!ptr);
 
-                ptr = (u8 *) bus_to_virt( pSRB->SGBusAddr );
-                *ptr = bval;
-                pSRB->SGBusAddr++; xferCnt++;
-                pSRB->TotalXferredLen++;
-                pSRB->SGToBeXferLen--;
+                /* 1 more byte read */
+                xferCnt += dc390_advance_segment(pSRB, pSRB->SGToBeXferLen - 1);
             }
-            DEBUG1(printk (KERN_DEBUG "Xfered: %li, Total: %li, Remaining: %li\n", xferCnt,\
+            DEBUG1(printk (KERN_DEBUG "Xfered: %lu, Total: %lu, Remaining: %lu\n", xferCnt,\
                            pSRB->TotalXferredLen, pSRB->SGToBeXferLen));
-
         }
     }
     if ((*psstatus & 7) != SCSI_DATA_IN)
     {
             DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-            DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
+            DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD);
     }
 }
 
@@ -1216,7 +1145,7 @@ dc390_MsgIn_set_sync (struct dc390_acb* pACB, struct dc390_srb* pSRB)
 
 
 /* handle RESTORE_PTR */
-/* I presume, this command is already mapped, so, have to remap. */
+/* This doesn't look very healthy... to-be-fixed */
 static void 
 dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
 {
@@ -1225,6 +1154,7 @@ dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
     pSRB->TotalXferredLen = 0;
     pSRB->SGIndex = 0;
     if (pcmd->use_sg) {
+        size_t saved;
         pSRB->pSegmentList = (struct scatterlist *)pcmd->request_buffer;
         psgl = pSRB->pSegmentList;
         //dc390_pci_sync(pSRB);
@@ -1236,15 +1166,16 @@ dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
             if( pSRB->SGIndex < pSRB->SGcount )
             {
                 pSRB->pSegmentList++;
-                psgl = pSRB->pSegmentList;
-                pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-                pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
+
+                dc390_start_segment(pSRB);
             }
             else
                 pSRB->SGToBeXferLen = 0;
         }
-        pSRB->SGToBeXferLen -= (pSRB->Saved_Ptr - pSRB->TotalXferredLen);
-        pSRB->SGBusAddr += (pSRB->Saved_Ptr - pSRB->TotalXferredLen);
+
+        saved = pSRB->Saved_Ptr - pSRB->TotalXferredLen;
+        pSRB->SGToBeXferLen -= saved;
+        pSRB->SGBusAddr += saved;
         printk (KERN_INFO "DC390: Pointer restored. Segment %i, Total %li, Bus %08lx\n",
                 pSRB->SGIndex, pSRB->Saved_Ptr, pSRB->SGBusAddr);
 
@@ -1365,7 +1296,6 @@ dc390_MsgIn_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
 static void
 dc390_DataIO_Comm( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 ioDir)
 {
-    struct scatterlist *psgl;
     unsigned long  lval;
     struct dc390_dcb*   pDCB = pACB->pActiveDCB;
 
@@ -1391,12 +1321,11 @@ dc390_DataIO_Comm( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 ioDir)
 
     if( pSRB->SGIndex < pSRB->SGcount )
     {
-        DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir /* | DMA_INT */);
+        DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir);
         if( !pSRB->SGToBeXferLen )
         {
-            psgl = pSRB->pSegmentList;
-            pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-            pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
+            dc390_start_segment(pSRB);
+
             DEBUG1(printk (KERN_DEBUG " DC390: Next SG segment."));
         }
         lval = pSRB->SGToBeXferLen;
@@ -1410,12 +1339,12 @@ dc390_DataIO_Comm( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 ioDir)
         DC390_write32 (DMA_XferCnt, pSRB->SGToBeXferLen);
         DC390_write32 (DMA_XferAddr, pSRB->SGBusAddr);
 
-        //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir); /* | DMA_INT; */
+        //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir);
         pSRB->SRBState = SRB_DATA_XFER;
 
         DC390_write8 (ScsiCmd, DMA_COMMAND+INFO_XFER_CMD);
 
-        DC390_write8 (DMA_Cmd, DMA_START_CMD | ioDir | DMA_INT);
+        DC390_write8 (DMA_Cmd, DMA_START_CMD | ioDir);
         //DEBUG1(DC390_write32 (DMA_ScsiBusCtrl, WRT_ERASE_DMA_STAT | EN_INT_ON_PCI_ABORT));
         //DEBUG1(printk (KERN_DEBUG "DC390: DMA_Status: %02x\n", DC390_read8 (DMA_Status)));
         //DEBUG1(DC390_write32 (DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT));
@@ -1436,8 +1365,8 @@ dc390_DataIO_Comm( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 ioDir)
         pSRB->SRBState |= SRB_XFERPAD;
         DC390_write8 (ScsiCmd, DMA_COMMAND+XFER_PAD_BYTE);
 /*
-        DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir); // | DMA_INT;
-        DC390_write8 (DMA_Cmd, DMA_START_CMD | ioDir | DMA_INT);
+        DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir);
+        DC390_write8 (DMA_Cmd, DMA_START_CMD | ioDir);
 */
     }
 }
diff --git a/drivers/scsi/tmscsim.h b/drivers/scsi/tmscsim.h
index 9b66fa8d38d9..c3d8c80cfb38 100644
--- a/drivers/scsi/tmscsim.h
+++ b/drivers/scsi/tmscsim.h
@@ -19,14 +19,6 @@
 
 #define SEL_TIMEOUT             153     /* 250 ms selection timeout (@ 40 MHz) */
 
-#define pci_dma_lo32(a)                 (a & 0xffffffff)
-
-typedef u8              UCHAR;  /*  8 bits */
-typedef u16             USHORT; /* 16 bits */
-typedef u32             UINT;   /* 32 bits */
-typedef unsigned long   ULONG;  /* 32/64 bits */
-
-
 /*
 ;-----------------------------------------------------------------------
 ; SCSI Request Block
@@ -43,7 +35,9 @@ struct scatterlist	*pSegmentList;
 
 struct scatterlist Segmentx;    /* make a one entry of S/G list table */
 
-unsigned long   SGBusAddr;      /*;a segment starting address as seen by AM53C974A*/
+unsigned long   SGBusAddr;      /*;a segment starting address as seen by AM53C974A
+                                  in CPU endianness. We're only getting 32-bit bus
+                                  addresses by default */
 unsigned long   SGToBeXferLen;  /*; to be xfer length */
 unsigned long   TotalXferredLen;
 unsigned long   SavedTotXLen;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index c9832d963f1e..c84dab083a85 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -894,7 +894,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                         quot = serial_dl_read(up);
                         quot <<= 3;
 
-                        status1 = serial_in(up, 0x04); /* EXCR1 */
+                        status1 = serial_in(up, 0x04); /* EXCR2 */
                         status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
                         status1 |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
                         serial_outp(up, 0x04, status1);
@@ -994,7 +994,6 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
          * be frobbing the chips IRQ enable register to see if it exists.
          */
         spin_lock_irqsave(&up->port.lock, flags);
-//      save_flags(flags); cli();
 
         up->capabilities = 0;
         up->bugs = 0;
@@ -1151,7 +1150,6 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
 
  out:
         spin_unlock_irqrestore(&up->port.lock, flags);
-//      restore_flags(flags);
         DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
 }
 
@@ -2619,7 +2617,22 @@ void serial8250_suspend_port(int line)
  */
 void serial8250_resume_port(int line)
 {
-        uart_resume_port(&serial8250_reg, &serial8250_ports[line].port);
+        struct uart_8250_port *up = &serial8250_ports[line];
+
+        if (up->capabilities & UART_NATSEMI) {
+                unsigned char tmp;
+
+                /* Ensure it's still in high speed mode */
+                serial_outp(up, UART_LCR, 0xE0);
+
+                tmp = serial_in(up, 0x04); /* EXCR2 */
+                tmp &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+                tmp |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
+                serial_outp(up, 0x04, tmp);
+
+                serial_outp(up, UART_LCR, 0);
+        }
+        uart_resume_port(&serial8250_reg, &up->port);
 }
 
 /*
@@ -2696,7 +2709,7 @@ static int serial8250_resume(struct platform_device *dev)
                 struct uart_8250_port *up = &serial8250_ports[i];
 
                 if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev)
-                        uart_resume_port(&serial8250_reg, &up->port);
+                        serial8250_resume_port(i);
         }
 
         return 0;
diff --git a/drivers/serial/8250_acorn.c b/drivers/serial/8250_acorn.c
index 562ba745a044..b0ce8c56f1a4 100644
--- a/drivers/serial/8250_acorn.c
+++ b/drivers/serial/8250_acorn.c
@@ -54,7 +54,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
         info->num_ports = type->num_ports;
 
         bus_addr = ecard_resource_start(ec, type->type);
-        info->vaddr = ioremap(bus_addr, ecard_resource_len(ec, type->type));
+        info->vaddr = ecardm_iomap(ec, type->type, 0, 0);
         if (!info->vaddr) {
                 kfree(info);
                 return -ENOMEM;
@@ -91,7 +91,6 @@ static void __devexit serial_card_remove(struct expansion_card *ec)
                 if (info->ports[i] > 0)
                         serial8250_unregister_port(info->ports[i]);
 
-        iounmap(info->vaddr);
         kfree(info);
 }
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 924e9bd757f0..315ea9916456 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -5,6 +5,7 @@
 #
 
 menu "Serial drivers"
+        depends on HAS_IOMEM
 
 #
 # The new 8250/16550 serial drivers
@@ -73,17 +74,21 @@ config SERIAL_8250_PCI
         depends on SERIAL_8250 && PCI
         default SERIAL_8250
         help
-          This builds standard PCI serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-          Saves about 9K.
+          Say Y here if you have PCI serial ports.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_pci.
 
 config SERIAL_8250_PNP
         tristate "8250/16550 PNP device support" if EMBEDDED
         depends on SERIAL_8250 && PNP
         default SERIAL_8250
         help
-          This builds standard PNP serial support. You may be able to
-          disable this feature if you only need legacy serial support.
+          Say Y here if you have serial ports described by PNPBIOS or ACPI.
+          These are typically ports built into the system board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_pnp.
 
 config SERIAL_8250_HP300
         tristate
@@ -354,6 +359,23 @@ config SERIAL_ATMEL_TTYAT
 
           Say Y if you have an external 8250/16C550 UART.  If unsure, say N.
 
+config SERIAL_KS8695
+        bool "Micrel KS8695 (Centaur) serial port support"
+        depends on ARCH_KS8695
+        select SERIAL_CORE
+        help
+          This selects the Micrel Centaur KS8695 UART.  Say Y here.
+
+config SERIAL_KS8695_CONSOLE
+        bool "Support for console on KS8695 (Centaur) serial port"
+        depends on SERIAL_KS8695=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you wish to use a KS8695 (Centaur) UART as the
+          system console (the system console is the device which
+          receives all kernel messages and warnings and which allows
+          logins in single user mode).
+
 config SERIAL_CLPS711X
         tristate "CLPS711X serial port support"
         depends on ARM && ARCH_CLPS711X
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 4959bcb8d1ef..08ad0d978183 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -61,3 +61,4 @@ obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o
 obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o
 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
+obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index 408390f93db9..787dc7168f3e 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -6,8 +6,6 @@
  * Created:
  * Description:  Driver for blackfin 5xx serial ports
  *
- * Rev:          $Id: bfin_5xx.c,v 1.19 2006/09/24 02:33:53 aubrey Exp $
- *
  * Modified:
  *               Copyright 2006 Analog Devices Inc.
  *
@@ -152,7 +150,7 @@ static void local_put_char(struct bfin_serial_port *uart, char ch)
 
 static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
 {
-        struct tty_struct *tty = uart->port.info?uart->port.info->tty:0;
+        struct tty_struct *tty = uart->port.info->tty;
         unsigned int status, ch, flg;
 #ifdef BF533_FAMILY
         static int in_break = 0;
@@ -173,8 +171,10 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
                 if (ch != 0) {
                         in_break = 0;
                         ch = UART_GET_CHAR(uart);
-                }
-                return;
+                        if (bfin_revid() < 5)
+                                return;
+                } else
+                        return;
         }
 #endif
 
@@ -185,27 +185,32 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
                 uart->port.icount.brk++;
                 if (uart_handle_break(&uart->port))
                         goto ignore_char;
-                flg = TTY_BREAK;
-        } else if (status & PE) {
-                flg = TTY_PARITY;
+        }
+        if (status & PE)
                 uart->port.icount.parity++;
-        } else if (status & OE) {
-                flg = TTY_OVERRUN;
+        if (status & OE)
                 uart->port.icount.overrun++;
-        } else if (status & FE) {
-                flg = TTY_FRAME;
+        if (status & FE)
                 uart->port.icount.frame++;
-        } else
+
+        status &= uart->port.read_status_mask;
+
+        if (status & BI)
+                flg = TTY_BREAK;
+        else if (status & PE)
+                flg = TTY_PARITY;
+        else if (status & FE)
+                flg = TTY_FRAME;
+        else
                 flg = TTY_NORMAL;
 
         if (uart_handle_sysrq_char(&uart->port, ch))
                 goto ignore_char;
-        if (tty)
-                uart_insert_char(&uart->port, status, 2, ch, flg);
 
-ignore_char:
-        if (tty)
-                tty_flip_buffer_push(tty);
+        uart_insert_char(&uart->port, status, OE, ch, flg);
+
+ ignore_char:
+        tty_flip_buffer_push(tty);
 }
 
 static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
@@ -240,24 +245,29 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
                 bfin_serial_stop_tx(&uart->port);
 }
 
-static irqreturn_t bfin_serial_int(int irq, void *dev_id)
+static irqreturn_t bfin_serial_rx_int(int irq, void *dev_id)
 {
         struct bfin_serial_port *uart = dev_id;
-        unsigned short status;
 
         spin_lock(&uart->port.lock);
-        status = UART_GET_IIR(uart);
-        do {
-                if ((status & IIR_STATUS) == IIR_TX_READY)
-                        bfin_serial_tx_chars(uart);
-                if ((status & IIR_STATUS) == IIR_RX_READY)
-                        bfin_serial_rx_chars(uart);
-                status = UART_GET_IIR(uart);
-        } while (status & (IIR_TX_READY | IIR_RX_READY));
+        while ((UART_GET_IIR(uart) & IIR_STATUS) == IIR_RX_READY)
+                bfin_serial_rx_chars(uart);
         spin_unlock(&uart->port.lock);
         return IRQ_HANDLED;
 }
 
+static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id)
+{
+        struct bfin_serial_port *uart = dev_id;
+
+        spin_lock(&uart->port.lock);
+        while ((UART_GET_IIR(uart) & IIR_STATUS) == IIR_TX_READY)
+                bfin_serial_tx_chars(uart);
+        spin_unlock(&uart->port.lock);
+        return IRQ_HANDLED;
+}
+
+
 static void bfin_serial_do_work(struct work_struct *work)
 {
         struct bfin_serial_port *uart = container_of(work, struct bfin_serial_port, cts_workqueue);
@@ -319,7 +329,7 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
         spin_unlock_irqrestore(&uart->port.lock, flags);
 }
 
-static void bfin_serial_dma_rx_chars(struct bfin_serial_port * uart)
+static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 {
         struct tty_struct *tty = uart->port.info->tty;
         int i, flg, status;
@@ -331,25 +341,32 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port * uart)
                 uart->port.icount.brk++;
                 if (uart_handle_break(&uart->port))
                         goto dma_ignore_char;
-                flg = TTY_BREAK;
-        } else if (status & PE) {
-                flg = TTY_PARITY;
+        }
+        if (status & PE)
                 uart->port.icount.parity++;
-        } else if (status & OE) {
-                flg = TTY_OVERRUN;
+        if (status & OE)
                 uart->port.icount.overrun++;
-        } else if (status & FE) {
-                flg = TTY_FRAME;
+        if (status & FE)
                 uart->port.icount.frame++;
-        } else
+
+        status &= uart->port.read_status_mask;
+
+        if (status & BI)
+                flg = TTY_BREAK;
+        else if (status & PE)
+                flg = TTY_PARITY;
+        else if (status & FE)
+                flg = TTY_FRAME;
+        else
                 flg = TTY_NORMAL;
 
         for (i = uart->rx_dma_buf.head; i < uart->rx_dma_buf.tail; i++) {
                 if (uart_handle_sysrq_char(&uart->port, uart->rx_dma_buf.buf[i]))
                         goto dma_ignore_char;
-                uart_insert_char(&uart->port, status, 2, uart->rx_dma_buf.buf[i], flg);
+                uart_insert_char(&uart->port, status, OE, uart->rx_dma_buf.buf[i], flg);
         }
-dma_ignore_char:
+
+ dma_ignore_char:
         tty_flip_buffer_push(tty);
 }
 
@@ -545,14 +562,14 @@ static int bfin_serial_startup(struct uart_port *port)
         add_timer(&(uart->rx_dma_timer));
 #else
         if (request_irq
-            (uart->port.irq, bfin_serial_int, IRQF_DISABLED,
+            (uart->port.irq, bfin_serial_rx_int, IRQF_DISABLED,
              "BFIN_UART_RX", uart)) {
                 printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n");
                 return -EBUSY;
         }
 
         if (request_irq
-            (uart->port.irq+1, bfin_serial_int, IRQF_DISABLED,
+            (uart->port.irq+1, bfin_serial_tx_int, IRQF_DISABLED,
              "BFIN_UART_TX", uart)) {
                 printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n");
                 free_irq(uart->port.irq, uart);
@@ -614,13 +631,27 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
                         lcr |= EPS;
         }
 
-        /* These controls are not implemented for this port */
-        termios->c_iflag |= INPCK | BRKINT | PARMRK;
-        termios->c_iflag &= ~(IGNPAR | IGNBRK);
+        port->read_status_mask = OE;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= (FE | PE);
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= BI;
 
-        /* These controls are not implemented for this port */
-        termios->c_iflag |= INPCK | BRKINT | PARMRK;
-        termios->c_iflag &= ~(IGNPAR | IGNBRK);
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= FE | PE;
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= BI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= OE;
+        }
 
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
         quot = uart_get_divisor(port, baud);
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index 69715e556506..a8f894c78194 100644
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -88,7 +88,7 @@ extern struct uart_cpm_port cpm_uart_ports[UART_NR];
 
 /* these are located in their respective files */
 void cpm_line_cr_cmd(int line, int cmd);
-int __init cpm_uart_init_portdesc(void);
+int cpm_uart_init_portdesc(void);
 int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 7a3b97fdf8d1..b63ff8dd7304 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -482,7 +482,8 @@ static void cpm_uart_shutdown(struct uart_port *port)
 }
 
 static void cpm_uart_set_termios(struct uart_port *port,
-                                 struct termios *termios, struct termios *old)
+                                 struct ktermios *termios,
+                                 struct ktermios *old)
 {
         int baud;
         unsigned long flags;
@@ -934,7 +935,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
                         .irq            = SMC1_IRQ,
                         .ops            = &cpm_uart_pops,
                         .iotype         = UPIO_MEM,
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SMC1].port.lock),
                 },
                 .flags = FLAG_SMC,
                 .tx_nrfifos = TX_NUM_FIFO,
@@ -948,7 +949,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
                         .irq            = SMC2_IRQ,
                         .ops            = &cpm_uart_pops,
                         .iotype         = UPIO_MEM,
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SMC2].port.lock),
                 },
                 .flags = FLAG_SMC,
                 .tx_nrfifos = TX_NUM_FIFO,
@@ -965,7 +966,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
                         .irq            = SCC1_IRQ,
                         .ops            = &cpm_uart_pops,
                         .iotype         = UPIO_MEM,
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC1].port.lock),
                 },
                 .tx_nrfifos = TX_NUM_FIFO,
                 .tx_fifosize = TX_BUF_SIZE,
@@ -979,7 +980,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
                         .irq            = SCC2_IRQ,
                         .ops            = &cpm_uart_pops,
                         .iotype         = UPIO_MEM,
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC2].port.lock),
                 },
                 .tx_nrfifos = TX_NUM_FIFO,
                 .tx_fifosize = TX_BUF_SIZE,
@@ -993,7 +994,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
                         .irq            = SCC3_IRQ,
                         .ops            = &cpm_uart_pops,
                         .iotype         = UPIO_MEM,
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC3].port.lock),
                 },
                 .tx_nrfifos = TX_NUM_FIFO,
                 .tx_fifosize = TX_BUF_SIZE,
@@ -1007,7 +1008,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
                         .irq            = SCC4_IRQ,
                         .ops            = &cpm_uart_pops,
                         .iotype         = UPIO_MEM,
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC4].port.lock),
                 },
                 .tx_nrfifos = TX_NUM_FIFO,
                 .tx_fifosize = TX_BUF_SIZE,
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 925fb607d8c4..8c6324ed0202 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -125,7 +125,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 {
         int dpmemsz, memsz;
         u8 *dp_mem;
-        uint dp_offset;
+        unsigned long dp_offset;
         u8 *mem_addr;
         dma_addr_t dma_addr = 0;
 
@@ -133,7 +133,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
         dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
         dp_offset = cpm_dpalloc(dpmemsz, 8);
-        if (IS_DPERR(dp_offset)) {
+        if (IS_ERR_VALUE(dp_offset)) {
                 printk(KERN_ERR
                        "cpm_uart_cpm1.c: could not allocate buffer descriptors\n");
                 return -ENOMEM;
@@ -185,7 +185,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 }
 
 /* Setup any dynamic params in the uart desc */
-int __init cpm_uart_init_portdesc(void)
+int cpm_uart_init_portdesc(void)
 {
         pr_debug("CPM uart[-]:init portdesc\n");
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index fa455996ad8f..7b61d805ebe9 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -222,7 +222,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 {
         int dpmemsz, memsz;
         u8 *dp_mem;
-        uint dp_offset;
+        unsigned long dp_offset;
         u8 *mem_addr;
         dma_addr_t dma_addr = 0;
 
@@ -230,7 +230,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
         dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
         dp_offset = cpm_dpalloc(dpmemsz, 8);
-        if (IS_DPERR(dp_offset)) {
+        if (IS_ERR_VALUE(dp_offset)) {
                 printk(KERN_ERR
                        "cpm_uart_cpm.c: could not allocate buffer descriptors\n");
                 return -ENOMEM;
@@ -282,7 +282,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 }
 
 /* Setup any dynamic params in the uart desc */
-int __init cpm_uart_init_portdesc(void)
+int cpm_uart_init_portdesc(void)
 {
 #if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
         u16 *addr;
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 246c5572667b..9d3105b64a7a 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -47,7 +47,6 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/kobject.h>
 #include <linux/firmware.h>
@@ -70,33 +69,40 @@
 
 static const struct pci_device_id icom_pci_table[] = {
         {
-              .vendor = PCI_VENDOR_ID_IBM,
-              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
-              .subvendor = PCI_ANY_ID,
-              .subdevice = PCI_ANY_ID,
-              .driver_data = ADAPTER_V1,
-         },
+                .vendor = PCI_VENDOR_ID_IBM,
+                .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
+                .subvendor = PCI_ANY_ID,
+                .subdevice = PCI_ANY_ID,
+                .driver_data = ADAPTER_V1,
+        },
         {
-              .vendor = PCI_VENDOR_ID_IBM,
-              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
-              .subvendor = PCI_VENDOR_ID_IBM,
-              .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX,
-              .driver_data = ADAPTER_V2,
-         },
+                .vendor = PCI_VENDOR_ID_IBM,
+                .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+                .subvendor = PCI_VENDOR_ID_IBM,
+                .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX,
+                .driver_data = ADAPTER_V2,
+        },
         {
-              .vendor = PCI_VENDOR_ID_IBM,
-              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
-              .subvendor = PCI_VENDOR_ID_IBM,
-              .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM,
-              .driver_data = ADAPTER_V2,
-         },
+                .vendor = PCI_VENDOR_ID_IBM,
+                .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+                .subvendor = PCI_VENDOR_ID_IBM,
+                .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM,
+                .driver_data = ADAPTER_V2,
+        },
         {
-              .vendor = PCI_VENDOR_ID_IBM,
-              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
-              .subvendor = PCI_VENDOR_ID_IBM,
-              .subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,
-              .driver_data = ADAPTER_V2,
-         },
+                .vendor = PCI_VENDOR_ID_IBM,
+                .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+                .subvendor = PCI_VENDOR_ID_IBM,
+                .subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,
+                .driver_data = ADAPTER_V2,
+        },
+        {
+                .vendor = PCI_VENDOR_ID_IBM,
+                .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+                .subvendor = PCI_VENDOR_ID_IBM,
+                .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE,
+                .driver_data = ADAPTER_V2,
+        },
         {}
 };
 
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index 8be8da37f629..b2d6f5b1a7c2 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -581,8 +581,13 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
                 return;
 
         /* Scrub off lower bits. They signify delta's, which I don't care about */
-        msignals &= 0xf0;
+        /* Keep DDCD and DDSR though */
+        msignals &= 0xf8;
 
+        if (msignals & UART_MSR_DDCD)
+                uart_handle_dcd_change(&ch->uart_port, msignals & UART_MSR_DCD);
+        if (msignals & UART_MSR_DDSR)
+                uart_handle_cts_change(&ch->uart_port, msignals & UART_MSR_CTS);
         if (msignals & UART_MSR_DCD)
                 ch->ch_mistat |= UART_MSR_DCD;
         else
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index be22bbdbc8e5..281f23a371b2 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -448,6 +448,7 @@ int jsm_uart_port_init(struct jsm_board *brd)
                         continue;
 
                 brd->channels[i]->uart_port.irq = brd->irq;
+                brd->channels[i]->uart_port.uartclk = 14745600;
                 brd->channels[i]->uart_port.type = PORT_JSM;
                 brd->channels[i]->uart_port.iotype = UPIO_MEM;
                 brd->channels[i]->uart_port.membase = brd->re_map_membase;
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 8d24cd521056..35f8b86cc78f 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -257,9 +257,10 @@ mpc52xx_uart_shutdown(struct uart_port *port)
 {
         struct mpc52xx_psc __iomem *psc = PSC(port);
 
-        /* Shut down the port, interrupt and all */
+        /* Shut down the port.  Leave TX active if on a console port */
         out_8(&psc->command,MPC52xx_PSC_RST_RX);
-        out_8(&psc->command,MPC52xx_PSC_RST_TX);
+        if (!uart_console(port))
+                out_8(&psc->command,MPC52xx_PSC_RST_TX);
 
         port->read_status_mask = 0;
         out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
@@ -1069,7 +1070,7 @@ mpc52xx_uart_of_enumerate(void)
                         continue;
 
                 /* Is a particular device number requested? */
-                devno = get_property(np, "port-number", NULL);
+                devno = of_get_property(np, "port-number", NULL);
                 mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
         }
 
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 336d0f4580d9..7ffdaeaf0545 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -29,8 +29,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
         int ret;
 
         memset(port, 0, sizeof *port);
-        spd = get_property(np, "current-speed", NULL);
-        clk = get_property(np, "clock-frequency", NULL);
+        spd = of_get_property(np, "current-speed", NULL);
+        clk = of_get_property(np, "clock-frequency", NULL);
         if (!clk) {
                 dev_warn(&ofdev->dev, "no clock-frequency property set\n");
                 return -ENODEV;
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index be8d75721a85..0fa9f6761763 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1450,14 +1450,14 @@ no_dma:
         /*
          * Detect port type
          */
-        if (device_is_compatible(np, "cobalt"))
+        if (of_device_is_compatible(np, "cobalt"))
                 uap->flags |= PMACZILOG_FLAG_IS_INTMODEM;
-        conn = get_property(np, "AAPL,connector", &len);
+        conn = of_get_property(np, "AAPL,connector", &len);
         if (conn && (strcmp(conn, "infrared") == 0))
                 uap->flags |= PMACZILOG_FLAG_IS_IRDA;
         uap->port_type = PMAC_SCC_ASYNC;
         /* 1999 Powerbook G3 has slot-names property instead */
-        slots = get_property(np, "slot-names", &len);
+        slots = of_get_property(np, "slot-names", &len);
         if (slots && slots->count > 0) {
                 if (strcmp(slots->name, "IrDA") == 0)
                         uap->flags |= PMACZILOG_FLAG_IS_IRDA;
@@ -1471,7 +1471,7 @@ no_dma:
                         of_find_node_by_name(NULL, "i2c-modem");
                 if (i2c_modem) {
                         const char* mid =
-                                get_property(i2c_modem, "modem-id", NULL);
+                                of_get_property(i2c_modem, "modem-id", NULL);
                         if (mid) switch(*mid) {
                         case 0x04 :
                         case 0x05 :
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 3ba9208ebd0c..10bc0209cd66 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -957,7 +957,7 @@ static struct uart_driver s3c24xx_uart_drv = {
 static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
         [0] = {
                 .port = {
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[0].port.lock),
                         .iotype         = UPIO_MEM,
                         .irq            = IRQ_S3CUART_RX0,
                         .uartclk        = 0,
@@ -969,7 +969,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
         },
         [1] = {
                 .port = {
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[1].port.lock),
                         .iotype         = UPIO_MEM,
                         .irq            = IRQ_S3CUART_RX1,
                         .uartclk        = 0,
@@ -983,7 +983,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
 
         [2] = {
                 .port = {
-                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[2].port.lock),
                         .iotype         = UPIO_MEM,
                         .irq            = IRQ_S3CUART_RX2,
                         .uartclk        = 0,
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c
new file mode 100644
index 000000000000..698763b28ddd
--- /dev/null
+++ b/drivers/serial/serial_ks8695.c
@@ -0,0 +1,657 @@
+/*
+ *  drivers/serial/serial_ks8695.c
+ *
+ *  Driver for KS8695 serial ports
+ *
+ *  Based on drivers/serial/serial_amba.c, by Kam Lee.
+ *
+ *  Copyright 2002-2005 Micrel Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach/irq.h>
+
+#include <asm/arch/regs-uart.h>
+#include <asm/arch/regs-irq.h>
+
+#if defined(CONFIG_SERIAL_KS8695_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+
+#define SERIAL_KS8695_MAJOR     204
+#define SERIAL_KS8695_MINOR     16
+#define SERIAL_KS8695_DEVNAME   "ttyAM"
+
+#define SERIAL_KS8695_NR        1
+
+/*
+ * Access macros for the KS8695 UART
+ */
+#define UART_GET_CHAR(p)        (__raw_readl((p)->membase + KS8695_URRB) & 0xFF)
+#define UART_PUT_CHAR(p, c)     __raw_writel((c), (p)->membase + KS8695_URTH)
+#define UART_GET_FCR(p)         __raw_readl((p)->membase + KS8695_URFC)
+#define UART_PUT_FCR(p, c)      __raw_writel((c), (p)->membase + KS8695_URFC)
+#define UART_GET_MSR(p)         __raw_readl((p)->membase + KS8695_URMS)
+#define UART_GET_LSR(p)         __raw_readl((p)->membase + KS8695_URLS)
+#define UART_GET_LCR(p)         __raw_readl((p)->membase + KS8695_URLC)
+#define UART_PUT_LCR(p, c)      __raw_writel((c), (p)->membase + KS8695_URLC)
+#define UART_GET_MCR(p)         __raw_readl((p)->membase + KS8695_URMC)
+#define UART_PUT_MCR(p, c)      __raw_writel((c), (p)->membase + KS8695_URMC)
+#define UART_GET_BRDR(p)        __raw_readl((p)->membase + KS8695_URBD)
+#define UART_PUT_BRDR(p, c)     __raw_writel((c), (p)->membase + KS8695_URBD)
+
+#define KS8695_CLR_TX_INT()     __raw_writel(1 << KS8695_IRQ_UART_TX, KS8695_IRQ_VA + KS8695_INTST)
+
+#define UART_DUMMY_LSR_RX       0x100
+#define UART_PORT_SIZE          (KS8695_USR - KS8695_URRB + 4)
+
+#define tx_enabled(port) ((port)->unused[0])
+#define rx_enabled(port) ((port)->unused[1])
+
+
+#ifdef SUPPORT_SYSRQ
+static struct console ks8695_console;
+#endif
+
+static void ks8695uart_stop_tx(struct uart_port *port)
+{
+        if (tx_enabled(port)) {
+                disable_irq(KS8695_IRQ_UART_TX);
+                tx_enabled(port) = 0;
+        }
+}
+
+static void ks8695uart_start_tx(struct uart_port *port)
+{
+        if (!tx_enabled(port)) {
+                enable_irq(KS8695_IRQ_UART_TX);
+                tx_enabled(port) = 1;
+        }
+}
+
+static void ks8695uart_stop_rx(struct uart_port *port)
+{
+        if (rx_enabled(port)) {
+                disable_irq(KS8695_IRQ_UART_RX);
+                rx_enabled(port) = 0;
+        }
+}
+
+static void ks8695uart_enable_ms(struct uart_port *port)
+{
+        enable_irq(KS8695_IRQ_UART_MODEM_STATUS);
+}
+
+static void ks8695uart_disable_ms(struct uart_port *port)
+{
+        disable_irq(KS8695_IRQ_UART_MODEM_STATUS);
+}
+
+static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)
+{
+        struct uart_port *port = dev_id;
+        struct tty_struct *tty = port->info->tty;
+        unsigned int status, ch, lsr, flg, max_count = 256;
+
+        status = UART_GET_LSR(port);            /* clears pending LSR interrupts */
+        while ((status & URLS_URDR) && max_count--) {
+                ch = UART_GET_CHAR(port);
+                flg = TTY_NORMAL;
+
+                port->icount.rx++;
+
+                /*
+                 * Note that the error handling code is
+                 * out of the main execution path
+                 */
+                lsr = UART_GET_LSR(port) | UART_DUMMY_LSR_RX;
+                if (unlikely(lsr & (URLS_URBI | URLS_URPE | URLS_URFE | URLS_URROE))) {
+                        if (lsr & URLS_URBI) {
+                                lsr &= ~(URLS_URFE | URLS_URPE);
+                                port->icount.brk++;
+                                if (uart_handle_break(port))
+                                        goto ignore_char;
+                        }
+                        if (lsr & URLS_URPE)
+                                port->icount.parity++;
+                        if (lsr & URLS_URFE)
+                                port->icount.frame++;
+                        if (lsr & URLS_URROE)
+                                port->icount.overrun++;
+
+                        lsr &= port->read_status_mask;
+
+                        if (lsr & URLS_URBI)
+                                flg = TTY_BREAK;
+                        else if (lsr & URLS_URPE)
+                                flg = TTY_PARITY;
+                        else if (lsr & URLS_URFE)
+                                flg = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char(port, ch))
+                        goto ignore_char;
+
+                uart_insert_char(port, lsr, URLS_URROE, ch, flg);
+
+ignore_char:
+                status = UART_GET_LSR(port);
+        }
+        tty_flip_buffer_push(tty);
+
+        return IRQ_HANDLED;
+}
+
+
+static irqreturn_t ks8695uart_tx_chars(int irq, void *dev_id)
+{
+        struct uart_port *port = dev_id;
+        struct circ_buf *xmit = &port->info->xmit;
+        unsigned int count;
+
+        if (port->x_char) {
+                KS8695_CLR_TX_INT();
+                UART_PUT_CHAR(port, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                return IRQ_HANDLED;
+        }
+
+        if (uart_tx_stopped(port) || uart_circ_empty(xmit)) {
+                ks8695uart_stop_tx(port);
+                return IRQ_HANDLED;
+        }
+
+        count = 16;     /* fifo size */
+        while (!uart_circ_empty(xmit) && (count-- > 0)) {
+                KS8695_CLR_TX_INT();
+                UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+        }
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                ks8695uart_stop_tx(port);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t ks8695uart_modem_status(int irq, void *dev_id)
+{
+        struct uart_port *port = dev_id;
+        unsigned int status;
+
+        /*
+         * clear modem interrupt by reading MSR
+         */
+        status = UART_GET_MSR(port);
+
+        if (status & URMS_URDDCD)
+                uart_handle_dcd_change(port, status & URMS_URDDCD);
+
+        if (status & URMS_URDDST)
+                port->icount.dsr++;
+
+        if (status & URMS_URDCTS)
+                uart_handle_cts_change(port, status & URMS_URDCTS);
+
+        if (status & URMS_URTERI)
+                port->icount.rng++;
+
+        wake_up_interruptible(&port->info->delta_msr_wait);
+
+        return IRQ_HANDLED;
+}
+
+static unsigned int ks8695uart_tx_empty(struct uart_port *port)
+{
+        return (UART_GET_LSR(port) & URLS_URTE) ? TIOCSER_TEMT : 0;
+}
+
+static unsigned int ks8695uart_get_mctrl(struct uart_port *port)
+{
+        unsigned int result = 0;
+        unsigned int status;
+
+        status = UART_GET_MSR(port);
+        if (status & URMS_URDCD)
+                result |= TIOCM_CAR;
+        if (status & URMS_URDSR)
+                result |= TIOCM_DSR;
+        if (status & URMS_URCTS)
+                result |= TIOCM_CTS;
+        if (status & URMS_URRI)
+                result |= TIOCM_RI;
+
+        return result;
+}
+
+static void ks8695uart_set_mctrl(struct uart_port *port, u_int mctrl)
+{
+        unsigned int mcr;
+
+        mcr = UART_GET_MCR(port);
+        if (mctrl & TIOCM_RTS)
+                mcr |= URMC_URRTS;
+        else
+                mcr &= ~URMC_URRTS;
+
+        if (mctrl & TIOCM_DTR)
+                mcr |= URMC_URDTR;
+        else
+                mcr &= ~URMC_URDTR;
+
+        UART_PUT_MCR(port, mcr);
+}
+
+static void ks8695uart_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned int lcr;
+
+        lcr = UART_GET_LCR(port);
+
+        if (break_state == -1)
+                lcr |= URLC_URSBC;
+        else
+                lcr &= ~URLC_URSBC;
+
+        UART_PUT_LCR(port, lcr);
+}
+
+static int ks8695uart_startup(struct uart_port *port)
+{
+        int retval;
+
+        set_irq_flags(KS8695_IRQ_UART_TX, IRQF_VALID | IRQF_NOAUTOEN);
+        tx_enabled(port) = 0;
+        rx_enabled(port) = 1;
+
+        /*
+         * Allocate the IRQ
+         */
+        retval = request_irq(KS8695_IRQ_UART_TX, ks8695uart_tx_chars, IRQF_DISABLED, "UART TX", port);
+        if (retval)
+                goto err_tx;
+
+        retval = request_irq(KS8695_IRQ_UART_RX, ks8695uart_rx_chars, IRQF_DISABLED, "UART RX", port);
+        if (retval)
+                goto err_rx;
+
+        retval = request_irq(KS8695_IRQ_UART_LINE_STATUS, ks8695uart_rx_chars, IRQF_DISABLED, "UART LineStatus", port);
+        if (retval)
+                goto err_ls;
+
+        retval = request_irq(KS8695_IRQ_UART_MODEM_STATUS, ks8695uart_modem_status, IRQF_DISABLED, "UART ModemStatus", port);
+        if (retval)
+                goto err_ms;
+
+        return 0;
+
+err_ms:
+        free_irq(KS8695_IRQ_UART_LINE_STATUS, port);
+err_ls:
+        free_irq(KS8695_IRQ_UART_RX, port);
+err_rx:
+        free_irq(KS8695_IRQ_UART_TX, port);
+err_tx:
+        return retval;
+}
+
+static void ks8695uart_shutdown(struct uart_port *port)
+{
+        /*
+         * Free the interrupt
+         */
+        free_irq(KS8695_IRQ_UART_RX, port);
+        free_irq(KS8695_IRQ_UART_TX, port);
+        free_irq(KS8695_IRQ_UART_MODEM_STATUS, port);
+        free_irq(KS8695_IRQ_UART_LINE_STATUS, port);
+
+        /* disable break condition and fifos */
+        UART_PUT_LCR(port, UART_GET_LCR(port) & ~URLC_URSBC);
+        UART_PUT_FCR(port, UART_GET_FCR(port) & ~URFC_URFE);
+}
+
+static void ks8695uart_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old)
+{
+        unsigned int lcr, fcr = 0;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                lcr = URCL_5;
+                break;
+        case CS6:
+                lcr = URCL_6;
+                break;
+        case CS7:
+                lcr = URCL_7;
+                break;
+        default:
+                lcr = URCL_8;
+                break;
+        }
+
+        /* stop bits */
+        if (termios->c_cflag & CSTOPB)
+                lcr |= URLC_URSB;
+
+        /* parity */
+        if (termios->c_cflag & PARENB) {
+                if (termios->c_cflag & CMSPAR) {        /* Mark or Space parity */
+                        if (termios->c_cflag & PARODD)
+                                lcr |= URPE_MARK;
+                        else
+                                lcr |= URPE_SPACE;
+                }
+                else if (termios->c_cflag & PARODD)
+                        lcr |= URPE_ODD;
+                else
+                        lcr |= URPE_EVEN;
+        }
+
+        if (port->fifosize > 1)
+                fcr = URFC_URFRT_8 | URFC_URTFR | URFC_URRFR | URFC_URFE;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        port->read_status_mask = URLS_URROE;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= (URLS_URFE | URLS_URPE);
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= URLS_URBI;
+
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= (URLS_URFE | URLS_URPE);
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= URLS_URBI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= URLS_URROE;
+        }
+
+        /*
+         * Ignore all characters if CREAD is not set.
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= UART_DUMMY_LSR_RX;
+
+        /* first, disable everything */
+        if (UART_ENABLE_MS(port, termios->c_cflag))
+                ks8695uart_enable_ms(port);
+        else
+                ks8695uart_disable_ms(port);
+
+        /* Set baud rate */
+        UART_PUT_BRDR(port, quot);
+
+        UART_PUT_LCR(port, lcr);
+        UART_PUT_FCR(port, fcr);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *ks8695uart_type(struct uart_port *port)
+{
+        return port->type == PORT_KS8695 ? "KS8695" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'
+ */
+static void ks8695uart_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, UART_PORT_SIZE);
+}
+
+/*
+ * Request the memory region(s) being used by 'port'
+ */
+static int ks8695uart_request_port(struct uart_port *port)
+{
+        return request_mem_region(port->mapbase, UART_PORT_SIZE,
+                        "serial_ks8695") != NULL ? 0 : -EBUSY;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void ks8695uart_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = PORT_KS8695;
+                ks8695uart_request_port(port);
+        }
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int ks8695uart_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        int ret = 0;
+
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_KS8695)
+                ret = -EINVAL;
+        if (ser->irq != port->irq)
+                ret = -EINVAL;
+        if (ser->baud_base < 9600)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops ks8695uart_pops = {
+        .tx_empty       = ks8695uart_tx_empty,
+        .set_mctrl      = ks8695uart_set_mctrl,
+        .get_mctrl      = ks8695uart_get_mctrl,
+        .stop_tx        = ks8695uart_stop_tx,
+        .start_tx       = ks8695uart_start_tx,
+        .stop_rx        = ks8695uart_stop_rx,
+        .enable_ms      = ks8695uart_enable_ms,
+        .break_ctl      = ks8695uart_break_ctl,
+        .startup        = ks8695uart_startup,
+        .shutdown       = ks8695uart_shutdown,
+        .set_termios    = ks8695uart_set_termios,
+        .type           = ks8695uart_type,
+        .release_port   = ks8695uart_release_port,
+        .request_port   = ks8695uart_request_port,
+        .config_port    = ks8695uart_config_port,
+        .verify_port    = ks8695uart_verify_port,
+};
+
+static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
+        {
+                .membase        = (void *) KS8695_UART_VA,
+                .mapbase        = KS8695_UART_VA,
+                .iotype         = SERIAL_IO_MEM,
+                .irq            = KS8695_IRQ_UART_TX,
+                .uartclk        = CLOCK_TICK_RATE * 16,
+                .fifosize       = 16,
+                .ops            = &ks8695uart_pops,
+                .flags          = ASYNC_BOOT_AUTOCONF,
+                .line           = 0,
+        }
+};
+
+#ifdef CONFIG_SERIAL_KS8695_CONSOLE
+static void ks8695_console_putchar(struct uart_port *port, int ch)
+{
+        while (!(UART_GET_LSR(port) & URLS_URTHRE))
+                barrier();
+
+        UART_PUT_CHAR(port, ch);
+}
+
+static void ks8695_console_write(struct console *co, const char *s, u_int count)
+{
+        struct uart_port *port = ks8695uart_ports + co->index;
+
+        uart_console_write(port, s, count, ks8695_console_putchar);
+}
+
+static void __init ks8695_console_get_options(struct uart_port *port, int *baud, int *parity, int *bits)
+{
+        unsigned int lcr;
+
+        lcr = UART_GET_LCR(port);
+
+        switch (lcr & URLC_PARITY) {
+                case URPE_ODD:
+                        *parity = 'o';
+                        break;
+                case URPE_EVEN:
+                        *parity = 'e';
+                        break;
+                default:
+                        *parity = 'n';
+        }
+
+        switch (lcr & URLC_URCL) {
+                case URCL_5:
+                        *bits = 5;
+                        break;
+                case URCL_6:
+                        *bits = 6;
+                        break;
+                case URCL_7:
+                        *bits = 7;
+                        break;
+                default:
+                        *bits = 8;
+        }
+
+        *baud = port->uartclk / (UART_GET_BRDR(port) & 0x0FFF);
+        *baud /= 16;
+        *baud &= 0xFFFFFFF0;
+}
+
+static int __init ks8695_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 115200;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        port = uart_get_console(ks8695uart_ports, SERIAL_KS8695_NR, co);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                ks8695_console_get_options(port, &baud, &parity, &bits);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver ks8695_reg;
+
+static struct console ks8695_console = {
+        .name           = SERIAL_KS8695_DEVNAME,
+        .write          = ks8695_console_write,
+        .device         = uart_console_device,
+        .setup          = ks8695_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &ks8695_reg,
+};
+
+static int __init ks8695_console_init(void)
+{
+        register_console(&ks8695_console);
+        return 0;
+}
+
+console_initcall(ks8695_console_init);
+
+#define KS8695_CONSOLE  &ks8695_console
+#else
+#define KS8695_CONSOLE  NULL
+#endif
+
+static struct uart_driver ks8695_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial_ks8695",
+        .dev_name               = SERIAL_KS8695_DEVNAME,
+        .major                  = SERIAL_KS8695_MAJOR,
+        .minor                  = SERIAL_KS8695_MINOR,
+        .nr                     = SERIAL_KS8695_NR,
+        .cons                   = KS8695_CONSOLE,
+};
+
+static int __init ks8695uart_init(void)
+{
+        int i, ret;
+
+        printk(KERN_INFO "Serial: Micrel KS8695 UART driver\n");
+
+        ret = uart_register_driver(&ks8695_reg);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < SERIAL_KS8695_NR; i++)
+                uart_add_one_port(&ks8695_reg, &ks8695uart_ports[0]);
+
+        return 0;
+}
+
+static void __exit ks8695uart_exit(void)
+{
+        int i;
+
+        for (i = 0; i < SERIAL_KS8695_NR; i++)
+                uart_remove_one_port(&ks8695_reg, &ks8695uart_ports[0]);
+        uart_unregister_driver(&ks8695_reg);
+}
+
+module_init(ks8695uart_init);
+module_exit(ks8695uart_exit);
+
+MODULE_DESCRIPTION("KS8695 serial port driver");
+MODULE_AUTHOR("Micrel Inc.");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 509ace7e6881..1deb5764326d 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -15,31 +15,6 @@
  * published by the Free Software Foundation.
  *
  *  Serial driver for TX3927/TX4927/TX4925/TX4938 internal SIO controller
- *
- *  Revision History:
- *      0.30    Initial revision. (Renamed from serial_txx927.c)
- *      0.31    Use save_flags instead of local_irq_save.
- *      0.32    Support SCLK.
- *      0.33    Switch TXX9_TTY_NAME by CONFIG_SERIAL_TXX9_STDSERIAL.
- *              Support TIOCSERGETLSR.
- *      0.34    Support slow baudrate.
- *      0.40    Merge codes from mainstream kernel (2.4.22).
- *      0.41    Fix console checking in rs_shutdown_port().
- *              Disable flow-control in serial_console_write().
- *      0.42    Fix minor compiler warning.
- *      1.00    Kernel 2.6.  Converted to new serial core (based on 8250.c).
- *      1.01    Set fifosize to make tx_empry called properly.
- *              Use standard uart_get_divisor.
- *      1.02    Cleanup. (import 8250.c changes)
- *      1.03    Fix low-latency mode. (import 8250.c changes)
- *      1.04    Remove usage of deprecated functions, cleanup.
- *      1.05    More strict check in verify_port.  Cleanup.
- *      1.06    Do not insert a char caused previous overrun.
- *              Fix some spin_locks.
- *              Do not call uart_add_one_port for absent ports.
- *      1.07    Use CONFIG_SERIAL_TXX9_NR_UARTS.  Cleanup.
- *      1.08    Use platform_device.
- *              Fix and cleanup suspend/resume/initialization codes.
  */
 
 #if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -62,7 +37,7 @@
 
 #include <asm/io.h>
 
-static char *serial_version = "1.08";
+static char *serial_version = "1.09";
 static char *serial_name = "TX39/49 Serial driver";
 
 #define PASS_LIMIT      256
@@ -70,13 +45,14 @@ static char *serial_name = "TX39/49 Serial driver";
 #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL)
 /* "ttyS" is used for standard serial driver */
 #define TXX9_TTY_NAME "ttyTX"
-#define TXX9_TTY_MINOR_START    (64 + 64)       /* ttyTX0(128), ttyTX1(129) */
+#define TXX9_TTY_MINOR_START    196
+#define TXX9_TTY_MAJOR  204
 #else
 /* acts like standard serial driver */
 #define TXX9_TTY_NAME "ttyS"
 #define TXX9_TTY_MINOR_START    64
-#endif
 #define TXX9_TTY_MAJOR  TTY_MAJOR
+#endif
 
 /* flag aliases */
 #define UPF_TXX9_HAVE_CTS_LINE  UPF_BUGGY_UART
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 40d48566215c..96557e6dba60 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -1,6 +1,6 @@
 /* sunhv.c: Serial driver for SUN4V hypervisor console.
  *
- * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #include <linux/module.h>
@@ -35,57 +35,51 @@
 #define CON_BREAK       ((long)-1)
 #define CON_HUP         ((long)-2)
 
-static inline long hypervisor_con_getchar(long *status)
-{
-        register unsigned long func asm("%o5");
-        register unsigned long arg0 asm("%o0");
-        register unsigned long arg1 asm("%o1");
-
-        func = HV_FAST_CONS_GETCHAR;
-        arg0 = 0;
-        arg1 = 0;
-        __asm__ __volatile__("ta        %6"
-                             : "=&r" (func), "=&r" (arg0), "=&r" (arg1)
-                             : "0" (func), "1" (arg0), "2" (arg1),
-                               "i" (HV_FAST_TRAP));
+#define IGNORE_BREAK    0x1
+#define IGNORE_ALL      0x2
 
-        *status = arg0;
+static char *con_write_page;
+static char *con_read_page;
 
-        return (long) arg1;
-}
+static int hung_up = 0;
 
-static inline long hypervisor_con_putchar(long ch)
+static void transmit_chars_putchar(struct uart_port *port, struct circ_buf *xmit)
 {
-        register unsigned long func asm("%o5");
-        register unsigned long arg0 asm("%o0");
+        while (!uart_circ_empty(xmit)) {
+                long status = sun4v_con_putchar(xmit->buf[xmit->tail]);
 
-        func = HV_FAST_CONS_PUTCHAR;
-        arg0 = ch;
-        __asm__ __volatile__("ta        %4"
-                             : "=&r" (func), "=&r" (arg0)
-                             : "0" (func), "1" (arg0), "i" (HV_FAST_TRAP));
+                if (status != HV_EOK)
+                        break;
 
-        return (long) arg0;
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+        }
 }
 
-#define IGNORE_BREAK    0x1
-#define IGNORE_ALL      0x2
+static void transmit_chars_write(struct uart_port *port, struct circ_buf *xmit)
+{
+        while (!uart_circ_empty(xmit)) {
+                unsigned long ra = __pa(xmit->buf + xmit->tail);
+                unsigned long len, status, sent;
 
-static int hung_up = 0;
+                len = CIRC_CNT_TO_END(xmit->head, xmit->tail,
+                                      UART_XMIT_SIZE);
+                status = sun4v_con_write(ra, len, &sent);
+                if (status != HV_EOK)
+                        break;
+                xmit->tail = (xmit->tail + sent) & (UART_XMIT_SIZE - 1);
+                port->icount.tx += sent;
+        }
+}
 
-static struct tty_struct *receive_chars(struct uart_port *port)
+static int receive_chars_getchar(struct uart_port *port, struct tty_struct *tty)
 {
-        struct tty_struct *tty = NULL;
         int saw_console_brk = 0;
         int limit = 10000;
 
-        if (port->info != NULL)         /* Unopened serial console */
-                tty = port->info->tty;
-
         while (limit-- > 0) {
                 long status;
-                long c = hypervisor_con_getchar(&status);
-                unsigned char flag;
+                long c = sun4v_con_getchar(&status);
 
                 if (status == HV_EWOULDBLOCK)
                         break;
@@ -110,27 +104,90 @@ static struct tty_struct *receive_chars(struct uart_port *port)
                         continue;
                 }
 
-                flag = TTY_NORMAL;
                 port->icount.rx++;
-                if (c == CON_BREAK) {
-                        port->icount.brk++;
-                        if (uart_handle_break(port))
-                                continue;
-                        flag = TTY_BREAK;
-                }
 
                 if (uart_handle_sysrq_char(port, c))
                         continue;
 
-                if ((port->ignore_status_mask & IGNORE_ALL) ||
-                    ((port->ignore_status_mask & IGNORE_BREAK) &&
-                     (c == CON_BREAK)))
+                tty_insert_flip_char(tty, c, TTY_NORMAL);
+        }
+
+        return saw_console_brk;
+}
+
+static int receive_chars_read(struct uart_port *port, struct tty_struct *tty)
+{
+        int saw_console_brk = 0;
+        int limit = 10000;
+
+        while (limit-- > 0) {
+                unsigned long ra = __pa(con_read_page);
+                unsigned long bytes_read, i;
+                long stat = sun4v_con_read(ra, PAGE_SIZE, &bytes_read);
+
+                if (stat != HV_EOK) {
+                        bytes_read = 0;
+
+                        if (stat == CON_BREAK) {
+                                if (uart_handle_break(port))
+                                        continue;
+                                saw_console_brk = 1;
+                                *con_read_page = 0;
+                                bytes_read = 1;
+                        } else if (stat == CON_HUP) {
+                                hung_up = 1;
+                                uart_handle_dcd_change(port, 0);
+                                continue;
+                        } else {
+                                /* HV_EWOULDBLOCK, etc.  */
+                                break;
+                        }
+                }
+
+                if (hung_up) {
+                        hung_up = 0;
+                        uart_handle_dcd_change(port, 1);
+                }
+
+                for (i = 0; i < bytes_read; i++)
+                        uart_handle_sysrq_char(port, con_read_page[i]);
+
+                if (tty == NULL)
                         continue;
 
-                tty_insert_flip_char(tty, c, flag);
+                port->icount.rx += bytes_read;
+
+                tty_insert_flip_string(tty, con_read_page, bytes_read);
         }
 
-        if (saw_console_brk)
+        return saw_console_brk;
+}
+
+struct sunhv_ops {
+        void (*transmit_chars)(struct uart_port *port, struct circ_buf *xmit);
+        int (*receive_chars)(struct uart_port *port, struct tty_struct *tty);
+};
+
+static struct sunhv_ops bychar_ops = {
+        .transmit_chars = transmit_chars_putchar,
+        .receive_chars = receive_chars_getchar,
+};
+
+static struct sunhv_ops bywrite_ops = {
+        .transmit_chars = transmit_chars_write,
+        .receive_chars = receive_chars_read,
+};
+
+static struct sunhv_ops *sunhv_ops = &bychar_ops;
+
+static struct tty_struct *receive_chars(struct uart_port *port)
+{
+        struct tty_struct *tty = NULL;
+
+        if (port->info != NULL)         /* Unopened serial console */
+                tty = port->info->tty;
+
+        if (sunhv_ops->receive_chars(port, tty))
                 sun_do_break();
 
         return tty;
@@ -147,15 +204,7 @@ static void transmit_chars(struct uart_port *port)
         if (uart_circ_empty(xmit) || uart_tx_stopped(port))
                 return;
 
-        while (!uart_circ_empty(xmit)) {
-                long status = hypervisor_con_putchar(xmit->buf[xmit->tail]);
-
-                if (status != HV_EOK)
-                        break;
-
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                port->icount.tx++;
-        }
+        sunhv_ops->transmit_chars(port, xmit);
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(port);
@@ -212,7 +261,7 @@ static void sunhv_start_tx(struct uart_port *port)
         struct circ_buf *xmit = &port->info->xmit;
 
         while (!uart_circ_empty(xmit)) {
-                long status = hypervisor_con_putchar(xmit->buf[xmit->tail]);
+                long status = sun4v_con_putchar(xmit->buf[xmit->tail]);
 
                 if (status != HV_EOK)
                         break;
@@ -231,9 +280,10 @@ static void sunhv_send_xchar(struct uart_port *port, char ch)
         spin_lock_irqsave(&port->lock, flags);
 
         while (limit-- > 0) {
-                long status = hypervisor_con_putchar(ch);
+                long status = sun4v_con_putchar(ch);
                 if (status == HV_EOK)
                         break;
+                udelay(1);
         }
 
         spin_unlock_irqrestore(&port->lock, flags);
@@ -254,15 +304,15 @@ static void sunhv_break_ctl(struct uart_port *port, int break_state)
 {
         if (break_state) {
                 unsigned long flags;
-                int limit = 1000000;
+                int limit = 10000;
 
                 spin_lock_irqsave(&port->lock, flags);
 
                 while (limit-- > 0) {
-                        long status = hypervisor_con_putchar(CON_BREAK);
+                        long status = sun4v_con_putchar(CON_BREAK);
                         if (status == HV_EOK)
                                 break;
-                        udelay(2);
+                        udelay(1);
                 }
 
                 spin_unlock_irqrestore(&port->lock, flags);
@@ -359,38 +409,99 @@ static struct uart_driver sunhv_reg = {
 
 static struct uart_port *sunhv_port;
 
-static inline void sunhv_console_putchar(struct uart_port *port, char c)
+/* Copy 's' into the con_write_page, decoding "\n" into
+ * "\r\n" along the way.  We have to return two lengths
+ * because the caller needs to know how much to advance
+ * 's' and also how many bytes to output via con_write_page.
+ */
+static int fill_con_write_page(const char *s, unsigned int n,
+                               unsigned long *page_bytes)
 {
+        const char *orig_s = s;
+        char *p = con_write_page;
+        int left = PAGE_SIZE;
+
+        while (n--) {
+                if (*s == '\n') {
+                        if (left < 2)
+                                break;
+                        *p++ = '\r';
+                        left--;
+                } else if (left < 1)
+                        break;
+                *p++ = *s++;
+                left--;
+        }
+        *page_bytes = p - con_write_page;
+        return s - orig_s;
+}
+
+static void sunhv_console_write_paged(struct console *con, const char *s, unsigned n)
+{
+        struct uart_port *port = sunhv_port;
         unsigned long flags;
-        int limit = 1000000;
 
         spin_lock_irqsave(&port->lock, flags);
+        while (n > 0) {
+                unsigned long ra = __pa(con_write_page);
+                unsigned long page_bytes;
+                unsigned int cpy = fill_con_write_page(s, n,
+                                                       &page_bytes);
+
+                n -= cpy;
+                s += cpy;
+                while (page_bytes > 0) {
+                        unsigned long written;
+                        int limit = 1000000;
+
+                        while (limit--) {
+                                unsigned long stat;
+
+                                stat = sun4v_con_write(ra, page_bytes,
+                                                       &written);
+                                if (stat == HV_EOK)
+                                        break;
+                                udelay(1);
+                        }
+                        if (limit <= 0)
+                                break;
+                        page_bytes -= written;
+                        ra += written;
+                }
+        }
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static inline void sunhv_console_putchar(struct uart_port *port, char c)
+{
+        int limit = 1000000;
 
         while (limit-- > 0) {
-                long status = hypervisor_con_putchar(c);
+                long status = sun4v_con_putchar(c);
                 if (status == HV_EOK)
                         break;
-                udelay(2);
+                udelay(1);
         }
-
-        spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static void sunhv_console_write(struct console *con, const char *s, unsigned n)
+static void sunhv_console_write_bychar(struct console *con, const char *s, unsigned n)
 {
         struct uart_port *port = sunhv_port;
+        unsigned long flags;
         int i;
 
+        spin_lock_irqsave(&port->lock, flags);
         for (i = 0; i < n; i++) {
                 if (*s == '\n')
                         sunhv_console_putchar(port, '\r');
                 sunhv_console_putchar(port, *s++);
         }
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static struct console sunhv_console = {
         .name   =       "ttyHV",
-        .write  =       sunhv_console_write,
+        .write  =       sunhv_console_write_bychar,
         .device =       uart_console_device,
         .flags  =       CON_PRINTBUFFER,
         .index  =       -1,
@@ -410,6 +521,7 @@ static inline struct console *SUNHV_CONSOLE(void)
 static int __devinit hv_probe(struct of_device *op, const struct of_device_id *match)
 {
         struct uart_port *port;
+        unsigned long minor;
         int err;
 
         if (op->irqs[0] == 0xffffffff)
@@ -419,6 +531,22 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
         if (unlikely(!port))
                 return -ENOMEM;
 
+        minor = 1;
+        if (sun4v_hvapi_register(HV_GRP_CORE, 1, &minor) == 0 &&
+            minor >= 1) {
+                err = -ENOMEM;
+                con_write_page = kzalloc(PAGE_SIZE, GFP_KERNEL);
+                if (!con_write_page)
+                        goto out_free_port;
+
+                con_read_page = kzalloc(PAGE_SIZE, GFP_KERNEL);
+                if (!con_read_page)
+                        goto out_free_con_write_page;
+
+                sunhv_console.write = sunhv_console_write_paged;
+                sunhv_ops = &bywrite_ops;
+        }
+
         sunhv_port = port;
 
         port->line = 0;
@@ -437,7 +565,7 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
 
         err = uart_register_driver(&sunhv_reg);
         if (err)
-                goto out_free_port;
+                goto out_free_con_read_page;
 
         sunhv_reg.tty_driver->name_base = sunhv_reg.minor - 64;
         sunserial_current_minor += 1;
@@ -463,6 +591,12 @@ out_unregister_driver:
         sunserial_current_minor -= 1;
         uart_unregister_driver(&sunhv_reg);
 
+out_free_con_read_page:
+        kfree(con_read_page);
+
+out_free_con_write_page:
+        kfree(con_write_page);
+
 out_free_port:
         kfree(port);
         sunhv_port = NULL;
@@ -493,6 +627,10 @@ static struct of_device_id hv_match[] = {
                 .name = "console",
                 .compatible = "qcn",
         },
+        {
+                .name = "console",
+                .compatible = "SUNW,sun4v-console",
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, hv_match);
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index da73205e54cd..0985193dc57d 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -92,6 +92,8 @@ struct uart_sunzilog_port {
 #define SUNZILOG_FLAG_REGS_HELD         0x00000040
 #define SUNZILOG_FLAG_TX_STOPPED        0x00000080
 #define SUNZILOG_FLAG_TX_ACTIVE         0x00000100
+#define SUNZILOG_FLAG_ESCC              0x00000200
+#define SUNZILOG_FLAG_ISR_HANDLER       0x00000400
 
         unsigned int cflag;
 
@@ -174,9 +176,11 @@ static void sunzilog_clear_fifo(struct zilog_channel __iomem *channel)
 /* This function must only be called when the TX is not busy.  The UART
  * port lock must be held and local interrupts disabled.
  */
-static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs)
+static int __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs)
 {
         int i;
+        int escc;
+        unsigned char r15;
 
         /* Let pending transmits finish.  */
         for (i = 0; i < 1000; i++) {
@@ -229,11 +233,25 @@ static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *
         write_zsreg(channel, R14, regs[R14]);
 
         /* External status interrupt control.  */
-        write_zsreg(channel, R15, regs[R15]);
+        write_zsreg(channel, R15, (regs[R15] | WR7pEN) & ~FIFOEN);
+
+        /* ESCC Extension Register */
+        r15 = read_zsreg(channel, R15);
+        if (r15 & 0x01) {
+                write_zsreg(channel, R7,  regs[R7p]);
+
+                /* External status interrupt and FIFO control.  */
+                write_zsreg(channel, R15, regs[R15] & ~WR7pEN);
+                escc = 1;
+        } else {
+                 /* Clear FIFO bit case it is an issue */
+                regs[R15] &= ~FIFOEN;
+                escc = 0;
+        }
 
         /* Reset external status interrupts.  */
-        write_zsreg(channel, R0, RES_EXT_INT);
-        write_zsreg(channel, R0, RES_EXT_INT);
+        write_zsreg(channel, R0, RES_EXT_INT); /* First Latch  */
+        write_zsreg(channel, R0, RES_EXT_INT); /* Second Latch */
 
         /* Rewrite R3/R5, this time without enables masked.  */
         write_zsreg(channel, R3, regs[R3]);
@@ -241,6 +259,8 @@ static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *
 
         /* Rewrite R1, this time without IRQ enabled masked.  */
         write_zsreg(channel, R1, regs[R1]);
+
+        return escc;
 }
 
 /* Reprogram the Zilog channel HW registers with the copies found in the
@@ -731,7 +751,7 @@ static void sunzilog_enable_ms(struct uart_port *port)
                 up->curregs[R15] = new_reg;
 
                 /* NOTE: Not subject to 'transmitter active' rule.  */ 
-                write_zsreg(channel, R15, up->curregs[R15]);
+                write_zsreg(channel, R15, up->curregs[R15] & ~WR7pEN);
         }
 }
 
@@ -861,44 +881,44 @@ sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag,
         up->curregs[R14] = BRSRC | BRENAB;
 
         /* Character size, stop bits, and parity. */
-        up->curregs[3] &= ~RxN_MASK;
-        up->curregs[5] &= ~TxN_MASK;
+        up->curregs[R3] &= ~RxN_MASK;
+        up->curregs[R5] &= ~TxN_MASK;
         switch (cflag & CSIZE) {
         case CS5:
-                up->curregs[3] |= Rx5;
-                up->curregs[5] |= Tx5;
+                up->curregs[R3] |= Rx5;
+                up->curregs[R5] |= Tx5;
                 up->parity_mask = 0x1f;
                 break;
         case CS6:
-                up->curregs[3] |= Rx6;
-                up->curregs[5] |= Tx6;
+                up->curregs[R3] |= Rx6;
+                up->curregs[R5] |= Tx6;
                 up->parity_mask = 0x3f;
                 break;
         case CS7:
-                up->curregs[3] |= Rx7;
-                up->curregs[5] |= Tx7;
+                up->curregs[R3] |= Rx7;
+                up->curregs[R5] |= Tx7;
                 up->parity_mask = 0x7f;
                 break;
         case CS8:
         default:
-                up->curregs[3] |= Rx8;
-                up->curregs[5] |= Tx8;
+                up->curregs[R3] |= Rx8;
+                up->curregs[R5] |= Tx8;
                 up->parity_mask = 0xff;
                 break;
         };
-        up->curregs[4] &= ~0x0c;
+        up->curregs[R4] &= ~0x0c;
         if (cflag & CSTOPB)
-                up->curregs[4] |= SB2;
+                up->curregs[R4] |= SB2;
         else
-                up->curregs[4] |= SB1;
+                up->curregs[R4] |= SB1;
         if (cflag & PARENB)
-                up->curregs[4] |= PAR_ENAB;
+                up->curregs[R4] |= PAR_ENAB;
         else
-                up->curregs[4] &= ~PAR_ENAB;
+                up->curregs[R4] &= ~PAR_ENAB;
         if (!(cflag & PARODD))
-                up->curregs[4] |= PAR_EVEN;
+                up->curregs[R4] |= PAR_EVEN;
         else
-                up->curregs[4] &= ~PAR_EVEN;
+                up->curregs[R4] &= ~PAR_EVEN;
 
         up->port.read_status_mask = Rx_OVR;
         if (iflag & INPCK)
@@ -952,7 +972,9 @@ sunzilog_set_termios(struct uart_port *port, struct ktermios *termios,
 
 static const char *sunzilog_type(struct uart_port *port)
 {
-        return "zs";
+        struct uart_sunzilog_port *up = UART_ZILOG(port);
+
+        return (up->flags & SUNZILOG_FLAG_ESCC) ? "zs (ESCC)" : "zs";
 }
 
 /* We do not request/release mappings of the registers here, this
@@ -1170,7 +1192,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
 
         spin_lock_irqsave(&up->port.lock, flags);
 
-        up->curregs[R15] = BRKIE;
+        up->curregs[R15] |= BRKIE;
         sunzilog_convert_to_zs(up, con->cflag, 0, brg);
 
         sunzilog_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
@@ -1229,7 +1251,7 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe
                 baud = 4800;
         }
 
-        up->curregs[R15] = BRKIE;
+        up->curregs[R15] |= BRKIE;
         brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
         sunzilog_convert_to_zs(up, up->cflag, 0, brg);
         sunzilog_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
@@ -1283,8 +1305,18 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
 
         if (up->flags & (SUNZILOG_FLAG_CONS_KEYB |
                          SUNZILOG_FLAG_CONS_MOUSE)) {
+                up->curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;
+                up->curregs[R4] = PAR_EVEN | X16CLK | SB1;
+                up->curregs[R3] = RxENAB | Rx8;
+                up->curregs[R5] = TxENAB | Tx8;
+                up->curregs[R6] = 0x00; /* SDLC Address */
+                up->curregs[R7] = 0x7E; /* SDLC Flag    */
+                up->curregs[R9] = NV;
+                up->curregs[R7p] = 0x00;
                 sunzilog_init_kbdms(up, up->port.line);
-                up->curregs[R9] |= (NV | MIE);
+                /* Only enable interrupts if an ISR handler available */
+                if (up->flags & SUNZILOG_FLAG_ISR_HANDLER)
+                        up->curregs[R9] |= MIE;
                 write_zsreg(channel, R9, up->curregs[R9]);
         } else {
                 /* Normal serial TTY. */
@@ -1293,7 +1325,9 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
                 up->curregs[R4] = PAR_EVEN | X16CLK | SB1;
                 up->curregs[R3] = RxENAB | Rx8;
                 up->curregs[R5] = TxENAB | Tx8;
-                up->curregs[R9] = NV | MIE;
+                up->curregs[R6] = 0x00; /* SDLC Address */
+                up->curregs[R7] = 0x7E; /* SDLC Flag    */
+                up->curregs[R9] = NV;
                 up->curregs[R10] = NRZ;
                 up->curregs[R11] = TCBR | RCBR;
                 baud = 9600;
@@ -1301,7 +1335,14 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
                 up->curregs[R12] = (brg & 0xff);
                 up->curregs[R13] = (brg >> 8) & 0xff;
                 up->curregs[R14] = BRSRC | BRENAB;
-                __load_zsregs(channel, up->curregs);
+                up->curregs[R15] = FIFOEN; /* Use FIFO if on ESCC */
+                up->curregs[R7p] = TxFIFO_LVL | RxFIFO_LVL;
+                if (__load_zsregs(channel, up->curregs)) {
+                        up->flags |= SUNZILOG_FLAG_ESCC;
+                }
+                /* Only enable interrupts if an ISR handler available */
+                if (up->flags & SUNZILOG_FLAG_ISR_HANDLER)
+                        up->curregs[R9] |= MIE;
                 write_zsreg(channel, R9, up->curregs[R9]);
         }
 
@@ -1390,12 +1431,14 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                         return err;
                 }
         } else {
-                printk(KERN_INFO "%s: Keyboard at MMIO %lx (irq = %d) "
-                       "is a zs\n",
-                       op->dev.bus_id, up[0].port.mapbase, op->irqs[0]);
-                printk(KERN_INFO "%s: Mouse at MMIO %lx (irq = %d) "
-                       "is a zs\n",
-                       op->dev.bus_id, up[1].port.mapbase, op->irqs[0]);
+                printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) "
+                       "is a %s\n",
+                       op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
+                       sunzilog_type (&up[0].port));
+                printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
+                       "is a %s\n",
+                       op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
+                       sunzilog_type (&up[1].port));
         }
 
         dev_set_drvdata(&op->dev, &up[0]);
@@ -1487,10 +1530,23 @@ static int __init sunzilog_init(void)
                 goto out_unregister_uart;
 
         if (zilog_irq != -1) {
+                struct uart_sunzilog_port *up = sunzilog_irq_chain;
                 err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
                                   "zs", sunzilog_irq_chain);
                 if (err)
                         goto out_unregister_driver;
+
+                /* Enable Interrupts */
+                while (up) {
+                        struct zilog_channel __iomem *channel;
+
+                        /* printk (KERN_INFO "Enable IRQ for ZILOG Hardware %p\n", up); */
+                        channel          = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                        up->flags       |= SUNZILOG_FLAG_ISR_HANDLER;
+                        up->curregs[R9] |= MIE;
+                        write_zsreg(channel, R9, up->curregs[R9]);
+                        up = up->next;
+                }
         }
 
 out:
@@ -1515,6 +1571,20 @@ static void __exit sunzilog_exit(void)
         of_unregister_driver(&zs_driver);
 
         if (zilog_irq != -1) {
+                struct uart_sunzilog_port *up = sunzilog_irq_chain;
+
+                /* Disable Interrupts */
+                while (up) {
+                        struct zilog_channel __iomem *channel;
+
+                        /* printk (KERN_INFO "Disable IRQ for ZILOG Hardware %p\n", up); */
+                        channel          = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                        up->flags       &= ~SUNZILOG_FLAG_ISR_HANDLER;
+                        up->curregs[R9] &= ~MIE;
+                        write_zsreg(channel, R9, up->curregs[R9]);
+                        up = up->next;
+                }
+
                 free_irq(zilog_irq, sunzilog_irq_chain);
                 zilog_irq = -1;
         }
diff --git a/drivers/serial/sunzilog.h b/drivers/serial/sunzilog.h
index 7939b6d71270..5dec7b47cc38 100644
--- a/drivers/serial/sunzilog.h
+++ b/drivers/serial/sunzilog.h
@@ -13,7 +13,8 @@ struct zilog_layout {
         struct zilog_channel channelA;
 };
 
-#define NUM_ZSREGS    16
+#define NUM_ZSREGS      17
+#define R7p             16 /* Written as R7 with P15 bit 0 set */
 
 /* Conversion routines to/from brg time constants from/to bits
  * per second.
@@ -127,6 +128,15 @@ struct zilog_layout {
 
 /* Write Register 7 (Sync bits 8-15/SDLC 01111110) */
 
+/* Write Register 7' (ESCC Only) */
+#define AUTO_TxFLAG     1       /* Automatic Tx SDLC Flag */
+#define AUTO_EOM_RST    2       /* Automatic EOM Reset */
+#define AUTOnRTS        4       /* Automatic /RTS pin deactivation */
+#define RxFIFO_LVL      8       /* Receive FIFO interrupt level */
+#define nDTRnREQ        0x10    /* /DTR/REQ timing */
+#define TxFIFO_LVL      0x20    /* Transmit FIFO interrupt level */
+#define EXT_RD_EN       0x40    /* Extended read register enable */
+
 /* Write Register 8 (transmit buffer) */
 
 /* Write Register 9 (Master interrupt control) */
@@ -135,6 +145,7 @@ struct zilog_layout {
 #define DLC     4       /* Disable Lower Chain */
 #define MIE     8       /* Master Interrupt Enable */
 #define STATHI  0x10    /* Status high */
+#define SWIACK  0x20    /* Software Interrupt Ack (not on NMOS) */
 #define NORESET 0       /* No reset on write to R9 */
 #define CHRB    0x40    /* Reset channel B */
 #define CHRA    0x80    /* Reset channel A */
@@ -187,7 +198,9 @@ struct zilog_layout {
 #define SNRZI   0xe0    /* Set NRZI mode */
 
 /* Write Register 15 (external/status interrupt control) */
+#define WR7pEN  1       /* WR7' Enable (ESCC only) */
 #define ZCIE    2       /* Zero count IE */
+#define FIFOEN  4       /* FIFO Enable (ESCC only) */
 #define DCDIE   8       /* DCD IE */
 #define SYNCIE  0x10    /* Sync/hunt IE */
 #define CTSIE   0x20    /* CTS IE */
@@ -241,6 +254,10 @@ struct zilog_layout {
 #define CHATxIP 0x10            /* Channel A Tx IP */
 #define CHARxIP 0x20            /* Channel A Rx IP */
 
+/* Read Register 6 (LSB frame byte count [Not on NMOS]) */
+
+/* Read Register 7 (MSB frame byte count and FIFO status [Not on NMOS]) */
+
 /* Read Register 8 (receive data register) */
 
 /* Read Register 10  (misc status bits) */
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 4a012d9acbff..5e3f748f2693 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -6,6 +6,7 @@
 # fully appropriate there, so it'd need some thought to do well.
 #
 menu "SPI support"
+        depends on HAS_IOMEM
 
 config SPI
         bool "SPI support"
@@ -64,6 +65,17 @@ config SPI_BFIN
         help
           This is the SPI controller master driver for Blackfin 5xx processor.
 
+config SPI_AU1550
+        tristate "Au1550/Au12x0 SPI Controller"
+        depends on SPI_MASTER && (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL
+        select SPI_BITBANG
+        help
+          If you say yes to this option, support will be included for the
+          Au1550 SPI controller (may also work with Au1200,Au1210,Au1250).
+
+          This driver can also be built as a module.  If so, the module
+          will be called au1550_spi.
+
 config SPI_BITBANG
         tristate "Bitbanging SPI master"
         depends on SPI_MASTER && EXPERIMENTAL
@@ -95,6 +107,13 @@ config SPI_IMX
           This enables using the Freescale iMX SPI controller in master
           mode.
 
+config SPI_MPC52xx_PSC
+        tristate "Freescale MPC52xx PSC SPI controller"
+        depends on SPI_MASTER && PPC_MPC52xx && EXPERIMENTAL
+        help
+          This enables using the Freescale MPC52xx Programmable Serial
+          Controller in master SPI mode.
+
 config SPI_MPC83xx
         tristate "Freescale MPC83xx SPI controller"
         depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL
@@ -159,6 +178,15 @@ config SPI_AT25
           This driver can also be built as a module.  If so, the module
           will be called at25.
 
+config SPI_SPIDEV
+        tristate "User mode SPI device driver support"
+        depends on SPI_MASTER && EXPERIMENTAL
+        help
+          This supports user mode SPI protocol drivers.
+
+          Note that this application programming interface is EXPERIMENTAL
+          and hence SUBJECT TO CHANGE WITHOUT NOTICE while it stabilizes.
+
 #
 # Add new SPI protocol masters in alphabetical order above this line
 #
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index a95ade857a2f..5788d867de84 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -14,10 +14,12 @@ obj-$(CONFIG_SPI_MASTER)		+= spi.o
 obj-$(CONFIG_SPI_ATMEL)                 += atmel_spi.o
 obj-$(CONFIG_SPI_BFIN)                  += spi_bfin5xx.o
 obj-$(CONFIG_SPI_BITBANG)               += spi_bitbang.o
+obj-$(CONFIG_SPI_AU1550)                += au1550_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)             += spi_butterfly.o
 obj-$(CONFIG_SPI_IMX)                   += spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)                += pxa2xx_spi.o
 obj-$(CONFIG_SPI_OMAP_UWIRE)            += omap_uwire.o
+obj-$(CONFIG_SPI_MPC52xx_PSC)           += mpc52xx_psc_spi.o
 obj-$(CONFIG_SPI_MPC83xx)               += spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)          += spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)               += spi_s3c24xx.o
@@ -25,6 +27,7 @@ obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
 
 # SPI protocol drivers (device/link on bus)
 obj-$(CONFIG_SPI_AT25)          += at25.o
+obj-$(CONFIG_SPI_SPIDEV)        += spidev.o
 #       ... add above this line ...
 
 # SPI slave controller drivers (upstream link)
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 66e7bc985797..1d8a2f6bb8eb 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -22,10 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
-
-#ifdef CONFIG_ARCH_AT91
 #include <asm/arch/cpu.h>
-#endif
 
 #include "atmel_spi.h"
 
@@ -552,10 +549,8 @@ static int __init atmel_spi_probe(struct platform_device *pdev)
                 goto out_free_buffer;
         as->irq = irq;
         as->clk = clk;
-#ifdef CONFIG_ARCH_AT91
         if (!cpu_is_at91rm9200())
                 as->new_1 = 1;
-#endif
 
         ret = request_irq(irq, atmel_spi_interrupt, 0,
                         pdev->dev.bus_id, master);
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
new file mode 100644
index 000000000000..ae2b1af0dba4
--- /dev/null
+++ b/drivers/spi/au1550_spi.c
@@ -0,0 +1,974 @@
+/*
+ * au1550_spi.c - au1550 psc spi controller driver
+ * may work also with au1200, au1210, au1250
+ * will not work on au1000, au1100 and au1500 (no full spi controller there)
+ *
+ * Copyright (c) 2006 ATRON electronic GmbH
+ * Author: Jan Nikitenko <jan.nikitenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/errno.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/dma-mapping.h>
+#include <linux/completion.h>
+#include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>
+#include <asm/mach-au1x00/au1xxx_dbdma.h>
+
+#include <asm/mach-au1x00/au1550_spi.h>
+
+static unsigned usedma = 1;
+module_param(usedma, uint, 0644);
+
+/*
+#define AU1550_SPI_DEBUG_LOOPBACK
+*/
+
+
+#define AU1550_SPI_DBDMA_DESCRIPTORS 1
+#define AU1550_SPI_DMA_RXTMP_MINSIZE 2048U
+
+struct au1550_spi {
+        struct spi_bitbang bitbang;
+
+        volatile psc_spi_t __iomem *regs;
+        int irq;
+        unsigned freq_max;
+        unsigned freq_min;
+
+        unsigned len;
+        unsigned tx_count;
+        unsigned rx_count;
+        const u8 *tx;
+        u8 *rx;
+
+        void (*rx_word)(struct au1550_spi *hw);
+        void (*tx_word)(struct au1550_spi *hw);
+        int (*txrx_bufs)(struct spi_device *spi, struct spi_transfer *t);
+        irqreturn_t (*irq_callback)(struct au1550_spi *hw);
+
+        struct completion master_done;
+
+        unsigned usedma;
+        u32 dma_tx_id;
+        u32 dma_rx_id;
+        u32 dma_tx_ch;
+        u32 dma_rx_ch;
+
+        u8 *dma_rx_tmpbuf;
+        unsigned dma_rx_tmpbuf_size;
+        u32 dma_rx_tmpbuf_addr;
+
+        struct spi_master *master;
+        struct device *dev;
+        struct au1550_spi_info *pdata;
+};
+
+
+/* we use an 8-bit memory device for dma transfers to/from spi fifo */
+static dbdev_tab_t au1550_spi_mem_dbdev =
+{
+        .dev_id                 = DBDMA_MEM_CHAN,
+        .dev_flags              = DEV_FLAGS_ANYUSE|DEV_FLAGS_SYNC,
+        .dev_tsize              = 0,
+        .dev_devwidth           = 8,
+        .dev_physaddr           = 0x00000000,
+        .dev_intlevel           = 0,
+        .dev_intpolarity        = 0
+};
+
+static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw);
+
+
+/**
+ *  compute BRG and DIV bits to setup spi clock based on main input clock rate
+ *  that was specified in platform data structure
+ *  according to au1550 datasheet:
+ *    psc_tempclk = psc_mainclk / (2 << DIV)
+ *    spiclk = psc_tempclk / (2 * (BRG + 1))
+ *    BRG valid range is 4..63
+ *    DIV valid range is 0..3
+ */
+static u32 au1550_spi_baudcfg(struct au1550_spi *hw, unsigned speed_hz)
+{
+        u32 mainclk_hz = hw->pdata->mainclk_hz;
+        u32 div, brg;
+
+        for (div = 0; div < 4; div++) {
+                brg = mainclk_hz / speed_hz / (4 << div);
+                /* now we have BRG+1 in brg, so count with that */
+                if (brg < (4 + 1)) {
+                        brg = (4 + 1);  /* speed_hz too big */
+                        break;          /* set lowest brg (div is == 0) */
+                }
+                if (brg <= (63 + 1))
+                        break;          /* we have valid brg and div */
+        }
+        if (div == 4) {
+                div = 3;                /* speed_hz too small */
+                brg = (63 + 1);         /* set highest brg and div */
+        }
+        brg--;
+        return PSC_SPICFG_SET_BAUD(brg) | PSC_SPICFG_SET_DIV(div);
+}
+
+static inline void au1550_spi_mask_ack_all(struct au1550_spi *hw)
+{
+        hw->regs->psc_spimsk =
+                  PSC_SPIMSK_MM | PSC_SPIMSK_RR | PSC_SPIMSK_RO
+                | PSC_SPIMSK_RU | PSC_SPIMSK_TR | PSC_SPIMSK_TO
+                | PSC_SPIMSK_TU | PSC_SPIMSK_SD | PSC_SPIMSK_MD;
+        au_sync();
+
+        hw->regs->psc_spievent =
+                  PSC_SPIEVNT_MM | PSC_SPIEVNT_RR | PSC_SPIEVNT_RO
+                | PSC_SPIEVNT_RU | PSC_SPIEVNT_TR | PSC_SPIEVNT_TO
+                | PSC_SPIEVNT_TU | PSC_SPIEVNT_SD | PSC_SPIEVNT_MD;
+        au_sync();
+}
+
+static void au1550_spi_reset_fifos(struct au1550_spi *hw)
+{
+        u32 pcr;
+
+        hw->regs->psc_spipcr = PSC_SPIPCR_RC | PSC_SPIPCR_TC;
+        au_sync();
+        do {
+                pcr = hw->regs->psc_spipcr;
+                au_sync();
+        } while (pcr != 0);
+}
+
+/*
+ * dma transfers are used for the most common spi word size of 8-bits
+ * we cannot easily change already set up dma channels' width, so if we wanted
+ * dma support for more than 8-bit words (up to 24 bits), we would need to
+ * setup dma channels from scratch on each spi transfer, based on bits_per_word
+ * instead we have pre set up 8 bit dma channels supporting spi 4 to 8 bits
+ * transfers, and 9 to 24 bits spi transfers will be done in pio irq based mode
+ * callbacks to handle dma or pio are set up in au1550_spi_bits_handlers_set()
+ */
+static void au1550_spi_chipsel(struct spi_device *spi, int value)
+{
+        struct au1550_spi *hw = spi_master_get_devdata(spi->master);
+        unsigned cspol = spi->mode & SPI_CS_HIGH ? 1 : 0;
+        u32 cfg, stat;
+
+        switch (value) {
+        case BITBANG_CS_INACTIVE:
+                if (hw->pdata->deactivate_cs)
+                        hw->pdata->deactivate_cs(hw->pdata, spi->chip_select,
+                                        cspol);
+                break;
+
+        case BITBANG_CS_ACTIVE:
+                au1550_spi_bits_handlers_set(hw, spi->bits_per_word);
+
+                cfg = hw->regs->psc_spicfg;
+                au_sync();
+                hw->regs->psc_spicfg = cfg & ~PSC_SPICFG_DE_ENABLE;
+                au_sync();
+
+                if (spi->mode & SPI_CPOL)
+                        cfg |= PSC_SPICFG_BI;
+                else
+                        cfg &= ~PSC_SPICFG_BI;
+                if (spi->mode & SPI_CPHA)
+                        cfg &= ~PSC_SPICFG_CDE;
+                else
+                        cfg |= PSC_SPICFG_CDE;
+
+                if (spi->mode & SPI_LSB_FIRST)
+                        cfg |= PSC_SPICFG_MLF;
+                else
+                        cfg &= ~PSC_SPICFG_MLF;
+
+                if (hw->usedma && spi->bits_per_word <= 8)
+                        cfg &= ~PSC_SPICFG_DD_DISABLE;
+                else
+                        cfg |= PSC_SPICFG_DD_DISABLE;
+                cfg = PSC_SPICFG_CLR_LEN(cfg);
+                cfg |= PSC_SPICFG_SET_LEN(spi->bits_per_word);
+
+                cfg = PSC_SPICFG_CLR_BAUD(cfg);
+                cfg &= ~PSC_SPICFG_SET_DIV(3);
+                cfg |= au1550_spi_baudcfg(hw, spi->max_speed_hz);
+
+                hw->regs->psc_spicfg = cfg | PSC_SPICFG_DE_ENABLE;
+                au_sync();
+                do {
+                        stat = hw->regs->psc_spistat;
+                        au_sync();
+                } while ((stat & PSC_SPISTAT_DR) == 0);
+
+                if (hw->pdata->activate_cs)
+                        hw->pdata->activate_cs(hw->pdata, spi->chip_select,
+                                        cspol);
+                break;
+        }
+}
+
+static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
+{
+        struct au1550_spi *hw = spi_master_get_devdata(spi->master);
+        unsigned bpw, hz;
+        u32 cfg, stat;
+
+        bpw = t ? t->bits_per_word : spi->bits_per_word;
+        hz = t ? t->speed_hz : spi->max_speed_hz;
+
+        if (bpw < 4 || bpw > 24) {
+                dev_err(&spi->dev, "setupxfer: invalid bits_per_word=%d\n",
+                        bpw);
+                return -EINVAL;
+        }
+        if (hz > spi->max_speed_hz || hz > hw->freq_max || hz < hw->freq_min) {
+                dev_err(&spi->dev, "setupxfer: clock rate=%d out of range\n",
+                        hz);
+                return -EINVAL;
+        }
+
+        au1550_spi_bits_handlers_set(hw, spi->bits_per_word);
+
+        cfg = hw->regs->psc_spicfg;
+        au_sync();
+        hw->regs->psc_spicfg = cfg & ~PSC_SPICFG_DE_ENABLE;
+        au_sync();
+
+        if (hw->usedma && bpw <= 8)
+                cfg &= ~PSC_SPICFG_DD_DISABLE;
+        else
+                cfg |= PSC_SPICFG_DD_DISABLE;
+        cfg = PSC_SPICFG_CLR_LEN(cfg);
+        cfg |= PSC_SPICFG_SET_LEN(bpw);
+
+        cfg = PSC_SPICFG_CLR_BAUD(cfg);
+        cfg &= ~PSC_SPICFG_SET_DIV(3);
+        cfg |= au1550_spi_baudcfg(hw, hz);
+
+        hw->regs->psc_spicfg = cfg;
+        au_sync();
+
+        if (cfg & PSC_SPICFG_DE_ENABLE) {
+                do {
+                        stat = hw->regs->psc_spistat;
+                        au_sync();
+                } while ((stat & PSC_SPISTAT_DR) == 0);
+        }
+
+        au1550_spi_reset_fifos(hw);
+        au1550_spi_mask_ack_all(hw);
+        return 0;
+}
+
+static int au1550_spi_setup(struct spi_device *spi)
+{
+        struct au1550_spi *hw = spi_master_get_devdata(spi->master);
+
+        if (spi->bits_per_word == 0)
+                spi->bits_per_word = 8;
+        if (spi->bits_per_word < 4 || spi->bits_per_word > 24) {
+                dev_err(&spi->dev, "setup: invalid bits_per_word=%d\n",
+                        spi->bits_per_word);
+                return -EINVAL;
+        }
+
+        if (spi->max_speed_hz == 0)
+                spi->max_speed_hz = hw->freq_max;
+        if (spi->max_speed_hz > hw->freq_max
+                        || spi->max_speed_hz < hw->freq_min)
+                return -EINVAL;
+        /*
+         * NOTE: cannot change speed and other hw settings immediately,
+         *       otherwise sharing of spi bus is not possible,
+         *       so do not call setupxfer(spi, NULL) here
+         */
+        return 0;
+}
+
+/*
+ * for dma spi transfers, we have to setup rx channel, otherwise there is
+ * no reliable way how to recognize that spi transfer is done
+ * dma complete callbacks are called before real spi transfer is finished
+ * and if only tx dma channel is set up (and rx fifo overflow event masked)
+ * spi master done event irq is not generated unless rx fifo is empty (emptied)
+ * so we need rx tmp buffer to use for rx dma if user does not provide one
+ */
+static int au1550_spi_dma_rxtmp_alloc(struct au1550_spi *hw, unsigned size)
+{
+        hw->dma_rx_tmpbuf = kmalloc(size, GFP_KERNEL);
+        if (!hw->dma_rx_tmpbuf)
+                return -ENOMEM;
+        hw->dma_rx_tmpbuf_size = size;
+        hw->dma_rx_tmpbuf_addr = dma_map_single(hw->dev, hw->dma_rx_tmpbuf,
+                        size, DMA_FROM_DEVICE);
+        if (dma_mapping_error(hw->dma_rx_tmpbuf_addr)) {
+                kfree(hw->dma_rx_tmpbuf);
+                hw->dma_rx_tmpbuf = 0;
+                hw->dma_rx_tmpbuf_size = 0;
+                return -EFAULT;
+        }
+        return 0;
+}
+
+static void au1550_spi_dma_rxtmp_free(struct au1550_spi *hw)
+{
+        dma_unmap_single(hw->dev, hw->dma_rx_tmpbuf_addr,
+                        hw->dma_rx_tmpbuf_size, DMA_FROM_DEVICE);
+        kfree(hw->dma_rx_tmpbuf);
+        hw->dma_rx_tmpbuf = 0;
+        hw->dma_rx_tmpbuf_size = 0;
+}
+
+static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
+{
+        struct au1550_spi *hw = spi_master_get_devdata(spi->master);
+        dma_addr_t dma_tx_addr;
+        dma_addr_t dma_rx_addr;
+        u32 res;
+
+        hw->len = t->len;
+        hw->tx_count = 0;
+        hw->rx_count = 0;
+
+        hw->tx = t->tx_buf;
+        hw->rx = t->rx_buf;
+        dma_tx_addr = t->tx_dma;
+        dma_rx_addr = t->rx_dma;
+
+        /*
+         * check if buffers are already dma mapped, map them otherwise
+         * use rx buffer in place of tx if tx buffer was not provided
+         * use temp rx buffer (preallocated or realloc to fit) for rx dma
+         */
+        if (t->rx_buf) {
+                if (t->rx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
+                        dma_rx_addr = dma_map_single(hw->dev,
+                                        (void *)t->rx_buf,
+                                        t->len, DMA_FROM_DEVICE);
+                        if (dma_mapping_error(dma_rx_addr))
+                                dev_err(hw->dev, "rx dma map error\n");
+                }
+        } else {
+                if (t->len > hw->dma_rx_tmpbuf_size) {
+                        int ret;
+
+                        au1550_spi_dma_rxtmp_free(hw);
+                        ret = au1550_spi_dma_rxtmp_alloc(hw, max(t->len,
+                                        AU1550_SPI_DMA_RXTMP_MINSIZE));
+                        if (ret < 0)
+                                return ret;
+                }
+                hw->rx = hw->dma_rx_tmpbuf;
+                dma_rx_addr = hw->dma_rx_tmpbuf_addr;
+                dma_sync_single_for_device(hw->dev, dma_rx_addr,
+                        t->len, DMA_FROM_DEVICE);
+        }
+        if (t->tx_buf) {
+                if (t->tx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
+                        dma_tx_addr = dma_map_single(hw->dev,
+                                        (void *)t->tx_buf,
+                                        t->len, DMA_TO_DEVICE);
+                        if (dma_mapping_error(dma_tx_addr))
+                                dev_err(hw->dev, "tx dma map error\n");
+                }
+        } else {
+                dma_sync_single_for_device(hw->dev, dma_rx_addr,
+                                t->len, DMA_BIDIRECTIONAL);
+                hw->tx = hw->rx;
+        }
+
+        /* put buffers on the ring */
+        res = au1xxx_dbdma_put_dest(hw->dma_rx_ch, hw->rx, t->len);
+        if (!res)
+                dev_err(hw->dev, "rx dma put dest error\n");
+
+        res = au1xxx_dbdma_put_source(hw->dma_tx_ch, (void *)hw->tx, t->len);
+        if (!res)
+                dev_err(hw->dev, "tx dma put source error\n");
+
+        au1xxx_dbdma_start(hw->dma_rx_ch);
+        au1xxx_dbdma_start(hw->dma_tx_ch);
+
+        /* by default enable nearly all events interrupt */
+        hw->regs->psc_spimsk = PSC_SPIMSK_SD;
+        au_sync();
+
+        /* start the transfer */
+        hw->regs->psc_spipcr = PSC_SPIPCR_MS;
+        au_sync();
+
+        wait_for_completion(&hw->master_done);
+
+        au1xxx_dbdma_stop(hw->dma_tx_ch);
+        au1xxx_dbdma_stop(hw->dma_rx_ch);
+
+        if (!t->rx_buf) {
+                /* using the temporal preallocated and premapped buffer */
+                dma_sync_single_for_cpu(hw->dev, dma_rx_addr, t->len,
+                        DMA_FROM_DEVICE);
+        }
+        /* unmap buffers if mapped above */
+        if (t->rx_buf && t->rx_dma == 0 )
+                dma_unmap_single(hw->dev, dma_rx_addr, t->len,
+                        DMA_FROM_DEVICE);
+        if (t->tx_buf && t->tx_dma == 0 )
+                dma_unmap_single(hw->dev, dma_tx_addr, t->len,
+                        DMA_TO_DEVICE);
+
+        return hw->rx_count < hw->tx_count ? hw->rx_count : hw->tx_count;
+}
+
+static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
+{
+        u32 stat, evnt;
+
+        stat = hw->regs->psc_spistat;
+        evnt = hw->regs->psc_spievent;
+        au_sync();
+        if ((stat & PSC_SPISTAT_DI) == 0) {
+                dev_err(hw->dev, "Unexpected IRQ!\n");
+                return IRQ_NONE;
+        }
+
+        if ((evnt & (PSC_SPIEVNT_MM | PSC_SPIEVNT_RO
+                                | PSC_SPIEVNT_RU | PSC_SPIEVNT_TO
+                                | PSC_SPIEVNT_TU | PSC_SPIEVNT_SD))
+                        != 0) {
+                /*
+                 * due to an spi error we consider transfer as done,
+                 * so mask all events until before next transfer start
+                 * and stop the possibly running dma immediatelly
+                 */
+                au1550_spi_mask_ack_all(hw);
+                au1xxx_dbdma_stop(hw->dma_rx_ch);
+                au1xxx_dbdma_stop(hw->dma_tx_ch);
+
+                /* get number of transfered bytes */
+                hw->rx_count = hw->len - au1xxx_get_dma_residue(hw->dma_rx_ch);
+                hw->tx_count = hw->len - au1xxx_get_dma_residue(hw->dma_tx_ch);
+
+                au1xxx_dbdma_reset(hw->dma_rx_ch);
+                au1xxx_dbdma_reset(hw->dma_tx_ch);
+                au1550_spi_reset_fifos(hw);
+
+                dev_err(hw->dev,
+                        "Unexpected SPI error: event=0x%x stat=0x%x!\n",
+                        evnt, stat);
+
+                complete(&hw->master_done);
+                return IRQ_HANDLED;
+        }
+
+        if ((evnt & PSC_SPIEVNT_MD) != 0) {
+                /* transfer completed successfully */
+                au1550_spi_mask_ack_all(hw);
+                hw->rx_count = hw->len;
+                hw->tx_count = hw->len;
+                complete(&hw->master_done);
+        }
+        return IRQ_HANDLED;
+}
+
+
+/* routines to handle different word sizes in pio mode */
+#define AU1550_SPI_RX_WORD(size, mask)                                  \
+static void au1550_spi_rx_word_##size(struct au1550_spi *hw)            \
+{                                                                       \
+        u32 fifoword = hw->regs->psc_spitxrx & (u32)(mask);             \
+        au_sync();                                                      \
+        if (hw->rx) {                                                   \
+                *(u##size *)hw->rx = (u##size)fifoword;                 \
+                hw->rx += (size) / 8;                                   \
+        }                                                               \
+        hw->rx_count += (size) / 8;                                     \
+}
+
+#define AU1550_SPI_TX_WORD(size, mask)                                  \
+static void au1550_spi_tx_word_##size(struct au1550_spi *hw)            \
+{                                                                       \
+        u32 fifoword = 0;                                               \
+        if (hw->tx) {                                                   \
+                fifoword = *(u##size *)hw->tx & (u32)(mask);            \
+                hw->tx += (size) / 8;                                   \
+        }                                                               \
+        hw->tx_count += (size) / 8;                                     \
+        if (hw->tx_count >= hw->len)                                    \
+                fifoword |= PSC_SPITXRX_LC;                             \
+        hw->regs->psc_spitxrx = fifoword;                               \
+        au_sync();                                                      \
+}
+
+AU1550_SPI_RX_WORD(8,0xff)
+AU1550_SPI_RX_WORD(16,0xffff)
+AU1550_SPI_RX_WORD(32,0xffffff)
+AU1550_SPI_TX_WORD(8,0xff)
+AU1550_SPI_TX_WORD(16,0xffff)
+AU1550_SPI_TX_WORD(32,0xffffff)
+
+static int au1550_spi_pio_txrxb(struct spi_device *spi, struct spi_transfer *t)
+{
+        u32 stat, mask;
+        struct au1550_spi *hw = spi_master_get_devdata(spi->master);
+
+        hw->tx = t->tx_buf;
+        hw->rx = t->rx_buf;
+        hw->len = t->len;
+        hw->tx_count = 0;
+        hw->rx_count = 0;
+
+        /* by default enable nearly all events after filling tx fifo */
+        mask = PSC_SPIMSK_SD;
+
+        /* fill the transmit FIFO */
+        while (hw->tx_count < hw->len) {
+
+                hw->tx_word(hw);
+
+                if (hw->tx_count >= hw->len) {
+                        /* mask tx fifo request interrupt as we are done */
+                        mask |= PSC_SPIMSK_TR;
+                }
+
+                stat = hw->regs->psc_spistat;
+                au_sync();
+                if (stat & PSC_SPISTAT_TF)
+                        break;
+        }
+
+        /* enable event interrupts */
+        hw->regs->psc_spimsk = mask;
+        au_sync();
+
+        /* start the transfer */
+        hw->regs->psc_spipcr = PSC_SPIPCR_MS;
+        au_sync();
+
+        wait_for_completion(&hw->master_done);
+
+        return hw->rx_count < hw->tx_count ? hw->rx_count : hw->tx_count;
+}
+
+static irqreturn_t au1550_spi_pio_irq_callback(struct au1550_spi *hw)
+{
+        int busy;
+        u32 stat, evnt;
+
+        stat = hw->regs->psc_spistat;
+        evnt = hw->regs->psc_spievent;
+        au_sync();
+        if ((stat & PSC_SPISTAT_DI) == 0) {
+                dev_err(hw->dev, "Unexpected IRQ!\n");
+                return IRQ_NONE;
+        }
+
+        if ((evnt & (PSC_SPIEVNT_MM | PSC_SPIEVNT_RO
+                                | PSC_SPIEVNT_RU | PSC_SPIEVNT_TO
+                                | PSC_SPIEVNT_TU | PSC_SPIEVNT_SD))
+                        != 0) {
+                dev_err(hw->dev,
+                        "Unexpected SPI error: event=0x%x stat=0x%x!\n",
+                        evnt, stat);
+                /*
+                 * due to an error we consider transfer as done,
+                 * so mask all events until before next transfer start
+                 */
+                au1550_spi_mask_ack_all(hw);
+                au1550_spi_reset_fifos(hw);
+                complete(&hw->master_done);
+                return IRQ_HANDLED;
+        }
+
+        /*
+         * while there is something to read from rx fifo
+         * or there is a space to write to tx fifo:
+         */
+        do {
+                busy = 0;
+                stat = hw->regs->psc_spistat;
+                au_sync();
+
+                if ((stat & PSC_SPISTAT_RE) == 0 && hw->rx_count < hw->len) {
+                        hw->rx_word(hw);
+                        /* ack the receive request event */
+                        hw->regs->psc_spievent = PSC_SPIEVNT_RR;
+                        au_sync();
+                        busy = 1;
+                }
+
+                if ((stat & PSC_SPISTAT_TF) == 0 && hw->tx_count < hw->len) {
+                        hw->tx_word(hw);
+                        /* ack the transmit request event */
+                        hw->regs->psc_spievent = PSC_SPIEVNT_TR;
+                        au_sync();
+                        busy = 1;
+                }
+        } while (busy);
+
+        evnt = hw->regs->psc_spievent;
+        au_sync();
+
+        if (hw->rx_count >= hw->len || (evnt & PSC_SPIEVNT_MD) != 0) {
+                /* transfer completed successfully */
+                au1550_spi_mask_ack_all(hw);
+                complete(&hw->master_done);
+        }
+        return IRQ_HANDLED;
+}
+
+static int au1550_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
+{
+        struct au1550_spi *hw = spi_master_get_devdata(spi->master);
+        return hw->txrx_bufs(spi, t);
+}
+
+static irqreturn_t au1550_spi_irq(int irq, void *dev, struct pt_regs *regs)
+{
+        struct au1550_spi *hw = dev;
+        return hw->irq_callback(hw);
+}
+
+static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw)
+{
+        if (bpw <= 8) {
+                if (hw->usedma) {
+                        hw->txrx_bufs = &au1550_spi_dma_txrxb;
+                        hw->irq_callback = &au1550_spi_dma_irq_callback;
+                } else {
+                        hw->rx_word = &au1550_spi_rx_word_8;
+                        hw->tx_word = &au1550_spi_tx_word_8;
+                        hw->txrx_bufs = &au1550_spi_pio_txrxb;
+                        hw->irq_callback = &au1550_spi_pio_irq_callback;
+                }
+        } else if (bpw <= 16) {
+                hw->rx_word = &au1550_spi_rx_word_16;
+                hw->tx_word = &au1550_spi_tx_word_16;
+                hw->txrx_bufs = &au1550_spi_pio_txrxb;
+                hw->irq_callback = &au1550_spi_pio_irq_callback;
+        } else {
+                hw->rx_word = &au1550_spi_rx_word_32;
+                hw->tx_word = &au1550_spi_tx_word_32;
+                hw->txrx_bufs = &au1550_spi_pio_txrxb;
+                hw->irq_callback = &au1550_spi_pio_irq_callback;
+        }
+}
+
+static void __init au1550_spi_setup_psc_as_spi(struct au1550_spi *hw)
+{
+        u32 stat, cfg;
+
+        /* set up the PSC for SPI mode */
+        hw->regs->psc_ctrl = PSC_CTRL_DISABLE;
+        au_sync();
+        hw->regs->psc_sel = PSC_SEL_PS_SPIMODE;
+        au_sync();
+
+        hw->regs->psc_spicfg = 0;
+        au_sync();
+
+        hw->regs->psc_ctrl = PSC_CTRL_ENABLE;
+        au_sync();
+
+        do {
+                stat = hw->regs->psc_spistat;
+                au_sync();
+        } while ((stat & PSC_SPISTAT_SR) == 0);
+
+
+        cfg = hw->usedma ? 0 : PSC_SPICFG_DD_DISABLE;
+        cfg |= PSC_SPICFG_SET_LEN(8);
+        cfg |= PSC_SPICFG_RT_FIFO8 | PSC_SPICFG_TT_FIFO8;
+        /* use minimal allowed brg and div values as initial setting: */
+        cfg |= PSC_SPICFG_SET_BAUD(4) | PSC_SPICFG_SET_DIV(0);
+
+#ifdef AU1550_SPI_DEBUG_LOOPBACK
+        cfg |= PSC_SPICFG_LB;
+#endif
+
+        hw->regs->psc_spicfg = cfg;
+        au_sync();
+
+        au1550_spi_mask_ack_all(hw);
+
+        hw->regs->psc_spicfg |= PSC_SPICFG_DE_ENABLE;
+        au_sync();
+
+        do {
+                stat = hw->regs->psc_spistat;
+                au_sync();
+        } while ((stat & PSC_SPISTAT_DR) == 0);
+}
+
+
+static int __init au1550_spi_probe(struct platform_device *pdev)
+{
+        struct au1550_spi *hw;
+        struct spi_master *master;
+        int err = 0;
+
+        master = spi_alloc_master(&pdev->dev, sizeof(struct au1550_spi));
+        if (master == NULL) {
+                dev_err(&pdev->dev, "No memory for spi_master\n");
+                err = -ENOMEM;
+                goto err_nomem;
+        }
+
+        hw = spi_master_get_devdata(master);
+
+        hw->master = spi_master_get(master);
+        hw->pdata = pdev->dev.platform_data;
+        hw->dev = &pdev->dev;
+
+        if (hw->pdata == NULL) {
+                dev_err(&pdev->dev, "No platform data supplied\n");
+                err = -ENOENT;
+                goto err_no_pdata;
+        }
+
+        platform_set_drvdata(pdev, hw);
+
+        init_completion(&hw->master_done);
+
+        hw->bitbang.master = hw->master;
+        hw->bitbang.setup_transfer = au1550_spi_setupxfer;
+        hw->bitbang.chipselect = au1550_spi_chipsel;
+        hw->bitbang.master->setup = au1550_spi_setup;
+        hw->bitbang.txrx_bufs = au1550_spi_txrx_bufs;
+
+        switch (hw->pdata->bus_num) {
+        case 0:
+                hw->irq = AU1550_PSC0_INT;
+                hw->regs = (volatile psc_spi_t *)PSC0_BASE_ADDR;
+                hw->dma_rx_id = DSCR_CMD0_PSC0_RX;
+                hw->dma_tx_id = DSCR_CMD0_PSC0_TX;
+                break;
+        case 1:
+                hw->irq = AU1550_PSC1_INT;
+                hw->regs = (volatile psc_spi_t *)PSC1_BASE_ADDR;
+                hw->dma_rx_id = DSCR_CMD0_PSC1_RX;
+                hw->dma_tx_id = DSCR_CMD0_PSC1_TX;
+                break;
+        case 2:
+                hw->irq = AU1550_PSC2_INT;
+                hw->regs = (volatile psc_spi_t *)PSC2_BASE_ADDR;
+                hw->dma_rx_id = DSCR_CMD0_PSC2_RX;
+                hw->dma_tx_id = DSCR_CMD0_PSC2_TX;
+                break;
+        case 3:
+                hw->irq = AU1550_PSC3_INT;
+                hw->regs = (volatile psc_spi_t *)PSC3_BASE_ADDR;
+                hw->dma_rx_id = DSCR_CMD0_PSC3_RX;
+                hw->dma_tx_id = DSCR_CMD0_PSC3_TX;
+                break;
+        default:
+                dev_err(&pdev->dev, "Wrong bus_num of SPI\n");
+                err = -ENOENT;
+                goto err_no_pdata;
+        }
+
+        if (request_mem_region((unsigned long)hw->regs, sizeof(psc_spi_t),
+                        pdev->name) == NULL) {
+                dev_err(&pdev->dev, "Cannot reserve iomem region\n");
+                err = -ENXIO;
+                goto err_no_iores;
+        }
+
+
+        if (usedma) {
+                if (pdev->dev.dma_mask == NULL)
+                        dev_warn(&pdev->dev, "no dma mask\n");
+                else
+                        hw->usedma = 1;
+        }
+
+        if (hw->usedma) {
+                /*
+                 * create memory device with 8 bits dev_devwidth
+                 * needed for proper byte ordering to spi fifo
+                 */
+                int memid = au1xxx_ddma_add_device(&au1550_spi_mem_dbdev);
+                if (!memid) {
+                        dev_err(&pdev->dev,
+                                "Cannot create dma 8 bit mem device\n");
+                        err = -ENXIO;
+                        goto err_dma_add_dev;
+                }
+
+                hw->dma_tx_ch = au1xxx_dbdma_chan_alloc(memid,
+                        hw->dma_tx_id, NULL, (void *)hw);
+                if (hw->dma_tx_ch == 0) {
+                        dev_err(&pdev->dev,
+                                "Cannot allocate tx dma channel\n");
+                        err = -ENXIO;
+                        goto err_no_txdma;
+                }
+                au1xxx_dbdma_set_devwidth(hw->dma_tx_ch, 8);
+                if (au1xxx_dbdma_ring_alloc(hw->dma_tx_ch,
+                        AU1550_SPI_DBDMA_DESCRIPTORS) == 0) {
+                        dev_err(&pdev->dev,
+                                "Cannot allocate tx dma descriptors\n");
+                        err = -ENXIO;
+                        goto err_no_txdma_descr;
+                }
+
+
+                hw->dma_rx_ch = au1xxx_dbdma_chan_alloc(hw->dma_rx_id,
+                        memid, NULL, (void *)hw);
+                if (hw->dma_rx_ch == 0) {
+                        dev_err(&pdev->dev,
+                                "Cannot allocate rx dma channel\n");
+                        err = -ENXIO;
+                        goto err_no_rxdma;
+                }
+                au1xxx_dbdma_set_devwidth(hw->dma_rx_ch, 8);
+                if (au1xxx_dbdma_ring_alloc(hw->dma_rx_ch,
+                        AU1550_SPI_DBDMA_DESCRIPTORS) == 0) {
+                        dev_err(&pdev->dev,
+                                "Cannot allocate rx dma descriptors\n");
+                        err = -ENXIO;
+                        goto err_no_rxdma_descr;
+                }
+
+                err = au1550_spi_dma_rxtmp_alloc(hw,
+                        AU1550_SPI_DMA_RXTMP_MINSIZE);
+                if (err < 0) {
+                        dev_err(&pdev->dev,
+                                "Cannot allocate initial rx dma tmp buffer\n");
+                        goto err_dma_rxtmp_alloc;
+                }
+        }
+
+        au1550_spi_bits_handlers_set(hw, 8);
+
+        err = request_irq(hw->irq, au1550_spi_irq, 0, pdev->name, hw);
+        if (err) {
+                dev_err(&pdev->dev, "Cannot claim IRQ\n");
+                goto err_no_irq;
+        }
+
+        master->bus_num = hw->pdata->bus_num;
+        master->num_chipselect = hw->pdata->num_chipselect;
+
+        /*
+         *  precompute valid range for spi freq - from au1550 datasheet:
+         *    psc_tempclk = psc_mainclk / (2 << DIV)
+         *    spiclk = psc_tempclk / (2 * (BRG + 1))
+         *    BRG valid range is 4..63
+         *    DIV valid range is 0..3
+         *  round the min and max frequencies to values that would still
+         *  produce valid brg and div
+         */
+        {
+                int min_div = (2 << 0) * (2 * (4 + 1));
+                int max_div = (2 << 3) * (2 * (63 + 1));
+                hw->freq_max = hw->pdata->mainclk_hz / min_div;
+                hw->freq_min = hw->pdata->mainclk_hz / (max_div + 1) + 1;
+        }
+
+        au1550_spi_setup_psc_as_spi(hw);
+
+        err = spi_bitbang_start(&hw->bitbang);
+        if (err) {
+                dev_err(&pdev->dev, "Failed to register SPI master\n");
+                goto err_register;
+        }
+
+        dev_info(&pdev->dev,
+                "spi master registered: bus_num=%d num_chipselect=%d\n",
+                master->bus_num, master->num_chipselect);
+
+        return 0;
+
+err_register:
+        free_irq(hw->irq, hw);
+
+err_no_irq:
+        au1550_spi_dma_rxtmp_free(hw);
+
+err_dma_rxtmp_alloc:
+err_no_rxdma_descr:
+        if (hw->usedma)
+                au1xxx_dbdma_chan_free(hw->dma_rx_ch);
+
+err_no_rxdma:
+err_no_txdma_descr:
+        if (hw->usedma)
+                au1xxx_dbdma_chan_free(hw->dma_tx_ch);
+
+err_no_txdma:
+err_dma_add_dev:
+        release_mem_region((unsigned long)hw->regs, sizeof(psc_spi_t));
+
+err_no_iores:
+err_no_pdata:
+        spi_master_put(hw->master);
+
+err_nomem:
+        return err;
+}
+
+static int __exit au1550_spi_remove(struct platform_device *pdev)
+{
+        struct au1550_spi *hw = platform_get_drvdata(pdev);
+
+        dev_info(&pdev->dev, "spi master remove: bus_num=%d\n",
+                hw->master->bus_num);
+
+        spi_bitbang_stop(&hw->bitbang);
+        free_irq(hw->irq, hw);
+        release_mem_region((unsigned long)hw->regs, sizeof(psc_spi_t));
+
+        if (hw->usedma) {
+                au1550_spi_dma_rxtmp_free(hw);
+                au1xxx_dbdma_chan_free(hw->dma_rx_ch);
+                au1xxx_dbdma_chan_free(hw->dma_tx_ch);
+        }
+
+        platform_set_drvdata(pdev, NULL);
+
+        spi_master_put(hw->master);
+        return 0;
+}
+
+static struct platform_driver au1550_spi_drv = {
+        .remove = __exit_p(au1550_spi_remove),
+        .driver = {
+                .name = "au1550-spi",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init au1550_spi_init(void)
+{
+        return platform_driver_probe(&au1550_spi_drv, au1550_spi_probe);
+}
+module_init(au1550_spi_init);
+
+static void __exit au1550_spi_exit(void)
+{
+        platform_driver_unregister(&au1550_spi_drv);
+}
+module_exit(au1550_spi_exit);
+
+MODULE_DESCRIPTION("Au1550 PSC SPI Driver");
+MODULE_AUTHOR("Jan Nikitenko <jan.nikitenko@gmail.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
new file mode 100644
index 000000000000..052359fc41ee
--- /dev/null
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -0,0 +1,654 @@
+/*
+ * MPC52xx SPC in SPI mode driver.
+ *
+ * Maintainer: Dragos Carp
+ *
+ * Copyright (C) 2006 TOPTICA Photonics AG.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+
+#if defined(CONFIG_PPC_MERGE)
+#include <asm/of_platform.h>
+#else
+#include <linux/platform_device.h>
+#endif
+
+#include <linux/workqueue.h>
+#include <linux/completion.h>
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/spi/spi.h>
+#include <linux/fsl_devices.h>
+
+#include <asm/mpc52xx.h>
+#include <asm/mpc52xx_psc.h>
+
+#define MCLK 20000000 /* PSC port MClk in hz */
+
+struct mpc52xx_psc_spi {
+        /* fsl_spi_platform data */
+        void (*activate_cs)(u8, u8);
+        void (*deactivate_cs)(u8, u8);
+        u32 sysclk;
+
+        /* driver internal data */
+        struct mpc52xx_psc __iomem *psc;
+        unsigned int irq;
+        u8 bits_per_word;
+        u8 busy;
+
+        struct workqueue_struct *workqueue;
+        struct work_struct work;
+
+        struct list_head queue;
+        spinlock_t lock;
+
+        struct completion done;
+};
+
+/* controller state */
+struct mpc52xx_psc_spi_cs {
+        int bits_per_word;
+        int speed_hz;
+};
+
+/* set clock freq, clock ramp, bits per work
+ * if t is NULL then reset the values to the default values
+ */
+static int mpc52xx_psc_spi_transfer_setup(struct spi_device *spi,
+                struct spi_transfer *t)
+{
+        struct mpc52xx_psc_spi_cs *cs = spi->controller_state;
+
+        cs->speed_hz = (t && t->speed_hz)
+                        ? t->speed_hz : spi->max_speed_hz;
+        cs->bits_per_word = (t && t->bits_per_word)
+                        ? t->bits_per_word : spi->bits_per_word;
+        cs->bits_per_word = ((cs->bits_per_word + 7) / 8) * 8;
+        return 0;
+}
+
+static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
+{
+        struct mpc52xx_psc_spi_cs *cs = spi->controller_state;
+        struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
+        struct mpc52xx_psc __iomem *psc = mps->psc;
+        u32 sicr;
+        u16 ccr;
+
+        sicr = in_be32(&psc->sicr);
+
+        /* Set clock phase and polarity */
+        if (spi->mode & SPI_CPHA)
+                sicr |= 0x00001000;
+        else
+                sicr &= ~0x00001000;
+        if (spi->mode & SPI_CPOL)
+                sicr |= 0x00002000;
+        else
+                sicr &= ~0x00002000;
+
+        if (spi->mode & SPI_LSB_FIRST)
+                sicr |= 0x10000000;
+        else
+                sicr &= ~0x10000000;
+        out_be32(&psc->sicr, sicr);
+
+        /* Set clock frequency and bits per word
+         * Because psc->ccr is defined as 16bit register instead of 32bit
+         * just set the lower byte of BitClkDiv
+         */
+        ccr = in_be16(&psc->ccr);
+        ccr &= 0xFF00;
+        if (cs->speed_hz)
+                ccr |= (MCLK / cs->speed_hz - 1) & 0xFF;
+        else /* by default SPI Clk 1MHz */
+                ccr |= (MCLK / 1000000 - 1) & 0xFF;
+        out_be16(&psc->ccr, ccr);
+        mps->bits_per_word = cs->bits_per_word;
+
+        if (mps->activate_cs)
+                mps->activate_cs(spi->chip_select,
+                                (spi->mode & SPI_CS_HIGH) ? 1 : 0);
+}
+
+static void mpc52xx_psc_spi_deactivate_cs(struct spi_device *spi)
+{
+        struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
+
+        if (mps->deactivate_cs)
+                mps->deactivate_cs(spi->chip_select,
+                                (spi->mode & SPI_CS_HIGH) ? 1 : 0);
+}
+
+#define MPC52xx_PSC_BUFSIZE (MPC52xx_PSC_RFNUM_MASK + 1)
+/* wake up when 80% fifo full */
+#define MPC52xx_PSC_RFALARM (MPC52xx_PSC_BUFSIZE * 20 / 100)
+
+static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
+                                                struct spi_transfer *t)
+{
+        struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
+        struct mpc52xx_psc __iomem *psc = mps->psc;
+        unsigned rb = 0;        /* number of bytes receieved */
+        unsigned sb = 0;        /* number of bytes sent */
+        unsigned char *rx_buf = (unsigned char *)t->rx_buf;
+        unsigned char *tx_buf = (unsigned char *)t->tx_buf;
+        unsigned rfalarm;
+        unsigned send_at_once = MPC52xx_PSC_BUFSIZE;
+        unsigned recv_at_once;
+        unsigned bpw = mps->bits_per_word / 8;
+
+        if (!t->tx_buf && !t->rx_buf && t->len)
+                return -EINVAL;
+
+        /* enable transmiter/receiver */
+        out_8(&psc->command, MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE);
+        while (rb < t->len) {
+                if (t->len - rb > MPC52xx_PSC_BUFSIZE) {
+                        rfalarm = MPC52xx_PSC_RFALARM;
+                } else {
+                        send_at_once = t->len - sb;
+                        rfalarm = MPC52xx_PSC_BUFSIZE - (t->len - rb);
+                }
+
+                dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once);
+                if (tx_buf) {
+                        for (; send_at_once; sb++, send_at_once--) {
+                                /* set EOF flag */
+                                if (mps->bits_per_word
+                                                && (sb + 1) % bpw == 0)
+                                        out_8(&psc->ircr2, 0x01);
+                                out_8(&psc->mpc52xx_psc_buffer_8, tx_buf[sb]);
+                        }
+                } else {
+                        for (; send_at_once; sb++, send_at_once--) {
+                                /* set EOF flag */
+                                if (mps->bits_per_word
+                                                && ((sb + 1) % bpw) == 0)
+                                        out_8(&psc->ircr2, 0x01);
+                                out_8(&psc->mpc52xx_psc_buffer_8, 0);
+                        }
+                }
+
+
+                /* enable interupts and wait for wake up
+                 * if just one byte is expected the Rx FIFO genererates no
+                 * FFULL interrupt, so activate the RxRDY interrupt
+                 */
+                out_8(&psc->command, MPC52xx_PSC_SEL_MODE_REG_1);
+                if (t->len - rb == 1) {
+                        out_8(&psc->mode, 0);
+                } else {
+                        out_8(&psc->mode, MPC52xx_PSC_MODE_FFULL);
+                        out_be16(&psc->rfalarm, rfalarm);
+                }
+                out_be16(&psc->mpc52xx_psc_imr, MPC52xx_PSC_IMR_RXRDY);
+                wait_for_completion(&mps->done);
+                recv_at_once = in_be16(&psc->rfnum);
+                dev_dbg(&spi->dev, "%d bytes received\n", recv_at_once);
+
+                send_at_once = recv_at_once;
+                if (rx_buf) {
+                        for (; recv_at_once; rb++, recv_at_once--)
+                                rx_buf[rb] = in_8(&psc->mpc52xx_psc_buffer_8);
+                } else {
+                        for (; recv_at_once; rb++, recv_at_once--)
+                                in_8(&psc->mpc52xx_psc_buffer_8);
+                }
+        }
+        /* disable transmiter/receiver */
+        out_8(&psc->command, MPC52xx_PSC_TX_DISABLE | MPC52xx_PSC_RX_DISABLE);
+
+        return 0;
+}
+
+static void mpc52xx_psc_spi_work(struct work_struct *work)
+{
+        struct mpc52xx_psc_spi *mps =
+                container_of(work, struct mpc52xx_psc_spi, work);
+
+        spin_lock_irq(&mps->lock);
+        mps->busy = 1;
+        while (!list_empty(&mps->queue)) {
+                struct spi_message *m;
+                struct spi_device *spi;
+                struct spi_transfer *t = NULL;
+                unsigned cs_change;
+                int status;
+
+                m = container_of(mps->queue.next, struct spi_message, queue);
+                list_del_init(&m->queue);
+                spin_unlock_irq(&mps->lock);
+
+                spi = m->spi;
+                cs_change = 1;
+                status = 0;
+                list_for_each_entry (t, &m->transfers, transfer_list) {
+                        if (t->bits_per_word || t->speed_hz) {
+                                status = mpc52xx_psc_spi_transfer_setup(spi, t);
+                                if (status < 0)
+                                        break;
+                        }
+
+                        if (cs_change)
+                                mpc52xx_psc_spi_activate_cs(spi);
+                        cs_change = t->cs_change;
+
+                        status = mpc52xx_psc_spi_transfer_rxtx(spi, t);
+                        if (status)
+                                break;
+                        m->actual_length += t->len;
+
+                        if (t->delay_usecs)
+                                udelay(t->delay_usecs);
+
+                        if (cs_change)
+                                mpc52xx_psc_spi_deactivate_cs(spi);
+                }
+
+                m->status = status;
+                m->complete(m->context);
+
+                if (status || !cs_change)
+                        mpc52xx_psc_spi_deactivate_cs(spi);
+
+                mpc52xx_psc_spi_transfer_setup(spi, NULL);
+
+                spin_lock_irq(&mps->lock);
+        }
+        mps->busy = 0;
+        spin_unlock_irq(&mps->lock);
+}
+
+static int mpc52xx_psc_spi_setup(struct spi_device *spi)
+{
+        struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
+        struct mpc52xx_psc_spi_cs *cs = spi->controller_state;
+        unsigned long flags;
+
+        if (spi->bits_per_word%8)
+                return -EINVAL;
+
+        if (!cs) {
+                cs = kzalloc(sizeof *cs, GFP_KERNEL);
+                if (!cs)
+                        return -ENOMEM;
+                spi->controller_state = cs;
+        }
+
+        cs->bits_per_word = spi->bits_per_word;
+        cs->speed_hz = spi->max_speed_hz;
+
+        spin_lock_irqsave(&mps->lock, flags);
+        if (!mps->busy)
+                mpc52xx_psc_spi_deactivate_cs(spi);
+        spin_unlock_irqrestore(&mps->lock, flags);
+
+        return 0;
+}
+
+static int mpc52xx_psc_spi_transfer(struct spi_device *spi,
+                struct spi_message *m)
+{
+        struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
+        unsigned long flags;
+
+        m->actual_length = 0;
+        m->status = -EINPROGRESS;
+
+        spin_lock_irqsave(&mps->lock, flags);
+        list_add_tail(&m->queue, &mps->queue);
+        queue_work(mps->workqueue, &mps->work);
+        spin_unlock_irqrestore(&mps->lock, flags);
+
+        return 0;
+}
+
+static void mpc52xx_psc_spi_cleanup(struct spi_device *spi)
+{
+        kfree(spi->controller_state);
+}
+
+static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
+{
+        struct mpc52xx_cdm __iomem *cdm;
+        struct mpc52xx_gpio __iomem *gpio;
+        struct mpc52xx_psc __iomem *psc = mps->psc;
+        u32 ul;
+        u32 mclken_div;
+        int ret = 0;
+
+#if defined(CONFIG_PPC_MERGE)
+        cdm = mpc52xx_find_and_map("mpc52xx-cdm");
+        gpio = mpc52xx_find_and_map("mpc52xx-gpio");
+#else
+        cdm = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
+        gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);
+#endif
+        if (!cdm || !gpio) {
+                printk(KERN_ERR "Error mapping CDM/GPIO\n");
+                ret = -EFAULT;
+                goto unmap_regs;
+        }
+
+        /* default sysclk is 512MHz */
+        mclken_div = 0x8000 |
+                (((mps->sysclk ? mps->sysclk : 512000000) / MCLK) & 0x1FF);
+
+        switch (psc_id) {
+        case 1:
+                ul = in_be32(&gpio->port_config);
+                ul &= 0xFFFFFFF8;
+                ul |= 0x00000006;
+                out_be32(&gpio->port_config, ul);
+                out_be16(&cdm->mclken_div_psc1, mclken_div);
+                ul = in_be32(&cdm->clk_enables);
+                ul |= 0x00000020;
+                out_be32(&cdm->clk_enables, ul);
+                break;
+        case 2:
+                ul = in_be32(&gpio->port_config);
+                ul &= 0xFFFFFF8F;
+                ul |= 0x00000060;
+                out_be32(&gpio->port_config, ul);
+                out_be16(&cdm->mclken_div_psc2, mclken_div);
+                ul = in_be32(&cdm->clk_enables);
+                ul |= 0x00000040;
+                out_be32(&cdm->clk_enables, ul);
+                break;
+        case 3:
+                ul = in_be32(&gpio->port_config);
+                ul &= 0xFFFFF0FF;
+                ul |= 0x00000600;
+                out_be32(&gpio->port_config, ul);
+                out_be16(&cdm->mclken_div_psc3, mclken_div);
+                ul = in_be32(&cdm->clk_enables);
+                ul |= 0x00000080;
+                out_be32(&cdm->clk_enables, ul);
+                break;
+        case 6:
+                ul = in_be32(&gpio->port_config);
+                ul &= 0xFF8FFFFF;
+                ul |= 0x00700000;
+                out_be32(&gpio->port_config, ul);
+                out_be16(&cdm->mclken_div_psc6, mclken_div);
+                ul = in_be32(&cdm->clk_enables);
+                ul |= 0x00000010;
+                out_be32(&cdm->clk_enables, ul);
+                break;
+        default:
+                ret = -EINVAL;
+                goto unmap_regs;
+        }
+
+        /* Reset the PSC into a known state */
+        out_8(&psc->command, MPC52xx_PSC_RST_RX);
+        out_8(&psc->command, MPC52xx_PSC_RST_TX);
+        out_8(&psc->command, MPC52xx_PSC_TX_DISABLE | MPC52xx_PSC_RX_DISABLE);
+
+        /* Disable interrupts, interrupts are based on alarm level */
+        out_be16(&psc->mpc52xx_psc_imr, 0);
+        out_8(&psc->command, MPC52xx_PSC_SEL_MODE_REG_1);
+        out_8(&psc->rfcntl, 0);
+        out_8(&psc->mode, MPC52xx_PSC_MODE_FFULL);
+
+        /* Configure 8bit codec mode as a SPI master and use EOF flags */
+        /* SICR_SIM_CODEC8|SICR_GENCLK|SICR_SPI|SICR_MSTR|SICR_USEEOF */
+        out_be32(&psc->sicr, 0x0180C800);
+        out_be16(&psc->ccr, 0x070F); /* by default SPI Clk 1MHz */
+
+        /* Set 2ms DTL delay */
+        out_8(&psc->ctur, 0x00);
+        out_8(&psc->ctlr, 0x84);
+
+        mps->bits_per_word = 8;
+
+unmap_regs:
+        if (cdm)
+                iounmap(cdm);
+        if (gpio)
+                iounmap(gpio);
+
+        return ret;
+}
+
+static irqreturn_t mpc52xx_psc_spi_isr(int irq, void *dev_id)
+{
+        struct mpc52xx_psc_spi *mps = (struct mpc52xx_psc_spi *)dev_id;
+        struct mpc52xx_psc __iomem *psc = mps->psc;
+
+        /* disable interrupt and wake up the work queue */
+        if (in_be16(&psc->mpc52xx_psc_isr) & MPC52xx_PSC_IMR_RXRDY) {
+                out_be16(&psc->mpc52xx_psc_imr, 0);
+                complete(&mps->done);
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+}
+
+/* bus_num is used only for the case dev->platform_data == NULL */
+static int __init mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
+                                u32 size, unsigned int irq, s16 bus_num)
+{
+        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct mpc52xx_psc_spi *mps;
+        struct spi_master *master;
+        int ret;
+
+        if (pdata == NULL)
+                return -ENODEV;
+
+        master = spi_alloc_master(dev, sizeof *mps);
+        if (master == NULL)
+                return -ENOMEM;
+
+        dev_set_drvdata(dev, master);
+        mps = spi_master_get_devdata(master);
+
+        mps->irq = irq;
+        if (pdata == NULL) {
+                dev_warn(dev, "probe called without platform data, no "
+                                "(de)activate_cs function will be called\n");
+                mps->activate_cs = NULL;
+                mps->deactivate_cs = NULL;
+                mps->sysclk = 0;
+                master->bus_num = bus_num;
+                master->num_chipselect = 255;
+        } else {
+                mps->activate_cs = pdata->activate_cs;
+                mps->deactivate_cs = pdata->deactivate_cs;
+                mps->sysclk = pdata->sysclk;
+                master->bus_num = pdata->bus_num;
+                master->num_chipselect = pdata->max_chipselect;
+        }
+        master->setup = mpc52xx_psc_spi_setup;
+        master->transfer = mpc52xx_psc_spi_transfer;
+        master->cleanup = mpc52xx_psc_spi_cleanup;
+
+        mps->psc = ioremap(regaddr, size);
+        if (!mps->psc) {
+                dev_err(dev, "could not ioremap I/O port range\n");
+                ret = -EFAULT;
+                goto free_master;
+        }
+
+        ret = request_irq(mps->irq, mpc52xx_psc_spi_isr, 0, "mpc52xx-psc-spi",
+                                mps);
+        if (ret)
+                goto free_master;
+
+        ret = mpc52xx_psc_spi_port_config(master->bus_num, mps);
+        if (ret < 0)
+                goto free_irq;
+
+        spin_lock_init(&mps->lock);
+        init_completion(&mps->done);
+        INIT_WORK(&mps->work, mpc52xx_psc_spi_work);
+        INIT_LIST_HEAD(&mps->queue);
+
+        mps->workqueue = create_singlethread_workqueue(
+                master->cdev.dev->bus_id);
+        if (mps->workqueue == NULL) {
+                ret = -EBUSY;
+                goto free_irq;
+        }
+
+        ret = spi_register_master(master);
+        if (ret < 0)
+                goto unreg_master;
+
+        return ret;
+
+unreg_master:
+        destroy_workqueue(mps->workqueue);
+free_irq:
+        free_irq(mps->irq, mps);
+free_master:
+        if (mps->psc)
+                iounmap(mps->psc);
+        spi_master_put(master);
+
+        return ret;
+}
+
+static int __exit mpc52xx_psc_spi_do_remove(struct device *dev)
+{
+        struct spi_master *master = dev_get_drvdata(dev);
+        struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master);
+
+        flush_workqueue(mps->workqueue);
+        destroy_workqueue(mps->workqueue);
+        spi_unregister_master(master);
+        free_irq(mps->irq, mps);
+        if (mps->psc)
+                iounmap(mps->psc);
+
+        return 0;
+}
+
+#if !defined(CONFIG_PPC_MERGE)
+static int __init mpc52xx_psc_spi_probe(struct platform_device *dev)
+{
+        switch(dev->id) {
+        case 1:
+        case 2:
+        case 3:
+        case 6:
+                return mpc52xx_psc_spi_do_probe(&dev->dev,
+                        MPC52xx_PA(MPC52xx_PSCx_OFFSET(dev->id)),
+                        MPC52xx_PSC_SIZE, platform_get_irq(dev, 0), dev->id);
+        default:
+                return -EINVAL;
+        }
+}
+
+static int __exit mpc52xx_psc_spi_remove(struct platform_device *dev)
+{
+        return mpc52xx_psc_spi_do_remove(&dev->dev);
+}
+
+static struct platform_driver mpc52xx_psc_spi_platform_driver = {
+        .remove = __exit_p(mpc52xx_psc_spi_remove),
+        .driver = {
+                .name = "mpc52xx-psc-spi",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init mpc52xx_psc_spi_init(void)
+{
+        return platform_driver_probe(&mpc52xx_psc_spi_platform_driver,
+                        mpc52xx_psc_spi_probe);
+}
+module_init(mpc52xx_psc_spi_init);
+
+static void __exit mpc52xx_psc_spi_exit(void)
+{
+        platform_driver_unregister(&mpc52xx_psc_spi_platform_driver);
+}
+module_exit(mpc52xx_psc_spi_exit);
+
+#else   /* defined(CONFIG_PPC_MERGE) */
+
+static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,
+        const struct of_device_id *match)
+{
+        const u32 *regaddr_p;
+        u64 regaddr64, size64;
+        s16 id = -1;
+
+        regaddr_p = of_get_address(op->node, 0, &size64, NULL);
+        if (!regaddr_p) {
+                printk(KERN_ERR "Invalid PSC address\n");
+                return -EINVAL;
+        }
+        regaddr64 = of_translate_address(op->node, regaddr_p);
+
+        if (op->dev.platform_data == NULL) {
+                struct device_node *np;
+                int i = 0;
+
+                for_each_node_by_type(np, "spi") {
+                        if (of_find_device_by_node(np) == op) {
+                                id = i;
+                                break;
+                        }
+                        i++;
+                }
+        }
+
+        return mpc52xx_psc_spi_do_probe(&op->dev, (u32)regaddr64, (u32)size64,
+                                        irq_of_parse_and_map(op->node, 0), id);
+}
+
+static int __exit mpc52xx_psc_spi_of_remove(struct of_device *op)
+{
+        return mpc52xx_psc_spi_do_remove(&op->dev);
+}
+
+static struct of_device_id mpc52xx_psc_spi_of_match[] = {
+        { .type = "spi", .compatible = "mpc52xx-psc-spi", },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
+
+static struct of_platform_driver mpc52xx_psc_spi_of_driver = {
+        .owner = THIS_MODULE,
+        .name = "mpc52xx-psc-spi",
+        .match_table = mpc52xx_psc_spi_of_match,
+        .probe = mpc52xx_psc_spi_of_probe,
+        .remove = __exit_p(mpc52xx_psc_spi_of_remove),
+        .driver = {
+                .name = "mpc52xx-psc-spi",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init mpc52xx_psc_spi_init(void)
+{
+        return of_register_platform_driver(&mpc52xx_psc_spi_of_driver);
+}
+module_init(mpc52xx_psc_spi_init);
+
+static void __exit mpc52xx_psc_spi_exit(void)
+{
+        of_unregister_platform_driver(&mpc52xx_psc_spi_of_driver);
+}
+module_exit(mpc52xx_psc_spi_exit);
+
+#endif  /* defined(CONFIG_PPC_MERGE) */
+
+MODULE_AUTHOR("Dragos Carp");
+MODULE_DESCRIPTION("MPC52xx PSC SPI Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 6657331eed93..c3219b29b5ac 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -152,6 +152,11 @@ static void spi_drv_shutdown(struct device *dev)
         sdrv->shutdown(to_spi_device(dev));
 }
 
+/**
+ * spi_register_driver - register a SPI driver
+ * @sdrv: the driver to register
+ * Context: can sleep
+ */
 int spi_register_driver(struct spi_driver *sdrv)
 {
         sdrv->driver.bus = &spi_bus_type;
@@ -183,7 +188,13 @@ static LIST_HEAD(board_list);
 static DECLARE_MUTEX(board_lock);
 
 
-/* On typical mainboards, this is purely internal; and it's not needed
+/**
+ * spi_new_device - instantiate one new SPI device
+ * @master: Controller to which device is connected
+ * @chip: Describes the SPI device
+ * Context: can sleep
+ *
+ * On typical mainboards, this is purely internal; and it's not needed
  * after board init creates the hard-wired devices.  Some development
  * platforms may not be able to use spi_register_board_info though, and
  * this is exported so that for example a USB or parport based adapter
@@ -251,7 +262,12 @@ fail:
 }
 EXPORT_SYMBOL_GPL(spi_new_device);
 
-/*
+/**
+ * spi_register_board_info - register SPI devices for a given board
+ * @info: array of chip descriptors
+ * @n: how many descriptors are provided
+ * Context: can sleep
+ *
  * Board-specific early init code calls this (probably during arch_initcall)
  * with segments of the SPI device table.  Any device nodes are created later,
  * after the relevant parent SPI controller (bus_num) is defined.  We keep
@@ -337,9 +353,10 @@ static struct class spi_master_class = {
 /**
  * spi_alloc_master - allocate SPI master controller
  * @dev: the controller, possibly using the platform_bus
- * @size: how much driver-private data to preallocate; the pointer to this
+ * @size: how much zeroed driver-private data to allocate; the pointer to this
  *      memory is in the class_data field of the returned class_device,
  *      accessible with spi_master_get_devdata().
+ * Context: can sleep
  *
  * This call is used only by SPI master controller drivers, which are the
  * only ones directly touching chip registers.  It's how they allocate
@@ -375,6 +392,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master);
 /**
  * spi_register_master - register SPI master controller
  * @master: initialized master, originally from spi_alloc_master()
+ * Context: can sleep
  *
  * SPI master controllers connect to their drivers using some non-SPI bus,
  * such as the platform bus.  The final stage of probe() in that code
@@ -437,6 +455,7 @@ static int __unregister(struct device *dev, void *unused)
 /**
  * spi_unregister_master - unregister SPI master controller
  * @master: the master being unregistered
+ * Context: can sleep
  *
  * This call is used only by SPI master controller drivers, which are the
  * only ones directly touching chip registers.
@@ -455,6 +474,7 @@ EXPORT_SYMBOL_GPL(spi_unregister_master);
 /**
  * spi_busnum_to_master - look up master associated with bus_num
  * @bus_num: the master's bus number
+ * Context: can sleep
  *
  * This call may be used with devices that are registered after
  * arch init time.  It returns a refcounted pointer to the relevant
@@ -492,6 +512,7 @@ static void spi_complete(void *arg)
  * spi_sync - blocking/synchronous SPI data transfers
  * @spi: device with which data will be exchanged
  * @message: describes the data transfers
+ * Context: can sleep
  *
  * This call may only be used from a context that may sleep.  The sleep
  * is non-interruptible, and has no timeout.  Low-overhead controller
@@ -508,7 +529,7 @@ static void spi_complete(void *arg)
  *
  * The return value is a negative error code if the message could not be
  * submitted, else zero.  When the value is zero, then message->status is
- * also defined:  it's the completion code for the transfer, either zero
+ * also defined;  it's the completion code for the transfer, either zero
  * or a negative error code from the controller driver.
  */
 int spi_sync(struct spi_device *spi, struct spi_message *message)
@@ -538,6 +559,7 @@ static u8	*buf;
  * @n_tx: size of txbuf, in bytes
  * @rxbuf: buffer into which data will be read
  * @n_rx: size of rxbuf, in bytes (need not be dma-safe)
+ * Context: can sleep
  *
  * This performs a half duplex MicroWire style transaction with the
  * device, sending txbuf and then reading rxbuf.  The return value
@@ -545,7 +567,8 @@ static u8	*buf;
  * This call may only be used from a context that may sleep.
  *
  * Parameters to this routine are always copied using a small buffer;
- * performance-sensitive or bulk transfer code should instead use
+ * portable code should never use this for more than 32 bytes.
+ * Performance-sensitive or bulk transfer code should instead use
  * spi_{async,sync}() calls with dma-safe buffers.
  */
 int spi_write_then_read(struct spi_device *spi,
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index ce3c0ce2316e..7d2d9ec6cac3 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -126,7 +126,7 @@ struct chip_data {
 
         u8 chip_select_num;
         u8 n_bytes;
-        u32 width;              /* 0 or 1 */
+        u8 width;               /* 0 or 1 */
         u8 enable_dma;
         u8 bits_per_word;       /* 8 or 16 */
         u8 cs_change_per_word;
@@ -136,7 +136,7 @@ struct chip_data {
         void (*duplex) (struct driver_data *);
 };
 
-void bfin_spi_enable(struct driver_data *drv_data)
+static void bfin_spi_enable(struct driver_data *drv_data)
 {
         u16 cr;
 
@@ -145,7 +145,7 @@ void bfin_spi_enable(struct driver_data *drv_data)
         SSYNC();
 }
 
-void bfin_spi_disable(struct driver_data *drv_data)
+static void bfin_spi_disable(struct driver_data *drv_data)
 {
         u16 cr;
 
@@ -163,9 +163,6 @@ static u16 hz_to_spi_baud(u32 speed_hz)
         if ((sclk % (2 * speed_hz)) > 0)
                 spi_baud++;
 
-        pr_debug("sclk = %ld, speed_hz = %d, spi_baud = %d\n", sclk, speed_hz,
-                 spi_baud);
-
         return spi_baud;
 }
 
@@ -190,11 +187,12 @@ static void restore_state(struct driver_data *drv_data)
         /* Clear status and disable clock */
         write_STAT(BIT_STAT_CLR);
         bfin_spi_disable(drv_data);
-        pr_debug("restoring spi ctl state\n");
+        dev_dbg(&drv_data->pdev->dev, "restoring spi ctl state\n");
 
 #if defined(CONFIG_BF534) || defined(CONFIG_BF536) || defined(CONFIG_BF537)
-        pr_debug("chip select number is %d\n", chip->chip_select_num);
-
+        dev_dbg(&drv_data->pdev->dev, 
+                "chip select number is %d\n", chip->chip_select_num);
+        
         switch (chip->chip_select_num) {
         case 1:
                 bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3c00);
@@ -280,7 +278,8 @@ static void null_reader(struct driver_data *drv_data)
 
 static void u8_writer(struct driver_data *drv_data)
 {
-        pr_debug("cr8-s is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev, 
+                "cr8-s is 0x%x\n", read_STAT());
         while (drv_data->tx < drv_data->tx_end) {
                 write_TDBR(*(u8 *) (drv_data->tx));
                 while (read_STAT() & BIT_STAT_TXS)
@@ -318,7 +317,8 @@ static void u8_cs_chg_writer(struct driver_data *drv_data)
 
 static void u8_reader(struct driver_data *drv_data)
 {
-        pr_debug("cr-8 is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev, 
+                "cr-8 is 0x%x\n", read_STAT());
 
         /* clear TDBR buffer before read(else it will be shifted out) */
         write_TDBR(0xFFFF);
@@ -404,7 +404,9 @@ static void u8_cs_chg_duplex(struct driver_data *drv_data)
 
 static void u16_writer(struct driver_data *drv_data)
 {
-        pr_debug("cr16 is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev, 
+                "cr16 is 0x%x\n", read_STAT());
+
         while (drv_data->tx < drv_data->tx_end) {
                 write_TDBR(*(u16 *) (drv_data->tx));
                 while ((read_STAT() & BIT_STAT_TXS))
@@ -442,7 +444,8 @@ static void u16_cs_chg_writer(struct driver_data *drv_data)
 
 static void u16_reader(struct driver_data *drv_data)
 {
-        pr_debug("cr-16 is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev,
+                "cr-16 is 0x%x\n", read_STAT());
         dummy_read();
 
         while (drv_data->rx < (drv_data->rx_end - 2)) {
@@ -571,12 +574,12 @@ static void giveback(struct driver_data *drv_data)
                 msg->complete(msg->context);
 }
 
-static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t dma_irq_handler(int irq, void *dev_id)
 {
         struct driver_data *drv_data = (struct driver_data *)dev_id;
         struct spi_message *msg = drv_data->cur_msg;
 
-        pr_debug("in dma_irq_handler\n");
+        dev_dbg(&drv_data->pdev->dev, "in dma_irq_handler\n");
         clear_dma_irqstat(CH_SPI);
 
         /*
@@ -604,7 +607,9 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
         tasklet_schedule(&drv_data->pump_transfers);
 
         /* free the irq handler before next transfer */
-        pr_debug("disable dma channel irq%d\n", CH_SPI);
+        dev_dbg(&drv_data->pdev->dev,
+                "disable dma channel irq%d\n",
+                CH_SPI);
         dma_disable_irq(CH_SPI);
 
         return IRQ_HANDLED;
@@ -617,7 +622,8 @@ static void pump_transfers(unsigned long data)
         struct spi_transfer *transfer = NULL;
         struct spi_transfer *previous = NULL;
         struct chip_data *chip = NULL;
-        u16 cr, width, dma_width, dma_config;
+        u8 width;
+        u16 cr, dma_width, dma_config;
         u32 tranf_success = 1;
 
         /* Get current state information */
@@ -662,8 +668,8 @@ static void pump_transfers(unsigned long data)
         if (transfer->tx_buf != NULL) {
                 drv_data->tx = (void *)transfer->tx_buf;
                 drv_data->tx_end = drv_data->tx + transfer->len;
-                pr_debug("tx_buf is %p, tx_end is %p\n", transfer->tx_buf,
-                         drv_data->tx_end);
+                dev_dbg(&drv_data->pdev->dev, "tx_buf is %p, tx_end is %p\n",
+                        transfer->tx_buf, drv_data->tx_end);
         } else {
                 drv_data->tx = NULL;
         }
@@ -671,8 +677,8 @@ static void pump_transfers(unsigned long data)
         if (transfer->rx_buf != NULL) {
                 drv_data->rx = transfer->rx_buf;
                 drv_data->rx_end = drv_data->rx + transfer->len;
-                pr_debug("rx_buf is %p, rx_end is %p\n", transfer->rx_buf,
-                         drv_data->rx_end);
+                dev_dbg(&drv_data->pdev->dev, "rx_buf is %p, rx_end is %p\n",
+                        transfer->rx_buf, drv_data->rx_end);
         } else {
                 drv_data->rx = NULL;
         }
@@ -690,9 +696,9 @@ static void pump_transfers(unsigned long data)
         drv_data->write = drv_data->tx ? chip->write : null_writer;
         drv_data->read = drv_data->rx ? chip->read : null_reader;
         drv_data->duplex = chip->duplex ? chip->duplex : null_writer;
-        pr_debug
-            ("transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
-             drv_data->write, chip->write, null_writer);
+        dev_dbg(&drv_data->pdev->dev,
+                "transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
+                drv_data->write, chip->write, null_writer);
 
         /* speed and width has been set on per message */
         message->state = RUNNING_STATE;
@@ -706,8 +712,9 @@ static void pump_transfers(unsigned long data)
         }
         write_FLAG(chip->flag);
 
-        pr_debug("now pumping a transfer: width is %d, len is %d\n", width,
-                 transfer->len);
+        dev_dbg(&drv_data->pdev->dev,
+                "now pumping a transfer: width is %d, len is %d\n",
+                width, transfer->len);
 
         /*
          * Try to map dma buffer and do a dma transfer if
@@ -722,7 +729,7 @@ static void pump_transfers(unsigned long data)
                 bfin_spi_disable(drv_data);
 
                 /* config dma channel */
-                pr_debug("doing dma transfer\n");
+                dev_dbg(&drv_data->pdev->dev, "doing dma transfer\n");
                 if (width == CFG_SPI_WORDSIZE16) {
                         set_dma_x_count(CH_SPI, drv_data->len);
                         set_dma_x_modify(CH_SPI, 2);
@@ -738,7 +745,8 @@ static void pump_transfers(unsigned long data)
 
                 /* dirty hack for autobuffer DMA mode */
                 if (drv_data->tx_dma == 0xFFFF) {
-                        pr_debug("doing autobuffer DMA out.\n");
+                        dev_dbg(&drv_data->pdev->dev,
+                                "doing autobuffer DMA out.\n");
 
                         /* no irq in autobuffer mode */
                         dma_config =
@@ -758,7 +766,7 @@ static void pump_transfers(unsigned long data)
                 /* In dma mode, rx or tx must be NULL in one transfer */
                 if (drv_data->rx != NULL) {
                         /* set transfer mode, and enable SPI */
-                        pr_debug("doing DMA in.\n");
+                        dev_dbg(&drv_data->pdev->dev, "doing DMA in.\n");
 
                         /* disable SPI before write to TDBR */
                         write_CTRL(cr & ~BIT_CTL_ENABLE);
@@ -781,7 +789,7 @@ static void pump_transfers(unsigned long data)
                         /* set transfer mode, and enable SPI */
                         write_CTRL(cr);
                 } else if (drv_data->tx != NULL) {
-                        pr_debug("doing DMA out.\n");
+                        dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
 
                         /* start dma */
                         dma_enable_irq(CH_SPI);
@@ -796,7 +804,7 @@ static void pump_transfers(unsigned long data)
                 }
         } else {
                 /* IO mode write then read */
-                pr_debug("doing IO transfer\n");
+                dev_dbg(&drv_data->pdev->dev, "doing IO transfer\n");
 
                 write_STAT(BIT_STAT_CLR);
 
@@ -804,11 +812,11 @@ static void pump_transfers(unsigned long data)
                         /* full duplex mode */
                         BUG_ON((drv_data->tx_end - drv_data->tx) !=
                                (drv_data->rx_end - drv_data->rx));
-                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  /* clear the TIMOD bits */
-                        cr |=
-                            CFG_SPI_WRITE | (width << 8) | (CFG_SPI_ENABLE <<
-                                                            14);
-                        pr_debug("IO duplex: cr is 0x%x\n", cr);
+                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  
+                        cr |= CFG_SPI_WRITE | (width << 8) |
+                                (CFG_SPI_ENABLE << 14);
+                        dev_dbg(&drv_data->pdev->dev,
+                                "IO duplex: cr is 0x%x\n", cr);
 
                         write_CTRL(cr);
                         SSYNC();
@@ -819,11 +827,11 @@ static void pump_transfers(unsigned long data)
                                 tranf_success = 0;
                 } else if (drv_data->tx != NULL) {
                         /* write only half duplex */
-                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  /* clear the TIMOD bits */
-                        cr |=
-                            CFG_SPI_WRITE | (width << 8) | (CFG_SPI_ENABLE <<
-                                                            14);
-                        pr_debug("IO write: cr is 0x%x\n", cr);
+                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));
+                        cr |= CFG_SPI_WRITE | (width << 8) |
+                                (CFG_SPI_ENABLE << 14);
+                        dev_dbg(&drv_data->pdev->dev, 
+                                "IO write: cr is 0x%x\n", cr);
 
                         write_CTRL(cr);
                         SSYNC();
@@ -834,11 +842,11 @@ static void pump_transfers(unsigned long data)
                                 tranf_success = 0;
                 } else if (drv_data->rx != NULL) {
                         /* read only half duplex */
-                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  /* cleare the TIMOD bits */
-                        cr |=
-                            CFG_SPI_READ | (width << 8) | (CFG_SPI_ENABLE <<
-                                                           14);
-                        pr_debug("IO read: cr is 0x%x\n", cr);
+                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));
+                        cr |= CFG_SPI_READ | (width << 8) |
+                                (CFG_SPI_ENABLE << 14);
+                        dev_dbg(&drv_data->pdev->dev, 
+                                "IO read: cr is 0x%x\n", cr);
 
                         write_CTRL(cr);
                         SSYNC();
@@ -849,7 +857,8 @@ static void pump_transfers(unsigned long data)
                 }
 
                 if (!tranf_success) {
-                        pr_debug("IO write error!\n");
+                        dev_dbg(&drv_data->pdev->dev, 
+                                "IO write error!\n");
                         message->state = ERROR_STATE;
                 } else {
                         /* Update total byte transfered */
@@ -899,11 +908,14 @@ static void pump_messages(struct work_struct *work)
         /* Setup the SSP using the per chip configuration */
         drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
         restore_state(drv_data);
-        pr_debug
-            ("got a message to pump, state is set to: baud %d, flag 0x%x, ctl 0x%x\n",
-             drv_data->cur_chip->baud, drv_data->cur_chip->flag,
-             drv_data->cur_chip->ctl_reg);
-        pr_debug("the first transfer len is %d\n", drv_data->cur_transfer->len);
+        dev_dbg(&drv_data->pdev->dev,
+                "got a message to pump, state is set to: baud %d, flag 0x%x, ctl 0x%x\n",
+                drv_data->cur_chip->baud, drv_data->cur_chip->flag,
+                drv_data->cur_chip->ctl_reg);
+        
+        dev_dbg(&drv_data->pdev->dev, 
+                "the first transfer len is %d\n",
+                drv_data->cur_transfer->len);
 
         /* Mark as busy and launch transfers */
         tasklet_schedule(&drv_data->pump_transfers);
@@ -932,7 +944,7 @@ static int transfer(struct spi_device *spi, struct spi_message *msg)
         msg->status = -EINPROGRESS;
         msg->state = START_STATE;
 
-        pr_debug("adding an msg in transfer() \n");
+        dev_dbg(&spi->dev, "adding an msg in transfer() \n");
         list_add_tail(&msg->queue, &drv_data->queue);
 
         if (drv_data->run == QUEUE_RUNNING && !drv_data->busy)
@@ -1002,13 +1014,13 @@ static int setup(struct spi_device *spi)
         if (chip->enable_dma && !dma_requested) {
                 /* register dma irq handler */
                 if (request_dma(CH_SPI, "BF53x_SPI_DMA") < 0) {
-                        pr_debug
-                            ("Unable to request BlackFin SPI DMA channel\n");
+                        dev_dbg(&spi->dev,
+                                "Unable to request BlackFin SPI DMA channel\n");
                         return -ENODEV;
                 }
                 if (set_dma_callback(CH_SPI, (void *)dma_irq_handler, drv_data)
                     < 0) {
-                        pr_debug("Unable to set dma callback\n");
+                        dev_dbg(&spi->dev, "Unable to set dma callback\n");
                         return -EPERM;
                 }
                 dma_disable_irq(CH_SPI);
@@ -1054,9 +1066,9 @@ static int setup(struct spi_device *spi)
                 return -ENODEV;
         }
 
-        pr_debug("setup spi chip %s, width is %d, dma is %d,",
+        dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d,",
                         spi->modalias, chip->width, chip->enable_dma);
-        pr_debug("ctl_reg is 0x%x, flag_reg is 0x%x\n",
+        dev_dbg(&spi->dev, "ctl_reg is 0x%x, flag_reg is 0x%x\n",
                         chip->ctl_reg, chip->flag);
 
         spi_set_ctldata(spi, chip);
@@ -1068,7 +1080,7 @@ static int setup(struct spi_device *spi)
  * callback for spi framework.
  * clean driver specific data
  */
-static void cleanup(const struct spi_device *spi)
+static void cleanup(struct spi_device *spi)
 {
         struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);
 
@@ -1207,7 +1219,7 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "problem registering spi master\n");
                 goto out_error_queue_alloc;
         }
-        pr_debug("controller probe successfully\n");
+        dev_dbg(&pdev->dev, "controller probe successfully\n");
         return status;
 
       out_error_queue_alloc:
@@ -1287,27 +1299,23 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 #endif                          /* CONFIG_PM */
 
 static struct platform_driver bfin5xx_spi_driver = {
-        .driver = {
-                   .name = "bfin-spi-master",
-                   .bus = &platform_bus_type,
-                   .owner = THIS_MODULE,
-                   },
-        .probe = bfin5xx_spi_probe,
-        .remove = __devexit_p(bfin5xx_spi_remove),
-        .suspend = bfin5xx_spi_suspend,
-        .resume = bfin5xx_spi_resume,
+        .driver         = {
+                .name   = "bfin-spi-master",
+                .owner  = THIS_MODULE,
+        },
+        .suspend        = bfin5xx_spi_suspend,
+        .resume         = bfin5xx_spi_resume,
+        .remove         = __devexit_p(bfin5xx_spi_remove),
 };
 
 static int __init bfin5xx_spi_init(void)
 {
-        return platform_driver_register(&bfin5xx_spi_driver);
+        return platform_driver_probe(&bfin5xx_spi_driver, bfin5xx_spi_probe);
 }
-
 module_init(bfin5xx_spi_init);
 
 static void __exit bfin5xx_spi_exit(void)
 {
         platform_driver_unregister(&bfin5xx_spi_driver);
 }
-
 module_exit(bfin5xx_spi_exit);
diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c
index 312987a03210..0ee2b2090252 100644
--- a/drivers/spi/spi_butterfly.c
+++ b/drivers/spi/spi_butterfly.c
@@ -20,7 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/platform_device.h>
+#include <linux/device.h>
 #include <linux/parport.h>
 
 #include <linux/sched.h>
@@ -40,8 +40,6 @@
  * and use this custom parallel port cable.
  */
 
-#undef  HAVE_USI        /* nyet */
-
 
 /* DATA output bits (pins 2..9 == D0..D7) */
 #define butterfly_nreset (1 << 1)               /* pin 3 */
@@ -49,19 +47,13 @@
 #define spi_sck_bit     (1 << 0)                /* pin 2 */
 #define spi_mosi_bit    (1 << 7)                /* pin 9 */
 
-#define usi_sck_bit     (1 << 3)                /* pin 5 */
-#define usi_mosi_bit    (1 << 4)                /* pin 6 */
-
 #define vcc_bits        ((1 << 6) | (1 << 5))   /* pins 7, 8 */
 
 /* STATUS input bits */
 #define spi_miso_bit    PARPORT_STATUS_BUSY     /* pin 11 */
 
-#define usi_miso_bit    PARPORT_STATUS_PAPEROUT /* pin 12 */
-
 /* CONTROL output bits */
 #define spi_cs_bit      PARPORT_CONTROL_SELECT  /* pin 17 */
-/* USI uses no chipselect */
 
 
 
@@ -70,15 +62,6 @@ static inline struct butterfly *spidev_to_pp(struct spi_device *spi)
         return spi->controller_data;
 }
 
-static inline int is_usidev(struct spi_device *spi)
-{
-#ifdef  HAVE_USI
-        return spi->chip_select != 1;
-#else
-        return 0;
-#endif
-}
-
 
 struct butterfly {
         /* REVISIT ... for now, this must be first */
@@ -97,23 +80,13 @@ struct butterfly {
 
 /*----------------------------------------------------------------------*/
 
-/*
- * these routines may be slower than necessary because they're hiding
- * the fact that there are two different SPI busses on this cable: one
- * to the DataFlash chip (or AVR SPI controller), the other to the
- * AVR USI controller.
- */
-
 static inline void
 setsck(struct spi_device *spi, int is_on)
 {
         struct butterfly        *pp = spidev_to_pp(spi);
         u8                      bit, byte = pp->lastbyte;
 
-        if (is_usidev(spi))
-                bit = usi_sck_bit;
-        else
-                bit = spi_sck_bit;
+        bit = spi_sck_bit;
 
         if (is_on)
                 byte |= bit;
@@ -129,10 +102,7 @@ setmosi(struct spi_device *spi, int is_on)
         struct butterfly        *pp = spidev_to_pp(spi);
         u8                      bit, byte = pp->lastbyte;
 
-        if (is_usidev(spi))
-                bit = usi_mosi_bit;
-        else
-                bit = spi_mosi_bit;
+        bit = spi_mosi_bit;
 
         if (is_on)
                 byte |= bit;
@@ -148,10 +118,7 @@ static inline int getmiso(struct spi_device *spi)
         int                     value;
         u8                      bit;
 
-        if (is_usidev(spi))
-                bit = usi_miso_bit;
-        else
-                bit = spi_miso_bit;
+        bit = spi_miso_bit;
 
         /* only STATUS_BUSY is NOT negated */
         value = !(parport_read_status(pp->port) & bit);
@@ -166,10 +133,6 @@ static void butterfly_chipselect(struct spi_device *spi, int value)
         if (value != BITBANG_CS_INACTIVE)
                 setsck(spi, spi->mode & SPI_CPOL);
 
-        /* no chipselect on this USI link config */
-        if (is_usidev(spi))
-                return;
-
         /* here, value == "activate or not";
          * most PARPORT_CONTROL_* bits are negated, so we must
          * morph it to value == "bit value to write in control register"
@@ -237,24 +200,16 @@ static void butterfly_attach(struct parport *p)
         int                     status;
         struct butterfly        *pp;
         struct spi_master       *master;
-        struct platform_device  *pdev;
+        struct device           *dev = p->physport->dev;
 
-        if (butterfly)
+        if (butterfly || !dev)
                 return;
 
         /* REVISIT:  this just _assumes_ a butterfly is there ... no probe,
          * and no way to be selective about what it binds to.
          */
 
-        /* FIXME where should master->cdev.dev come from?
-         * e.g. /sys/bus/pnp0/00:0b, some PCI thing, etc
-         * setting up a platform device like this is an ugly kluge...
-         */
-        pdev = platform_device_register_simple("butterfly", -1, NULL, 0);
-        if (IS_ERR(pdev))
-                return;
-
-        master = spi_alloc_master(&pdev->dev, sizeof *pp);
+        master = spi_alloc_master(dev, sizeof *pp);
         if (!master) {
                 status = -ENOMEM;
                 goto done;
@@ -300,7 +255,7 @@ static void butterfly_attach(struct parport *p)
         parport_frob_control(pp->port, spi_cs_bit, 0);
 
         /* stabilize power with chip in reset (nRESET), and
-         * both spi_sck_bit and usi_sck_bit clear (CPOL=0)
+         * spi_sck_bit clear (CPOL=0)
          */
         pp->lastbyte |= vcc_bits;
         parport_write_data(pp->port, pp->lastbyte);
@@ -334,23 +289,6 @@ static void butterfly_attach(struct parport *p)
                 pr_debug("%s: dataflash at %s\n", p->name,
                                 pp->dataflash->dev.bus_id);
 
-#ifdef  HAVE_USI
-        /* Bus 2 is only for talking to the AVR, and it can work no
-         * matter who masters bus 1; needs appropriate AVR firmware.
-         */
-        pp->info[1].max_speed_hz = 10 /* ?? */ * 1000 * 1000;
-        strcpy(pp->info[1].modalias, "butterfly");
-        // pp->info[1].platform_data = ... TBD ... ;
-        pp->info[1].chip_select = 2,
-        pp->info[1].controller_data = pp;
-        pp->butterfly = spi_new_device(pp->bitbang.master, &pp->info[1]);
-        if (pp->butterfly)
-                pr_debug("%s: butterfly at %s\n", p->name,
-                                pp->butterfly->dev.bus_id);
-
-        /* FIXME setup ACK for the IRQ line ...  */
-#endif
-
         // dev_info(_what?_, ...)
         pr_info("%s: AVR Butterfly\n", p->name);
         butterfly = pp;
@@ -366,14 +304,12 @@ clean1:
 clean0:
         (void) spi_master_put(pp->bitbang.master);
 done:
-        platform_device_unregister(pdev);
         pr_debug("%s: butterfly probe, fail %d\n", p->name, status);
 }
 
 static void butterfly_detach(struct parport *p)
 {
         struct butterfly        *pp;
-        struct platform_device  *pdev;
         int                     status;
 
         /* FIXME this global is ugly ... but, how to quickly get from
@@ -386,7 +322,6 @@ static void butterfly_detach(struct parport *p)
         butterfly = NULL;
 
         /* stop() unregisters child devices too */
-        pdev = to_platform_device(pp->bitbang.master->cdev.dev);
         status = spi_bitbang_stop(&pp->bitbang);
 
         /* turn off VCC */
@@ -397,8 +332,6 @@ static void butterfly_detach(struct parport *p)
         parport_unregister_device(pp->pd);
 
         (void) spi_master_put(pp->bitbang.master);
-
-        platform_device_unregister(pdev);
 }
 
 static struct parport_driver butterfly_driver = {
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
new file mode 100644
index 000000000000..225d6b2f82dd
--- /dev/null
+++ b/drivers/spi/spidev.c
@@ -0,0 +1,584 @@
+/*
+ * spidev.c -- simple synchronous userspace interface to SPI devices
+ *
+ * Copyright (C) 2006 SWAPP
+ *      Andrea Paterniani <a.paterniani@swapp-eng.it>
+ * Copyright (C) 2007 David Brownell (simplification, cleanup)
+ *
+ * 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/init.h>
+#include <linux/module.h>
+#include <linux/ioctl.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/errno.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+
+#include <linux/spi/spi.h>
+#include <linux/spi/spidev.h>
+
+#include <asm/uaccess.h>
+
+
+/*
+ * This supports acccess to SPI devices using normal userspace I/O calls.
+ * Note that while traditional UNIX/POSIX I/O semantics are half duplex,
+ * and often mask message boundaries, full SPI support requires full duplex
+ * transfers.  There are several kinds of of internal message boundaries to
+ * handle chipselect management and other protocol options.
+ *
+ * SPI has a character major number assigned.  We allocate minor numbers
+ * dynamically using a bitmask.  You must use hotplug tools, such as udev
+ * (or mdev with busybox) to create and destroy the /dev/spidevB.C device
+ * nodes, since there is no fixed association of minor numbers with any
+ * particular SPI bus or device.
+ */
+#define SPIDEV_MAJOR                    153     /* assigned */
+#define N_SPI_MINORS                    32      /* ... up to 256 */
+
+static unsigned long    minors[N_SPI_MINORS / BITS_PER_LONG];
+
+
+/* Bit masks for spi_device.mode management */
+#define SPI_MODE_MASK                   (SPI_CPHA | SPI_CPOL)
+
+
+struct spidev_data {
+        struct device           dev;
+        struct spi_device       *spi;
+        struct list_head        device_entry;
+
+        struct mutex            buf_lock;
+        unsigned                users;
+        u8                      *buffer;
+};
+
+static LIST_HEAD(device_list);
+static DEFINE_MUTEX(device_list_lock);
+
+static unsigned bufsiz = 4096;
+module_param(bufsiz, uint, S_IRUGO);
+MODULE_PARM_DESC(bufsiz, "data bytes in biggest supported SPI message");
+
+/*-------------------------------------------------------------------------*/
+
+/* Read-only message with current device setup */
+static ssize_t
+spidev_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos)
+{
+        struct spidev_data      *spidev;
+        struct spi_device       *spi;
+        ssize_t                 status = 0;
+
+        /* chipselect only toggles at start or end of operation */
+        if (count > bufsiz)
+                return -EMSGSIZE;
+
+        spidev = filp->private_data;
+        spi = spidev->spi;
+
+        mutex_lock(&spidev->buf_lock);
+        status = spi_read(spi, spidev->buffer, count);
+        if (status == 0) {
+                unsigned long   missing;
+
+                missing = copy_to_user(buf, spidev->buffer, count);
+                if (count && missing == count)
+                        status = -EFAULT;
+                else
+                        status = count - missing;
+        }
+        mutex_unlock(&spidev->buf_lock);
+
+        return status;
+}
+
+/* Write-only message with current device setup */
+static ssize_t
+spidev_write(struct file *filp, const char __user *buf,
+                size_t count, loff_t *f_pos)
+{
+        struct spidev_data      *spidev;
+        struct spi_device       *spi;
+        ssize_t                 status = 0;
+        unsigned long           missing;
+
+        /* chipselect only toggles at start or end of operation */
+        if (count > bufsiz)
+                return -EMSGSIZE;
+
+        spidev = filp->private_data;
+        spi = spidev->spi;
+
+        mutex_lock(&spidev->buf_lock);
+        missing = copy_from_user(spidev->buffer, buf, count);
+        if (missing == 0) {
+                status = spi_write(spi, spidev->buffer, count);
+                if (status == 0)
+                        status = count;
+        } else
+                status = -EFAULT;
+        mutex_unlock(&spidev->buf_lock);
+
+        return status;
+}
+
+static int spidev_message(struct spidev_data *spidev,
+                struct spi_ioc_transfer *u_xfers, unsigned n_xfers)
+{
+        struct spi_message      msg;
+        struct spi_transfer     *k_xfers;
+        struct spi_transfer     *k_tmp;
+        struct spi_ioc_transfer *u_tmp;
+        struct spi_device       *spi = spidev->spi;
+        unsigned                n, total;
+        u8                      *buf;
+        int                     status = -EFAULT;
+
+        spi_message_init(&msg);
+        k_xfers = kcalloc(n_xfers, sizeof(*k_tmp), GFP_KERNEL);
+        if (k_xfers == NULL)
+                return -ENOMEM;
+
+        /* Construct spi_message, copying any tx data to bounce buffer.
+         * We walk the array of user-provided transfers, using each one
+         * to initialize a kernel version of the same transfer.
+         */
+        mutex_lock(&spidev->buf_lock);
+        buf = spidev->buffer;
+        total = 0;
+        for (n = n_xfers, k_tmp = k_xfers, u_tmp = u_xfers;
+                        n;
+                        n--, k_tmp++, u_tmp++) {
+                k_tmp->len = u_tmp->len;
+
+                if (u_tmp->rx_buf) {
+                        k_tmp->rx_buf = buf;
+                        if (!access_ok(VERIFY_WRITE, u_tmp->rx_buf, u_tmp->len))
+                                goto done;
+                }
+                if (u_tmp->tx_buf) {
+                        k_tmp->tx_buf = buf;
+                        if (copy_from_user(buf, (const u8 __user *)u_tmp->tx_buf,
+                                        u_tmp->len))
+                                goto done;
+                }
+
+                total += k_tmp->len;
+                if (total > bufsiz) {
+                        status = -EMSGSIZE;
+                        goto done;
+                }
+                buf += k_tmp->len;
+
+                k_tmp->cs_change = !!u_tmp->cs_change;
+                k_tmp->bits_per_word = u_tmp->bits_per_word;
+                k_tmp->delay_usecs = u_tmp->delay_usecs;
+                k_tmp->speed_hz = u_tmp->speed_hz;
+#ifdef VERBOSE
+                dev_dbg(&spi->dev,
+                        "  xfer len %zd %s%s%s%dbits %u usec %uHz\n",
+                        u_tmp->len,
+                        u_tmp->rx_buf ? "rx " : "",
+                        u_tmp->tx_buf ? "tx " : "",
+                        u_tmp->cs_change ? "cs " : "",
+                        u_tmp->bits_per_word ? : spi->bits_per_word,
+                        u_tmp->delay_usecs,
+                        u_tmp->speed_hz ? : spi->max_speed_hz);
+#endif
+                spi_message_add_tail(k_tmp, &msg);
+        }
+
+        status = spi_sync(spi, &msg);
+        if (status < 0)
+                goto done;
+
+        /* copy any rx data out of bounce buffer */
+        buf = spidev->buffer;
+        for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) {
+                if (u_tmp->rx_buf) {
+                        if (__copy_to_user((u8 __user *)u_tmp->rx_buf, buf,
+                                        u_tmp->len)) {
+                                status = -EFAULT;
+                                goto done;
+                        }
+                }
+                buf += u_tmp->len;
+        }
+        status = total;
+
+done:
+        mutex_unlock(&spidev->buf_lock);
+        kfree(k_xfers);
+        return status;
+}
+
+static int
+spidev_ioctl(struct inode *inode, struct file *filp,
+                unsigned int cmd, unsigned long arg)
+{
+        int                     err = 0;
+        int                     retval = 0;
+        struct spidev_data      *spidev;
+        struct spi_device       *spi;
+        u32                     tmp;
+        unsigned                n_ioc;
+        struct spi_ioc_transfer *ioc;
+
+        /* Check type and command number */
+        if (_IOC_TYPE(cmd) != SPI_IOC_MAGIC)
+                return -ENOTTY;
+
+        /* Check access direction once here; don't repeat below.
+         * IOC_DIR is from the user perspective, while access_ok is
+         * from the kernel perspective; so they look reversed.
+         */
+        if (_IOC_DIR(cmd) & _IOC_READ)
+                err = !access_ok(VERIFY_WRITE,
+                                (void __user *)arg, _IOC_SIZE(cmd));
+        if (err == 0 && _IOC_DIR(cmd) & _IOC_WRITE)
+                err = !access_ok(VERIFY_READ,
+                                (void __user *)arg, _IOC_SIZE(cmd));
+        if (err)
+                return -EFAULT;
+
+        spidev = filp->private_data;
+        spi = spidev->spi;
+
+        switch (cmd) {
+        /* read requests */
+        case SPI_IOC_RD_MODE:
+                retval = __put_user(spi->mode & SPI_MODE_MASK,
+                                        (__u8 __user *)arg);
+                break;
+        case SPI_IOC_RD_LSB_FIRST:
+                retval = __put_user((spi->mode & SPI_LSB_FIRST) ?  1 : 0,
+                                        (__u8 __user *)arg);
+                break;
+        case SPI_IOC_RD_BITS_PER_WORD:
+                retval = __put_user(spi->bits_per_word, (__u8 __user *)arg);
+                break;
+        case SPI_IOC_RD_MAX_SPEED_HZ:
+                retval = __put_user(spi->max_speed_hz, (__u32 __user *)arg);
+                break;
+
+        /* write requests */
+        case SPI_IOC_WR_MODE:
+                retval = __get_user(tmp, (u8 __user *)arg);
+                if (retval == 0) {
+                        u8      save = spi->mode;
+
+                        if (tmp & ~SPI_MODE_MASK) {
+                                retval = -EINVAL;
+                                break;
+                        }
+
+                        tmp |= spi->mode & ~SPI_MODE_MASK;
+                        spi->mode = (u8)tmp;
+                        retval = spi_setup(spi);
+                        if (retval < 0)
+                                spi->mode = save;
+                        else
+                                dev_dbg(&spi->dev, "spi mode %02x\n", tmp);
+                }
+                break;
+        case SPI_IOC_WR_LSB_FIRST:
+                retval = __get_user(tmp, (__u8 __user *)arg);
+                if (retval == 0) {
+                        u8      save = spi->mode;
+
+                        if (tmp)
+                                spi->mode |= SPI_LSB_FIRST;
+                        else
+                                spi->mode &= ~SPI_LSB_FIRST;
+                        retval = spi_setup(spi);
+                        if (retval < 0)
+                                spi->mode = save;
+                        else
+                                dev_dbg(&spi->dev, "%csb first\n",
+                                                tmp ? 'l' : 'm');
+                }
+                break;
+        case SPI_IOC_WR_BITS_PER_WORD:
+                retval = __get_user(tmp, (__u8 __user *)arg);
+                if (retval == 0) {
+                        u8      save = spi->bits_per_word;
+
+                        spi->bits_per_word = tmp;
+                        retval = spi_setup(spi);
+                        if (retval < 0)
+                                spi->bits_per_word = save;
+                        else
+                                dev_dbg(&spi->dev, "%d bits per word\n", tmp);
+                }
+                break;
+        case SPI_IOC_WR_MAX_SPEED_HZ:
+                retval = __get_user(tmp, (__u32 __user *)arg);
+                if (retval == 0) {
+                        u32     save = spi->max_speed_hz;
+
+                        spi->max_speed_hz = tmp;
+                        retval = spi_setup(spi);
+                        if (retval < 0)
+                                spi->max_speed_hz = save;
+                        else
+                                dev_dbg(&spi->dev, "%d Hz (max)\n", tmp);
+                }
+                break;
+
+        default:
+                /* segmented and/or full-duplex I/O request */
+                if (_IOC_NR(cmd) != _IOC_NR(SPI_IOC_MESSAGE(0))
+                                || _IOC_DIR(cmd) != _IOC_WRITE)
+                        return -ENOTTY;
+
+                tmp = _IOC_SIZE(cmd);
+                if ((tmp % sizeof(struct spi_ioc_transfer)) != 0) {
+                        retval = -EINVAL;
+                        break;
+                }
+                n_ioc = tmp / sizeof(struct spi_ioc_transfer);
+                if (n_ioc == 0)
+                        break;
+
+                /* copy into scratch area */
+                ioc = kmalloc(tmp, GFP_KERNEL);
+                if (!ioc) {
+                        retval = -ENOMEM;
+                        break;
+                }
+                if (__copy_from_user(ioc, (void __user *)arg, tmp)) {
+                        retval = -EFAULT;
+                        break;
+                }
+
+                /* translate to spi_message, execute */
+                retval = spidev_message(spidev, ioc, n_ioc);
+                kfree(ioc);
+                break;
+        }
+        return retval;
+}
+
+static int spidev_open(struct inode *inode, struct file *filp)
+{
+        struct spidev_data      *spidev;
+        int                     status = -ENXIO;
+
+        mutex_lock(&device_list_lock);
+
+        list_for_each_entry(spidev, &device_list, device_entry) {
+                if (spidev->dev.devt == inode->i_rdev) {
+                        status = 0;
+                        break;
+                }
+        }
+        if (status == 0) {
+                if (!spidev->buffer) {
+                        spidev->buffer = kmalloc(bufsiz, GFP_KERNEL);
+                        if (!spidev->buffer) {
+                                dev_dbg(&spidev->spi->dev, "open/ENOMEM\n");
+                                status = -ENOMEM;
+                        }
+                }
+                if (status == 0) {
+                        spidev->users++;
+                        filp->private_data = spidev;
+                        nonseekable_open(inode, filp);
+                }
+        } else
+                pr_debug("spidev: nothing for minor %d\n", iminor(inode));
+
+        mutex_unlock(&device_list_lock);
+        return status;
+}
+
+static int spidev_release(struct inode *inode, struct file *filp)
+{
+        struct spidev_data      *spidev;
+        int                     status = 0;
+
+        mutex_lock(&device_list_lock);
+        spidev = filp->private_data;
+        filp->private_data = NULL;
+        spidev->users--;
+        if (!spidev->users) {
+                kfree(spidev->buffer);
+                spidev->buffer = NULL;
+        }
+        mutex_unlock(&device_list_lock);
+
+        return status;
+}
+
+static struct file_operations spidev_fops = {
+        .owner =        THIS_MODULE,
+        /* REVISIT switch to aio primitives, so that userspace
+         * gets more complete API coverage.  It'll simplify things
+         * too, except for the locking.
+         */
+        .write =        spidev_write,
+        .read =         spidev_read,
+        .ioctl =        spidev_ioctl,
+        .open =         spidev_open,
+        .release =      spidev_release,
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* The main reason to have this class is to make mdev/udev create the
+ * /dev/spidevB.C character device nodes exposing our userspace API.
+ * It also simplifies memory management.
+ */
+
+static void spidev_classdev_release(struct device *dev)
+{
+        struct spidev_data      *spidev;
+
+        spidev = container_of(dev, struct spidev_data, dev);
+        kfree(spidev);
+}
+
+static struct class spidev_class = {
+        .name           = "spidev",
+        .owner          = THIS_MODULE,
+        .dev_release    = spidev_classdev_release,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int spidev_probe(struct spi_device *spi)
+{
+        struct spidev_data      *spidev;
+        int                     status;
+        unsigned long           minor;
+
+        /* Allocate driver data */
+        spidev = kzalloc(sizeof(*spidev), GFP_KERNEL);
+        if (!spidev)
+                return -ENOMEM;
+
+        /* Initialize the driver data */
+        spidev->spi = spi;
+        mutex_init(&spidev->buf_lock);
+
+        INIT_LIST_HEAD(&spidev->device_entry);
+
+        /* If we can allocate a minor number, hook up this device.
+         * Reusing minors is fine so long as udev or mdev is working.
+         */
+        mutex_lock(&device_list_lock);
+        minor = find_first_zero_bit(minors, N_SPI_MINORS);
+        if (minor < N_SPI_MINORS) {
+                spidev->dev.parent = &spi->dev;
+                spidev->dev.class = &spidev_class;
+                spidev->dev.devt = MKDEV(SPIDEV_MAJOR, minor);
+                snprintf(spidev->dev.bus_id, sizeof spidev->dev.bus_id,
+                                "spidev%d.%d",
+                                spi->master->bus_num, spi->chip_select);
+                status = device_register(&spidev->dev);
+        } else {
+                dev_dbg(&spi->dev, "no minor number available!\n");
+                status = -ENODEV;
+        }
+        if (status == 0) {
+                set_bit(minor, minors);
+                dev_set_drvdata(&spi->dev, spidev);
+                list_add(&spidev->device_entry, &device_list);
+        }
+        mutex_unlock(&device_list_lock);
+
+        if (status != 0)
+                kfree(spidev);
+
+        return status;
+}
+
+static int spidev_remove(struct spi_device *spi)
+{
+        struct spidev_data      *spidev = dev_get_drvdata(&spi->dev);
+
+        mutex_lock(&device_list_lock);
+
+        list_del(&spidev->device_entry);
+        dev_set_drvdata(&spi->dev, NULL);
+        clear_bit(MINOR(spidev->dev.devt), minors);
+        device_unregister(&spidev->dev);
+
+        mutex_unlock(&device_list_lock);
+
+        return 0;
+}
+
+static struct spi_driver spidev_spi = {
+        .driver = {
+                .name =         "spidev",
+                .owner =        THIS_MODULE,
+        },
+        .probe =        spidev_probe,
+        .remove =       __devexit_p(spidev_remove),
+
+        /* NOTE:  suspend/resume methods are not necessary here.
+         * We don't do anything except pass the requests to/from
+         * the underlying controller.  The refrigerator handles
+         * most issues; the controller driver handles the rest.
+         */
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int __init spidev_init(void)
+{
+        int status;
+
+        /* Claim our 256 reserved device numbers.  Then register a class
+         * that will key udev/mdev to add/remove /dev nodes.  Last, register
+         * the driver which manages those device numbers.
+         */
+        BUILD_BUG_ON(N_SPI_MINORS > 256);
+        status = register_chrdev(SPIDEV_MAJOR, "spi", &spidev_fops);
+        if (status < 0)
+                return status;
+
+        status = class_register(&spidev_class);
+        if (status < 0) {
+                unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);
+                return status;
+        }
+
+        status = spi_register_driver(&spidev_spi);
+        if (status < 0) {
+                class_unregister(&spidev_class);
+                unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);
+        }
+        return status;
+}
+module_init(spidev_init);
+
+static void __exit spidev_exit(void)
+{
+        spi_unregister_driver(&spidev_spi);
+        class_unregister(&spidev_class);
+        unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);
+}
+module_exit(spidev_exit);
+
+MODULE_AUTHOR("Andrea Paterniani, <a.paterniani@swapp-eng.it>");
+MODULE_DESCRIPTION("User mode SPI device interface");
+MODULE_LICENSE("GPL");
diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig
index 7625b1816baf..dd1d6a53f3c0 100644
--- a/drivers/telephony/Kconfig
+++ b/drivers/telephony/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Telephony Support"
+        depends on HAS_IOMEM
 
 config PHONE
         tristate "Linux telephony support"
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 71cb64e41a1b..c7b0a357b04a 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -7692,7 +7692,7 @@ static int __init ixj_probe_pci(int *cnt)
         IXJ *j = NULL;
 
         for (i = 0; i < IXJMAX - *cnt; i++) {
-                pci = pci_find_device(PCI_VENDOR_ID_QUICKNET,
+                pci = pci_get_device(PCI_VENDOR_ID_QUICKNET,
                                       PCI_DEVICE_ID_QUICKNET_XJ, pci);
                 if (!pci)
                         break;
@@ -7712,6 +7712,7 @@ static int __init ixj_probe_pci(int *cnt)
                         printk(KERN_INFO "ixj: found Internet PhoneJACK PCI at 0x%x\n", j->DSPbase);
                 ++*cnt;
         }
+        pci_dev_put(pci);
         return probe;
 }
 
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index b847bbc8b0e1..15499b7e33f4 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "USB support"
+        depends on HAS_IOMEM
 
 # Host-side USB depends on having a host controller
 # NOTE:  dummy_hcd is always an option, but it's ignored here ...
@@ -87,8 +88,6 @@ source "drivers/usb/storage/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
-source "drivers/usb/net/Kconfig"
-
 source "drivers/usb/mon/Kconfig"
 
 comment "USB port drivers"
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 0ef090b1b37c..72464b586990 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER)	+= class/
 obj-$(CONFIG_USB_STORAGE)       += storage/
 obj-$(CONFIG_USB)               += storage/
 
-obj-$(CONFIG_USB_CATC)          += net/
-obj-$(CONFIG_USB_KAWETH)        += net/
-obj-$(CONFIG_USB_PEGASUS)       += net/
-obj-$(CONFIG_USB_RTL8150)       += net/
-obj-$(CONFIG_USB_USBNET)        += net/
-obj-$(CONFIG_USB_ZD1201)        += net/
-
 obj-$(CONFIG_USB_MDC800)        += image/
 obj-$(CONFIG_USB_MICROTEK)      += image/
 
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index b3f779f5933a..11e9b15ca45a 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -77,7 +77,6 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/stat.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
@@ -1034,7 +1033,7 @@ static int usbatm_do_heavy_init(void *arg)
 
 static int usbatm_heavy_init(struct usbatm_data *instance)
 {
-        int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_KERNEL);
+        int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_FS | CLONE_FILES);
 
         if (ret < 0) {
                 usb_err(instance, "%s: failed to create kernel_thread (%d)!\n", __func__, ret);
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 14de3b1b6a20..0081c1d12687 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -59,7 +59,6 @@
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 6584cf00f7f3..15e740e3a5c4 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -49,7 +49,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/signal.h>
 #include <linux/poll.h>
 #include <linux/init.h>
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index bde29ab2b504..f6b74a678de5 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -16,7 +16,6 @@
 #include <linux/sched.h>
 #include <linux/list.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/ioctl.h>
 #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index cddfc62c4611..cd4f11157280 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -36,7 +36,6 @@
 #include <linux/usb.h>
 #include <linux/namei.h>
 #include <linux/usbdevice_fs.h>
-#include <linux/smp_lock.h>
 #include <linux/parser.h>
 #include <linux/notifier.h>
 #include <asm/byteorder.h>
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index dfd1b5c87ca3..18ddc5e67e39 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -31,7 +31,6 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8065f2b53701..f771a7cae9ec 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -210,7 +210,7 @@ config USB_OTG
 
 config USB_GADGET_AT91
         boolean "AT91 USB Device Port"
-        depends on ARCH_AT91
+        depends on ARCH_AT91 && !ARCH_AT91SAM9RL
         select USB_GADGET_SELECTED
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 2a6e3163d944..ba163f35bf21 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -31,7 +31,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 7d7909cf2558..fcb5526cb085 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -41,7 +41,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 1dd8b57f4420..325bf7cfb83f 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 65c91d3735de..ae931af05cef 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 49d737725f70..52779c52b56d 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -54,7 +54,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index e552668d36b3..f847c3414be3 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -22,7 +22,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 8c85e33f74a4..7078374d0b79 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -67,7 +67,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index c7458f7e56cc..099aff64f536 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -24,7 +24,6 @@
 #include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 93107453f124..37b83ba09969 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -97,7 +97,7 @@ static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
         dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
                 __LINE__, dev->m_region->lpar_addr);
 
-        result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
+        result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
 
         if (result) {
                 dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
@@ -155,7 +155,7 @@ fail_add_hcd:
 fail_ioremap:
         usb_put_hcd(hcd);
 fail_create_hcd:
-        ps3_free_io_irq(virq);
+        ps3_io_irq_destroy(virq);
 fail_irq:
         ps3_free_mmio_region(dev->m_region);
 fail_mmio:
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index e8bbe8bc2598..a66637e725f3 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -26,7 +26,6 @@
 #include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 08e237c7bc43..c43b66acd4d5 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -97,8 +97,8 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
                 return -ENODEV;
 
         is_bigendian =
-                device_is_compatible(dn, "ohci-bigendian") ||
-                device_is_compatible(dn, "ohci-be");
+                of_device_is_compatible(dn, "ohci-bigendian") ||
+                of_device_is_compatible(dn, "ohci-be");
 
         dev_dbg(&op->dev, "initializing PPC-OF USB Controller\n");
 
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index c849f72b508a..d7cf07288b0b 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -99,7 +99,7 @@ static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev)
         dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
                 __LINE__, dev->m_region->lpar_addr);
 
-        result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
+        result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
 
         if (result) {
                 dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
@@ -157,7 +157,7 @@ fail_add_hcd:
 fail_ioremap:
         usb_put_hcd(hcd);
 fail_create_hcd:
-        ps3_free_io_irq(virq);
+        ps3_io_irq_destroy(virq);
 fail_irq:
         ps3_free_mmio_region(dev->m_region);
 fail_mmio:
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 5fa5647ea095..4cfa3ff2c993 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -38,7 +38,6 @@
 #include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index a7fa0d75567d..ff0dba01f1c7 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -43,7 +43,6 @@
 #include <linux/pci_ids.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/timer.h>
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index d308afd06935..36502a06f73a 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -94,7 +94,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 896cb2b71020..51bd80d2b8cc 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -128,7 +128,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/proc_fs.h>
 
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index b5332e679c46..88fb56d5db8f 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -1307,7 +1307,7 @@ static int auerswald_addservice (pauerswald_t cp, pauerscon_t scp)
 }
 
 
-/* remove a service from the the device
+/* remove a service from the device
    scp->id must be set! */
 static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp)
 {
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 15c70bd048c4..8d0e360636e6 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 5dce797bddb7..1713e19a7899 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -80,7 +80,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index fdf68479a166..88f6abe73624 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -39,7 +39,6 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/wait.h>
 
 #include "rio500_usb.h"
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c
index 1730d8642a47..5947afb0017e 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -62,7 +62,6 @@
 #include <linux/selection.h>
 #include <linux/spinlock.h>
 #include <linux/kref.h>
-#include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
@@ -322,7 +321,7 @@ sisusbcon_deinit(struct vc_data *c)
 /* interface routine */
 static u8
 sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity,
-                            u8 blink, u8 underline, u8 reverse)
+                            u8 blink, u8 underline, u8 reverse, u8 unused)
 {
         u8 attr = color;
 
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 8a1df2c9c73e..8977ec0d0f99 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -9,7 +9,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/notifier.h>
 #include <linux/mutex.h>
 
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index ba5d1dc03036..3efe67092f15 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -558,7 +558,7 @@ config USB_SERIAL_DEBUG
         tristate "USB Debugging Device"
         depends on USB_SERIAL
         help
-          Say Y here if you have a USB debugging device used to recieve
+          Say Y here if you have a USB debugging device used to receive
           debugging data from another machine.  The most common of these
           devices is the NetChip TurboCONNECT device.
 
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index b675735bfbee..fbc8c27d5d99 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -9,7 +9,7 @@
  * The device works as an standard CDC device, it has 2 interfaces, the first
  * one is for firmware access and the second is the serial one.
  * The protocol is very simply, there are two posibilities reading or writing.
- * When writting the first urb must have a Header that starts with 0x20 0x29 the
+ * When writing the first urb must have a Header that starts with 0x20 0x29 the
  * next two bytes must say how much data will be sended.
  * When reading the process is almost equal except that the header starts with
  * 0x00 0x20.
@@ -18,7 +18,7 @@
  * buffer: The First and Second byte is used for a Header, the Third and Fourth
  * tells the  device the amount of information the package holds.
  * Packages are 60 bytes long Header Stuff.
- * When writting to the device the first two bytes of the header are 0x20 0x29
+ * When writing to the device the first two bytes of the header are 0x20 0x29
  * When reading the bytes are 0x00 0x20, or 0x00 0x10, there is an strange
  * situation, when too much data arrives to the device because it sends the data
  * but with out the header. I will use a simply hack to override this situation,
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 18f74ac76565..4807f960150b 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2465,7 +2465,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r
             ((edge_serial->is_epic) &&
              (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) &&
              (regNum == MCR))) {
-                dbg("SendCmdWriteUartReg - Not writting to MCR Register");
+                dbg("SendCmdWriteUartReg - Not writing to MCR Register");
                 return 0;
         }
 
@@ -2473,7 +2473,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r
             ((edge_serial->is_epic) &&
              (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) &&
              (regNum == LCR))) {
-                dbg ("SendCmdWriteUartReg - Not writting to LCR Register");
+                dbg ("SendCmdWriteUartReg - Not writing to LCR Register");
                 return 0;
         }
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 7639022cdf84..87f378806db6 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -28,7 +28,6 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 21f3ddbc9080..6dac1ffdde86 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -47,7 +47,6 @@
 #include <linux/usb.h>
 #include <linux/usb_usual.h>
 #include <linux/blkdev.h>
-#include <linux/smp_lock.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
 #include <scsi/scsi_host.h>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 344c37595305..4d7485fa553f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -3,8 +3,14 @@
 #
 
 menu "Graphics support"
+        depends on HAS_IOMEM
 
 source "drivers/video/backlight/Kconfig"
+source "drivers/video/display/Kconfig"
+
+config VGASTATE
+       tristate
+       default n
 
 config FB
         tristate "Support for frame buffer devices"
@@ -90,6 +96,43 @@ config FB_CFB_IMAGEBLIT
           blitting. This is used by drivers that don't provide their own
           (accelerated) version.
 
+config FB_SYS_FILLRECT
+        tristate
+        depends on FB
+        default n
+        ---help---
+          Include the sys_fillrect function for generic software rectangle
+          filling. This is used by drivers that don't provide their own
+          (accelerated) version and the framebuffer is in system RAM.
+
+config FB_SYS_COPYAREA
+        tristate
+        depends on FB
+        default n
+        ---help---
+          Include the sys_copyarea function for generic software area copying.
+          This is used by drivers that don't provide their own (accelerated)
+          version and the framebuffer is in system RAM.
+
+config FB_SYS_IMAGEBLIT
+        tristate
+        depends on FB
+        default n
+        ---help---
+          Include the sys_imageblit function for generic software image
+          blitting. This is used by drivers that don't provide their own
+          (accelerated) version and the framebuffer is in system RAM.
+
+config FB_SYS_FOPS
+       tristate
+       depends on FB
+       default n
+
+config FB_DEFERRED_IO
+        bool
+        depends on FB
+        default y
+
 config FB_SVGALIB
         tristate
         depends on FB
@@ -375,9 +418,10 @@ config FB_FM2
 config FB_ARC
         tristate "Arc Monochrome LCD board support"
         depends on FB && X86
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
         help
           This enables support for the Arc Monochrome LCD board. The board
           is based on the KS-108 lcd controller and is typically a matrix
@@ -475,6 +519,8 @@ config FB_VGA16
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
+        select FONT_8x16 if FRAMEBUFFER_CONSOLE
         help
           This is the frame buffer device driver for VGA 16 color graphic
           cards. Say Y if you have such a card.
@@ -519,15 +565,25 @@ config FB_HP300
         default y
 
 config FB_TGA
-        tristate "TGA framebuffer support"
-        depends on FB && ALPHA
+        tristate "TGA/SFB+ framebuffer support"
+        depends on FB && (ALPHA || TC)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select BITREVERSE
-        help
-          This is the frame buffer device driver for generic TGA graphic
-          cards. Say Y if you have one of those.
+        ---help---
+          This is the frame buffer device driver for generic TGA and SFB+
+          graphic cards.  These include DEC ZLXp-E1, -E2 and -E3 PCI cards,
+          also known as PBXGA-A, -B and -C, and DEC ZLX-E1, -E2 and -E3
+          TURBOchannel cards, also known as PMAGD-A, -B and -C.
+
+          Due to hardware limitations ZLX-E2 and E3 cards are not supported
+          for DECstation 5000/200 systems.  Additionally due to firmware
+          limitations these cards may cause troubles with booting DECstation
+          5000/240 and /260 systems, but are fully supported under Linux if
+          you manage to get it going. ;-)
+
+          Say Y if you have one of those.
 
 config FB_VESA
         bool "VESA VGA graphics support"
@@ -551,6 +607,21 @@ config FB_IMAC
         help
           This is the frame buffer device driver for the Intel-based Macintosh
 
+config FB_HECUBA
+       tristate "Hecuba board support"
+       depends on FB && X86 && MMU
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       help
+         This enables support for the Hecuba board. This driver was tested
+         with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO
+         interface (8 bit data, 4 bit control). If you anticpate using
+         this driver, say Y or M; otherwise say N. You must specify the
+         GPIO IO address to be used for setting control and data.
+
 config FB_HGA
         tristate "Hercules mono graphics support"
         depends on FB && X86
@@ -677,6 +748,22 @@ config FB_S1D13XXX
           working with S1D13806). Product specs at
           <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
 
+config FB_ATMEL
+        tristate "AT91/AT32 LCD Controller support"
+        depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || AVR32)
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This enables support for the AT91/AT32 LCD Controller.
+
+config FB_INTSRAM
+        bool "Frame Buffer in internal SRAM"
+        depends on FB_ATMEL && ARCH_AT91SAM9261
+        help
+          Say Y if you want to map Frame Buffer in internal SRAM. Say N if you want
+          to let frame buffer in external SDRAM.
+
 config FB_NVIDIA
         tristate "nVidia Framebuffer Support"
         depends on FB && PCI
@@ -686,6 +773,7 @@ config FB_NVIDIA
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select BITREVERSE
+        select VGASTATE
         help
           This driver supports graphics boards with the nVidia chips, TNT
           and newer. For very old chipsets, such as the RIVA128, then use
@@ -708,6 +796,15 @@ config FB_NVIDIA_I2C
           independently validate video mode parameters, you should say Y
           here.
 
+config FB_NVIDIA_DEBUG
+        bool "Lots of debug output"
+        depends on FB_NVIDIA
+        default n
+        help
+          Say Y here if you want the nVidia driver to output all sorts
+          of debugging information to provide to the maintainer when
+          something goes wrong.
+
 config FB_NVIDIA_BACKLIGHT
         bool "Support for backlight control"
         depends on FB_NVIDIA
@@ -724,6 +821,7 @@ config FB_RIVA
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select BITREVERSE
+        select VGASTATE
         help
           This driver supports graphics boards with the nVidia Riva/Geforce
           chips.
@@ -746,7 +844,7 @@ config FB_RIVA_I2C
           here.
 
 config FB_RIVA_DEBUG
-        bool "Lots of debug output from Riva(nVidia) driver"
+        bool "Lots of debug output"
         depends on FB_RIVA
         default n
         help
@@ -770,6 +868,7 @@ config FB_I810
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This driver supports the on-board graphics built in to the Intel 810 
           and 815 chipsets.  Say Y if you have and plan to use such a board.
@@ -809,6 +908,22 @@ config FB_I810_I2C
         select FB_DDC
         help
 
+config FB_LE80578
+        tristate "Intel LE80578 (Vermilion) support"
+        depends on FB && PCI && X86
+        select FB_MODE_HELPERS
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This driver supports the LE80578 (Vermilion Range) chipset
+
+config FB_CARILLO_RANCH
+        tristate "Intel Carillo Ranch support"
+        depends on FB_LE80578 && FB && PCI && X86
+        help
+          This driver supports the LE80578 (Carillo Ranch) board
+
 config FB_INTEL
         tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)"
         depends on FB && EXPERIMENTAL && PCI && X86
@@ -1120,6 +1235,8 @@ config FB_S3
         select FB_CFB_IMAGEBLIT
         select FB_TILEBLITTING
         select FB_SVGALIB
+        select VGASTATE
+        select FONT_8x16 if FRAMEBUFFER_CONSOLE
         ---help---
           Driver for graphics boards with S3 Trio / S3 Virge chip.
 
@@ -1130,6 +1247,7 @@ config FB_SAVAGE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This driver supports notebooks and computers with S3 Savage PCI/AGP
           chips.
@@ -1196,6 +1314,7 @@ config FB_NEOMAGIC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select VGASTATE
         help
           This driver supports notebooks with NeoMagic PCI chips.
           Say Y if you have such a graphics card. 
@@ -1255,6 +1374,20 @@ config FB_VOODOO1
           Please read the <file:Documentation/fb/README-sstfb.txt> for supported
           options and other important info  support.
 
+config FB_VT8623
+        tristate "VIA VT8623 support"
+        depends on FB && PCI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select FB_TILEBLITTING
+        select FB_SVGALIB
+        select VGASTATE
+        select FONT_8x16 if FRAMEBUFFER_CONSOLE
+        ---help---
+          Driver for CastleRock integrated graphics core in the
+          VIA VT8623 [Apollo CLE266] chipset.
+
 config FB_CYBLA
         tristate "Cyberblade/i1 support"
         depends on FB && PCI && X86_32 && !64BIT
@@ -1308,9 +1441,26 @@ config FB_TRIDENT_ACCEL
         This will compile the Trident frame buffer device with
         acceleration functions.
 
+config FB_ARK
+        tristate "ARK 2000PV support"
+        depends on FB && PCI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select FB_TILEBLITTING
+        select FB_SVGALIB
+        select VGASTATE
+        select FONT_8x16 if FRAMEBUFFER_CONSOLE
+        ---help---
+          Driver for PCI graphics boards with ARK 2000PV chip
+          and ICS 5342 RAMDAC.
+
 config FB_PM3
-        tristate "Permedia3 support"
-        depends on FB && PCI && BROKEN
+        tristate "Permedia3 support (EXPERIMENTAL)"
+        depends on FB && PCI && EXPERIMENTAL
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
         help
           This is the frame buffer device driver for the 3DLabs Permedia3
           chipset, used in Formac ProFormance III, 3DLabs Oxygen VX1 &
@@ -1385,7 +1535,7 @@ config FB_LEO
 
 config FB_XVR500
         bool "Sun XVR-500 3DLABS Wildcat support"
-        depends on FB && PCI && SPARC64
+        depends on (FB = y) && PCI && SPARC64
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -1398,7 +1548,7 @@ config FB_XVR500
 
 config FB_XVR2500
         bool "Sun XVR-2500 3DLABS Wildcat support"
-        depends on FB && PCI && SPARC64
+        depends on (FB = y) && PCI && SPARC64
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -1662,13 +1812,25 @@ config FB_PS3_DEFAULT_SIZE_M
           The default value can be overridden on the kernel command line
           using the "ps3fb" option (e.g. "ps3fb=9M");
 
-config FB_VIRTUAL
-        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
-        depends on FB
+config FB_XILINX
+        tristate "Xilinx frame buffer support"
+        depends on FB && XILINX_VIRTEX
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         ---help---
+          Include support for the Xilinx ML300/ML403 reference design
+          framebuffer. ML300 carries a 640*480 LCD display on the board,
+          ML403 uses a standard DB15 VGA connector.
+
+config FB_VIRTUAL
+        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
+        depends on FB
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        ---help---
           This is a `virtual' frame buffer device. It operates on a chunk of
           unswappable kernel memory instead of on the memory of a graphics
           board. This means you cannot see any output sent to this frame
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 558473d040d6..bd8b05229500 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -4,6 +4,7 @@
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_VGASTATE)            += vgastate.o
 obj-y                             += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
@@ -12,14 +13,19 @@ fb-objs                           := $(fb-y)
 
 obj-$(CONFIG_VT)                  += console/
 obj-$(CONFIG_LOGO)                += logo/
-obj-y                             += backlight/
+obj-y                             += backlight/ display/
 
 obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
 obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o
+obj-$(CONFIG_FB_SYS_FILLRECT)  += sysfillrect.o
+obj-$(CONFIG_FB_SYS_COPYAREA)  += syscopyarea.o
+obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o
+obj-$(CONFIG_FB_SYS_FOPS)      += fb_sys_fops.o
 obj-$(CONFIG_FB_SVGALIB)       += svgalib.o
 obj-$(CONFIG_FB_MACMODES)      += macmodes.o
 obj-$(CONFIG_FB_DDC)           += fb_ddc.o
+obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
 
 # Hardware specific drivers go first
 obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
@@ -30,7 +36,7 @@ obj-$(CONFIG_FB_PM2)              += pm2fb.o
 obj-$(CONFIG_FB_PM3)              += pm3fb.o
 
 obj-$(CONFIG_FB_MATROX)           += matrox/
-obj-$(CONFIG_FB_RIVA)             += riva/ vgastate.o
+obj-$(CONFIG_FB_RIVA)             += riva/
 obj-$(CONFIG_FB_NVIDIA)           += nvidia/
 obj-$(CONFIG_FB_ATY)              += aty/ macmodes.o
 obj-$(CONFIG_FB_ATY128)           += aty/ macmodes.o
@@ -40,8 +46,7 @@ obj-$(CONFIG_FB_KYRO)             += kyro/
 obj-$(CONFIG_FB_SAVAGE)           += savage/
 obj-$(CONFIG_FB_GEODE)            += geode/
 obj-$(CONFIG_FB_MBX)              += mbx/
-obj-$(CONFIG_FB_I810)             += vgastate.o
-obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o
+obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o
 obj-$(CONFIG_FB_3DFX)             += tdfxfb.o
 obj-$(CONFIG_FB_CONTROL)          += controlfb.o
 obj-$(CONFIG_FB_PLATINUM)         += platinumfb.o
@@ -49,9 +54,12 @@ obj-$(CONFIG_FB_VALKYRIE)         += valkyriefb.o
 obj-$(CONFIG_FB_CT65550)          += chipsfb.o
 obj-$(CONFIG_FB_IMSTT)            += imsttfb.o
 obj-$(CONFIG_FB_FM2)              += fm2fb.o
+obj-$(CONFIG_FB_VT8623)           += vt8623fb.o
 obj-$(CONFIG_FB_CYBLA)            += cyblafb.o
 obj-$(CONFIG_FB_TRIDENT)          += tridentfb.o
-obj-$(CONFIG_FB_S3)               += s3fb.o vgastate.o
+obj-$(CONFIG_FB_LE80578)          += vermilion/
+obj-$(CONFIG_FB_S3)               += s3fb.o
+obj-$(CONFIG_FB_ARK)              += arkfb.o
 obj-$(CONFIG_FB_STI)              += stifb.o
 obj-$(CONFIG_FB_FFB)              += ffb.o sbuslib.o
 obj-$(CONFIG_FB_CG6)              += cg6.o sbuslib.o
@@ -66,6 +74,7 @@ obj-$(CONFIG_FB_ACORN)            += acornfb.o
 obj-$(CONFIG_FB_ATARI)            += atafb.o c2p.o atafb_mfb.o \
                                      atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
 obj-$(CONFIG_FB_MAC)              += macfb.o
+obj-$(CONFIG_FB_HECUBA)           += hecubafb.o
 obj-$(CONFIG_FB_HGA)              += hgafb.o
 obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
 obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o
@@ -78,6 +87,7 @@ obj-$(CONFIG_FB_G364)             += g364fb.o
 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
 obj-$(CONFIG_FB_HIT)              += hitfb.o
 obj-$(CONFIG_FB_EPSON1355)        += epson1355fb.o
+obj-$(CONFIG_FB_ATMEL)            += atmel_lcdfb.o
 obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
 obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
 obj-$(CONFIG_FB_ARMCLCD)          += amba-clcd.o
@@ -102,11 +112,12 @@ obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
 obj-$(CONFIG_FB_IBM_GXT4500)      += gxt4500.o
 obj-$(CONFIG_FB_PS3)              += ps3fb.o
 obj-$(CONFIG_FB_SM501)            += sm501fb.o
+obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o
 obj-$(CONFIG_FB_IMAC)             += imacfb.o
-obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
+obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 
 # the test framebuffer is last
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 30a8369757e7..db15baca3f7b 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -262,7 +262,8 @@ static void arcfb_lcd_update_page(struct arcfb_par *par, unsigned int upper,
         ks108_set_yaddr(par, chipindex, upper/8);
 
         linesize = par->info->var.xres/8;
-        src = par->info->screen_base + (left/8) + (upper * linesize);
+        src = (unsigned char __force *) par->info->screen_base + (left/8) +
+                (upper * linesize);
         ks108_set_xaddr(par, chipindex, left);
 
         bitmask=1;
@@ -368,7 +369,7 @@ static void arcfb_fillrect(struct fb_info *info,
 {
         struct arcfb_par *par = info->par;
 
-        cfb_fillrect(info, rect);
+        sys_fillrect(info, rect);
 
         /* update the physical lcd */
         arcfb_lcd_update(par, rect->dx, rect->dy, rect->width, rect->height);
@@ -379,7 +380,7 @@ static void arcfb_copyarea(struct fb_info *info,
 {
         struct arcfb_par *par = info->par;
 
-        cfb_copyarea(info, area);
+        sys_copyarea(info, area);
 
         /* update the physical lcd */
         arcfb_lcd_update(par, area->dx, area->dy, area->width, area->height);
@@ -389,7 +390,7 @@ static void arcfb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct arcfb_par *par = info->par;
 
-        cfb_imageblit(info, image);
+        sys_imageblit(info, image);
 
         /* update the physical lcd */
         arcfb_lcd_update(par, image->dx, image->dy, image->width,
@@ -439,14 +440,11 @@ static int arcfb_ioctl(struct fb_info *info,
  * the fb. it's inefficient for them to do anything less than 64*8
  * writes since we update the lcd in each write() anyway.
  */
-static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t count,
-                                loff_t *ppos)
+static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
+                           size_t count, loff_t *ppos)
 {
         /* modded from epson 1355 */
 
-        struct inode *inode;
-        int fbidx;
-        struct fb_info *info;
         unsigned long p;
         int err=-EINVAL;
         unsigned int fbmemlength,x,y,w,h, bitppos, startpos, endpos, bitcount;
@@ -454,13 +452,6 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
         unsigned int xres;
 
         p = *ppos;
-        inode = file->f_path.dentry->d_inode;
-        fbidx = iminor(inode);
-        info = registered_fb[fbidx];
-
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
         par = info->par;
         xres = info->var.xres;
         fbmemlength = (xres * info->var.yres)/8;
@@ -477,7 +468,7 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
         if (count) {
                 char *base_addr;
 
-                base_addr = info->screen_base;
+                base_addr = (char __force *)info->screen_base;
                 count -= copy_from_user(base_addr + p, buf, count);
                 *ppos += count;
                 err = -EFAULT;
@@ -503,6 +494,7 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
 static struct fb_ops arcfb_ops = {
         .owner          = THIS_MODULE,
         .fb_open        = arcfb_open,
+        .fb_read        = fb_sys_read,
         .fb_write       = arcfb_write,
         .fb_release     = arcfb_release,
         .fb_pan_display = arcfb_pan_display,
@@ -603,7 +595,7 @@ static int arcfb_remove(struct platform_device *dev)
 
         if (info) {
                 unregister_framebuffer(info);
-                vfree(info->screen_base);
+                vfree((void __force *)info->screen_base);
                 framebuffer_release(info);
         }
         return 0;
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
new file mode 100644
index 000000000000..ba6fede5c466
--- /dev/null
+++ b/drivers/video/arkfb.c
@@ -0,0 +1,1200 @@
+/*
+ *  linux/drivers/video/arkfb.c -- Frame buffer device driver for ARK 2000PV
+ *  with ICS 5342 dac (it is easy to add support for different dacs).
+ *
+ *  Copyright (c) 2007 Ondrej Zajicek <santiago@crfreenet.org>
+ *
+ *  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.
+ *
+ *  Code is based on s3fb
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/svga.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/console.h> /* Why should fb driver call console functions? because acquire_console_sem() */
+#include <video/vga.h>
+
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
+
+struct arkfb_info {
+        int mclk_freq;
+        int mtrr_reg;
+
+        struct dac_info *dac;
+        struct vgastate state;
+        struct mutex open_lock;
+        unsigned int ref_count;
+        u32 pseudo_palette[16];
+};
+
+
+/* ------------------------------------------------------------------------- */
+
+
+static const struct svga_fb_format arkfb_formats[] = {
+        { 0,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 0,
+                FB_TYPE_TEXT, FB_AUX_TEXT_SVGA_STEP4,   FB_VISUAL_PSEUDOCOLOR, 8, 8},
+        { 4,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_PSEUDOCOLOR, 8, 16},
+        { 4,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 1,
+                FB_TYPE_INTERLEAVED_PLANES, 1,          FB_VISUAL_PSEUDOCOLOR, 8, 16},
+        { 8,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_PSEUDOCOLOR, 8, 8},
+        {16,  {10, 5, 0}, {5, 5, 0},  {0, 5, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 4, 4},
+        {16,  {11, 5, 0}, {5, 6, 0},  {0, 5, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 4, 4},
+        {24,  {16, 8, 0}, {8, 8, 0},  {0, 8, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 8, 8},
+        {32,  {16, 8, 0}, {8, 8, 0},  {0, 8, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 2, 2},
+        SVGA_FORMAT_END
+};
+
+
+/* CRT timing register sets */
+
+static const struct vga_regset ark_h_total_regs[]        = {{0x00, 0, 7}, {0x41, 7, 7}, VGA_REGSET_END};
+static const struct vga_regset ark_h_display_regs[]      = {{0x01, 0, 7}, {0x41, 6, 6}, VGA_REGSET_END};
+static const struct vga_regset ark_h_blank_start_regs[]  = {{0x02, 0, 7}, {0x41, 5, 5}, VGA_REGSET_END};
+static const struct vga_regset ark_h_blank_end_regs[]    = {{0x03, 0, 4}, {0x05, 7, 7   }, VGA_REGSET_END};
+static const struct vga_regset ark_h_sync_start_regs[]   = {{0x04, 0, 7}, {0x41, 4, 4}, VGA_REGSET_END};
+static const struct vga_regset ark_h_sync_end_regs[]     = {{0x05, 0, 4}, VGA_REGSET_END};
+
+static const struct vga_regset ark_v_total_regs[]        = {{0x06, 0, 7}, {0x07, 0, 0}, {0x07, 5, 5}, {0x40, 7, 7}, VGA_REGSET_END};
+static const struct vga_regset ark_v_display_regs[]      = {{0x12, 0, 7}, {0x07, 1, 1}, {0x07, 6, 6}, {0x40, 6, 6}, VGA_REGSET_END};
+static const struct vga_regset ark_v_blank_start_regs[]  = {{0x15, 0, 7}, {0x07, 3, 3}, {0x09, 5, 5}, {0x40, 5, 5}, VGA_REGSET_END};
+// const struct vga_regset ark_v_blank_end_regs[]    = {{0x16, 0, 6}, VGA_REGSET_END};
+static const struct vga_regset ark_v_blank_end_regs[]    = {{0x16, 0, 7}, VGA_REGSET_END};
+static const struct vga_regset ark_v_sync_start_regs[]   = {{0x10, 0, 7}, {0x07, 2, 2}, {0x07, 7, 7}, {0x40, 4, 4}, VGA_REGSET_END};
+static const struct vga_regset ark_v_sync_end_regs[]     = {{0x11, 0, 3}, VGA_REGSET_END};
+
+static const struct vga_regset ark_line_compare_regs[]   = {{0x18, 0, 7}, {0x07, 4, 4}, {0x09, 6, 6}, VGA_REGSET_END};
+static const struct vga_regset ark_start_address_regs[]  = {{0x0d, 0, 7}, {0x0c, 0, 7}, {0x40, 0, 2}, VGA_REGSET_END};
+static const struct vga_regset ark_offset_regs[]         = {{0x13, 0, 7}, {0x41, 3, 3}, VGA_REGSET_END};
+
+static const struct svga_timing_regs ark_timing_regs     = {
+        ark_h_total_regs, ark_h_display_regs, ark_h_blank_start_regs,
+        ark_h_blank_end_regs, ark_h_sync_start_regs, ark_h_sync_end_regs,
+        ark_v_total_regs, ark_v_display_regs, ark_v_blank_start_regs,
+        ark_v_blank_end_regs, ark_v_sync_start_regs, ark_v_sync_end_regs,
+};
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* Module parameters */
+
+static char *mode = "640x480-8@60";
+
+#ifdef CONFIG_MTRR
+static int mtrr = 1;
+#endif
+
+MODULE_AUTHOR("(c) 2007 Ondrej Zajicek <santiago@crfreenet.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("fbdev driver for ARK 2000PV");
+
+module_param(mode, charp, 0444);
+MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
+
+#ifdef CONFIG_MTRR
+module_param(mtrr, int, 0444);
+MODULE_PARM_DESC(mtrr, "Enable write-combining with MTRR (1=enable, 0=disable, default=1)");
+#endif
+
+static int threshold = 4;
+
+module_param(threshold, int, 0644);
+MODULE_PARM_DESC(threshold, "FIFO threshold");
+
+
+/* ------------------------------------------------------------------------- */
+
+
+static void arkfb_settile(struct fb_info *info, struct fb_tilemap *map)
+{
+        const u8 *font = map->data;
+        u8 __iomem *fb = (u8 __iomem *)info->screen_base;
+        int i, c;
+
+        if ((map->width != 8) || (map->height != 16) ||
+            (map->depth != 1) || (map->length != 256)) {
+                printk(KERN_ERR "fb%d: unsupported font parameters: width %d, "
+                       "height %d, depth %d, length %d\n", info->node,
+                       map->width, map->height, map->depth, map->length);
+                return;
+        }
+
+        fb += 2;
+        for (c = 0; c < map->length; c++) {
+                for (i = 0; i < map->height; i++) {
+                        fb_writeb(font[i], &fb[i * 4]);
+                        fb_writeb(font[i], &fb[i * 4 + (128 * 8)]);
+                }
+                fb += 128;
+
+                if ((c % 8) == 7)
+                        fb += 128*8;
+
+                font += map->height;
+        }
+}
+
+static struct fb_tile_ops arkfb_tile_ops = {
+        .fb_settile     = arkfb_settile,
+        .fb_tilecopy    = svga_tilecopy,
+        .fb_tilefill    = svga_tilefill,
+        .fb_tileblit    = svga_tileblit,
+        .fb_tilecursor  = svga_tilecursor,
+        .fb_get_tilemax = svga_get_tilemax,
+};
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* image data is MSB-first, fb structure is MSB-first too */
+static inline u32 expand_color(u32 c)
+{
+        return ((c & 1) | ((c & 2) << 7) | ((c & 4) << 14) | ((c & 8) << 21)) * 0xFF;
+}
+
+/* arkfb_iplan_imageblit silently assumes that almost everything is 8-pixel aligned */
+static void arkfb_iplan_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        u32 fg = expand_color(image->fg_color);
+        u32 bg = expand_color(image->bg_color);
+        const u8 *src1, *src;
+        u8 __iomem *dst1;
+        u32 __iomem *dst;
+        u32 val;
+        int x, y;
+
+        src1 = image->data;
+        dst1 = info->screen_base + (image->dy * info->fix.line_length)
+                 + ((image->dx / 8) * 4);
+
+        for (y = 0; y < image->height; y++) {
+                src = src1;
+                dst = (u32 __iomem *) dst1;
+                for (x = 0; x < image->width; x += 8) {
+                        val = *(src++) * 0x01010101;
+                        val = (val & fg) | (~val & bg);
+                        fb_writel(val, dst++);
+                }
+                src1 += image->width / 8;
+                dst1 += info->fix.line_length;
+        }
+
+}
+
+/* arkfb_iplan_fillrect silently assumes that almost everything is 8-pixel aligned */
+static void arkfb_iplan_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        u32 fg = expand_color(rect->color);
+        u8 __iomem *dst1;
+        u32 __iomem *dst;
+        int x, y;
+
+        dst1 = info->screen_base + (rect->dy * info->fix.line_length)
+                 + ((rect->dx / 8) * 4);
+
+        for (y = 0; y < rect->height; y++) {
+                dst = (u32 __iomem *) dst1;
+                for (x = 0; x < rect->width; x += 8) {
+                        fb_writel(fg, dst++);
+                }
+                dst1 += info->fix.line_length;
+        }
+
+}
+
+
+/* image data is MSB-first, fb structure is high-nibble-in-low-byte-first */
+static inline u32 expand_pixel(u32 c)
+{
+        return (((c &  1) << 24) | ((c &  2) << 27) | ((c &  4) << 14) | ((c &   8) << 17) |
+                ((c & 16) <<  4) | ((c & 32) <<  7) | ((c & 64) >>  6) | ((c & 128) >>  3)) * 0xF;
+}
+
+/* arkfb_cfb4_imageblit silently assumes that almost everything is 8-pixel aligned */
+static void arkfb_cfb4_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        u32 fg = image->fg_color * 0x11111111;
+        u32 bg = image->bg_color * 0x11111111;
+        const u8 *src1, *src;
+        u8 __iomem *dst1;
+        u32 __iomem *dst;
+        u32 val;
+        int x, y;
+
+        src1 = image->data;
+        dst1 = info->screen_base + (image->dy * info->fix.line_length)
+                 + ((image->dx / 8) * 4);
+
+        for (y = 0; y < image->height; y++) {
+                src = src1;
+                dst = (u32 __iomem *) dst1;
+                for (x = 0; x < image->width; x += 8) {
+                        val = expand_pixel(*(src++));
+                        val = (val & fg) | (~val & bg);
+                        fb_writel(val, dst++);
+                }
+                src1 += image->width / 8;
+                dst1 += info->fix.line_length;
+        }
+
+}
+
+static void arkfb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        if ((info->var.bits_per_pixel == 4) && (image->depth == 1)
+            && ((image->width % 8) == 0) && ((image->dx % 8) == 0)) {
+                if (info->fix.type == FB_TYPE_INTERLEAVED_PLANES)
+                        arkfb_iplan_imageblit(info, image);
+                else
+                        arkfb_cfb4_imageblit(info, image);
+        } else
+                cfb_imageblit(info, image);
+}
+
+static void arkfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        if ((info->var.bits_per_pixel == 4)
+            && ((rect->width % 8) == 0) && ((rect->dx % 8) == 0)
+            && (info->fix.type == FB_TYPE_INTERLEAVED_PLANES))
+                arkfb_iplan_fillrect(info, rect);
+         else
+                cfb_fillrect(info, rect);
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+enum
+{
+        DAC_PSEUDO8_8,
+        DAC_RGB1555_8,
+        DAC_RGB0565_8,
+        DAC_RGB0888_8,
+        DAC_RGB8888_8,
+        DAC_PSEUDO8_16,
+        DAC_RGB1555_16,
+        DAC_RGB0565_16,
+        DAC_RGB0888_16,
+        DAC_RGB8888_16,
+        DAC_MAX
+};
+
+struct dac_ops {
+        int (*dac_get_mode)(struct dac_info *info);
+        int (*dac_set_mode)(struct dac_info *info, int mode);
+        int (*dac_get_freq)(struct dac_info *info, int channel);
+        int (*dac_set_freq)(struct dac_info *info, int channel, u32 freq);
+        void (*dac_release)(struct dac_info *info);
+};
+
+typedef void (*dac_read_regs_t)(void *data, u8 *code, int count);
+typedef void (*dac_write_regs_t)(void *data, u8 *code, int count);
+
+struct dac_info
+{
+        struct dac_ops *dacops;
+        dac_read_regs_t dac_read_regs;
+        dac_write_regs_t dac_write_regs;
+        void *data;
+};
+
+
+static inline u8 dac_read_reg(struct dac_info *info, u8 reg)
+{
+        u8 code[2] = {reg, 0};
+        info->dac_read_regs(info->data, code, 1);
+        return code[1];
+}
+
+static inline void dac_read_regs(struct dac_info *info, u8 *code, int count)
+{
+        info->dac_read_regs(info->data, code, count);
+}
+
+static inline void dac_write_reg(struct dac_info *info, u8 reg, u8 val)
+{
+        u8 code[2] = {reg, val};
+        info->dac_write_regs(info->data, code, 1);
+}
+
+static inline void dac_write_regs(struct dac_info *info, u8 *code, int count)
+{
+        info->dac_write_regs(info->data, code, count);
+}
+
+static inline int dac_set_mode(struct dac_info *info, int mode)
+{
+        return info->dacops->dac_set_mode(info, mode);
+}
+
+static inline int dac_set_freq(struct dac_info *info, int channel, u32 freq)
+{
+        return info->dacops->dac_set_freq(info, channel, freq);
+}
+
+static inline void dac_release(struct dac_info *info)
+{
+        info->dacops->dac_release(info);
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* ICS5342 DAC */
+
+struct ics5342_info
+{
+        struct dac_info dac;
+        u8 mode;
+};
+
+#define DAC_PAR(info) ((struct ics5342_info *) info)
+
+/* LSB is set to distinguish unused slots */
+static const u8 ics5342_mode_table[DAC_MAX] = {
+        [DAC_PSEUDO8_8]  = 0x01, [DAC_RGB1555_8]  = 0x21, [DAC_RGB0565_8]  = 0x61,
+        [DAC_RGB0888_8]  = 0x41, [DAC_PSEUDO8_16] = 0x11, [DAC_RGB1555_16] = 0x31,
+        [DAC_RGB0565_16] = 0x51, [DAC_RGB0888_16] = 0x91, [DAC_RGB8888_16] = 0x71
+};
+
+static int ics5342_set_mode(struct dac_info *info, int mode)
+{
+        u8 code;
+
+        if (mode >= DAC_MAX)
+                return -EINVAL;
+
+        code = ics5342_mode_table[mode];
+
+        if (! code)
+                return -EINVAL;
+
+        dac_write_reg(info, 6, code & 0xF0);
+        DAC_PAR(info)->mode = mode;
+
+        return 0;
+}
+
+static const struct svga_pll ics5342_pll = {3, 129, 3, 33, 0, 3,
+        60000, 250000, 14318};
+
+/* pd4 - allow only posdivider 4 (r=2) */
+static const struct svga_pll ics5342_pll_pd4 = {3, 129, 3, 33, 2, 2,
+        60000, 335000, 14318};
+
+/* 270 MHz should be upper bound for VCO clock according to specs,
+   but that is too restrictive in pd4 case */
+
+static int ics5342_set_freq(struct dac_info *info, int channel, u32 freq)
+{
+        u16 m, n, r;
+
+        /* only postdivider 4 (r=2) is valid in mode DAC_PSEUDO8_16 */
+        int rv = svga_compute_pll((DAC_PAR(info)->mode == DAC_PSEUDO8_16)
+                                  ? &ics5342_pll_pd4 : &ics5342_pll,
+                                  freq, &m, &n, &r, 0);
+
+        if (rv < 0) {
+                return -EINVAL;
+        } else {
+                u8 code[6] = {4, 3, 5, m-2, 5, (n-2) | (r << 5)};
+                dac_write_regs(info, code, 3);
+                return 0;
+        }
+}
+
+static void ics5342_release(struct dac_info *info)
+{
+        ics5342_set_mode(info, DAC_PSEUDO8_8);
+        kfree(info);
+}
+
+static struct dac_ops ics5342_ops = {
+        .dac_set_mode   = ics5342_set_mode,
+        .dac_set_freq   = ics5342_set_freq,
+        .dac_release    = ics5342_release
+};
+
+
+static struct dac_info * ics5342_init(dac_read_regs_t drr, dac_write_regs_t dwr, void *data)
+{
+        struct dac_info *info = kzalloc(sizeof(struct ics5342_info), GFP_KERNEL);
+
+        if (! info)
+                return NULL;
+
+        info->dacops = &ics5342_ops;
+        info->dac_read_regs = drr;
+        info->dac_write_regs = dwr;
+        info->data = data;
+        DAC_PAR(info)->mode = DAC_PSEUDO8_8; /* estimation */
+        return info;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+static unsigned short dac_regs[4] = {0x3c8, 0x3c9, 0x3c6, 0x3c7};
+
+static void ark_dac_read_regs(void *data, u8 *code, int count)
+{
+        u8 regval = vga_rseq(NULL, 0x1C);
+
+        while (count != 0)
+        {
+                vga_wseq(NULL, 0x1C, regval | (code[0] & 4) ? 0x80 : 0);
+                code[1] = vga_r(NULL, dac_regs[code[0] & 3]);
+                count--;
+                code += 2;
+        }
+
+        vga_wseq(NULL, 0x1C, regval);
+}
+
+static void ark_dac_write_regs(void *data, u8 *code, int count)
+{
+        u8 regval = vga_rseq(NULL, 0x1C);
+
+        while (count != 0)
+        {
+                vga_wseq(NULL, 0x1C, regval | (code[0] & 4) ? 0x80 : 0);
+                vga_w(NULL, dac_regs[code[0] & 3], code[1]);
+                count--;
+                code += 2;
+        }
+
+        vga_wseq(NULL, 0x1C, regval);
+}
+
+
+static void ark_set_pixclock(struct fb_info *info, u32 pixclock)
+{
+        struct arkfb_info *par = info->par;
+        u8 regval;
+
+        int rv = dac_set_freq(par->dac, 0, 1000000000 / pixclock);
+        if (rv < 0) {
+                printk(KERN_ERR "fb%d: cannot set requested pixclock, keeping old value\n", info->node);
+                return;
+        }
+
+        /* Set VGA misc register  */
+        regval = vga_r(NULL, VGA_MIS_R);
+        vga_w(NULL, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD);
+}
+
+
+/* Open framebuffer */
+
+static int arkfb_open(struct fb_info *info, int user)
+{
+        struct arkfb_info *par = info->par;
+
+        mutex_lock(&(par->open_lock));
+        if (par->ref_count == 0) {
+                memset(&(par->state), 0, sizeof(struct vgastate));
+                par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS | VGA_SAVE_CMAP;
+                par->state.num_crtc = 0x60;
+                par->state.num_seq = 0x30;
+                save_vga(&(par->state));
+        }
+
+        par->ref_count++;
+        mutex_unlock(&(par->open_lock));
+
+        return 0;
+}
+
+/* Close framebuffer */
+
+static int arkfb_release(struct fb_info *info, int user)
+{
+        struct arkfb_info *par = info->par;
+
+        mutex_lock(&(par->open_lock));
+        if (par->ref_count == 0) {
+                mutex_unlock(&(par->open_lock));
+                return -EINVAL;
+        }
+
+        if (par->ref_count == 1) {
+                restore_vga(&(par->state));
+                dac_set_mode(par->dac, DAC_PSEUDO8_8);
+        }
+
+        par->ref_count--;
+        mutex_unlock(&(par->open_lock));
+
+        return 0;
+}
+
+/* Validate passed in var */
+
+static int arkfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        int rv, mem, step;
+
+        /* Find appropriate format */
+        rv = svga_match_format (arkfb_formats, var, NULL);
+        if (rv < 0)
+        {
+                printk(KERN_ERR "fb%d: unsupported mode requested\n", info->node);
+                return rv;
+        }
+
+        /* Do not allow to have real resoulution larger than virtual */
+        if (var->xres > var->xres_virtual)
+                var->xres_virtual = var->xres;
+
+        if (var->yres > var->yres_virtual)
+                var->yres_virtual = var->yres;
+
+        /* Round up xres_virtual to have proper alignment of lines */
+        step = arkfb_formats[rv].xresstep - 1;
+        var->xres_virtual = (var->xres_virtual+step) & ~step;
+
+
+        /* Check whether have enough memory */
+        mem = ((var->bits_per_pixel * var->xres_virtual) >> 3) * var->yres_virtual;
+        if (mem > info->screen_size)
+        {
+                printk(KERN_ERR "fb%d: not enough framebuffer memory (%d kB requested , %d kB available)\n", info->node, mem >> 10, (unsigned int) (info->screen_size >> 10));
+                return -EINVAL;
+        }
+
+        rv = svga_check_timings (&ark_timing_regs, var, info->node);
+        if (rv < 0)
+        {
+                printk(KERN_ERR "fb%d: invalid timings requested\n", info->node);
+                return rv;
+        }
+
+        /* Interlaced mode is broken */
+        if (var->vmode & FB_VMODE_INTERLACED)
+                return -EINVAL;
+
+        return 0;
+}
+
+/* Set video mode from par */
+
+static int arkfb_set_par(struct fb_info *info)
+{
+        struct arkfb_info *par = info->par;
+        u32 value, mode, hmul, hdiv, offset_value, screen_size;
+        u32 bpp = info->var.bits_per_pixel;
+        u8 regval;
+
+        if (bpp != 0) {
+                info->fix.ypanstep = 1;
+                info->fix.line_length = (info->var.xres_virtual * bpp) / 8;
+
+                info->flags &= ~FBINFO_MISC_TILEBLITTING;
+                info->tileops = NULL;
+
+                /* in 4bpp supports 8p wide tiles only, any tiles otherwise */
+                info->pixmap.blit_x = (bpp == 4) ? (1 << (8 - 1)) : (~(u32)0);
+                info->pixmap.blit_y = ~(u32)0;
+
+                offset_value = (info->var.xres_virtual * bpp) / 64;
+                screen_size = info->var.yres_virtual * info->fix.line_length;
+        } else {
+                info->fix.ypanstep = 16;
+                info->fix.line_length = 0;
+
+                info->flags |= FBINFO_MISC_TILEBLITTING;
+                info->tileops = &arkfb_tile_ops;
+
+                /* supports 8x16 tiles only */
+                info->pixmap.blit_x = 1 << (8 - 1);
+                info->pixmap.blit_y = 1 << (16 - 1);
+
+                offset_value = info->var.xres_virtual / 16;
+                screen_size = (info->var.xres_virtual * info->var.yres_virtual) / 64;
+        }
+
+        info->var.xoffset = 0;
+        info->var.yoffset = 0;
+        info->var.activate = FB_ACTIVATE_NOW;
+
+        /* Unlock registers */
+        svga_wcrt_mask(0x11, 0x00, 0x80);
+
+        /* Blank screen and turn off sync */
+        svga_wseq_mask(0x01, 0x20, 0x20);
+        svga_wcrt_mask(0x17, 0x00, 0x80);
+
+        /* Set default values */
+        svga_set_default_gfx_regs();
+        svga_set_default_atc_regs();
+        svga_set_default_seq_regs();
+        svga_set_default_crt_regs();
+        svga_wcrt_multi(ark_line_compare_regs, 0xFFFFFFFF);
+        svga_wcrt_multi(ark_start_address_regs, 0);
+
+        /* ARK specific initialization */
+        svga_wseq_mask(0x10, 0x1F, 0x1F); /* enable linear framebuffer and full memory access */
+        svga_wseq_mask(0x12, 0x03, 0x03); /* 4 MB linear framebuffer size */
+
+        vga_wseq(NULL, 0x13, info->fix.smem_start >> 16);
+        vga_wseq(NULL, 0x14, info->fix.smem_start >> 24);
+        vga_wseq(NULL, 0x15, 0);
+        vga_wseq(NULL, 0x16, 0);
+
+        /* Set the FIFO threshold register */
+        /* It is fascinating way to store 5-bit value in 8-bit register */
+        regval = 0x10 | ((threshold & 0x0E) >> 1) | (threshold & 0x01) << 7 | (threshold & 0x10) << 1;
+        vga_wseq(NULL, 0x18, regval);
+
+        /* Set the offset register */
+        pr_debug("fb%d: offset register       : %d\n", info->node, offset_value);
+        svga_wcrt_multi(ark_offset_regs, offset_value);
+
+        /* fix for hi-res textmode */
+        svga_wcrt_mask(0x40, 0x08, 0x08);
+
+        if (info->var.vmode & FB_VMODE_DOUBLE)
+                svga_wcrt_mask(0x09, 0x80, 0x80);
+        else
+                svga_wcrt_mask(0x09, 0x00, 0x80);
+
+        if (info->var.vmode & FB_VMODE_INTERLACED)
+                svga_wcrt_mask(0x44, 0x04, 0x04);
+        else
+                svga_wcrt_mask(0x44, 0x00, 0x04);
+
+        hmul = 1;
+        hdiv = 1;
+        mode = svga_match_format(arkfb_formats, &(info->var), &(info->fix));
+
+        /* Set mode-specific register values */
+        switch (mode) {
+        case 0:
+                pr_debug("fb%d: text mode\n", info->node);
+                svga_set_textmode_vga_regs();
+
+                vga_wseq(NULL, 0x11, 0x10); /* basic VGA mode */
+                svga_wcrt_mask(0x46, 0x00, 0x04); /* 8bit pixel path */
+                dac_set_mode(par->dac, DAC_PSEUDO8_8);
+
+                break;
+        case 1:
+                pr_debug("fb%d: 4 bit pseudocolor\n", info->node);
+                vga_wgfx(NULL, VGA_GFX_MODE, 0x40);
+
+                vga_wseq(NULL, 0x11, 0x10); /* basic VGA mode */
+                svga_wcrt_mask(0x46, 0x00, 0x04); /* 8bit pixel path */
+                dac_set_mode(par->dac, DAC_PSEUDO8_8);
+                break;
+        case 2:
+                pr_debug("fb%d: 4 bit pseudocolor, planar\n", info->node);
+
+                vga_wseq(NULL, 0x11, 0x10); /* basic VGA mode */
+                svga_wcrt_mask(0x46, 0x00, 0x04); /* 8bit pixel path */
+                dac_set_mode(par->dac, DAC_PSEUDO8_8);
+                break;
+        case 3:
+                pr_debug("fb%d: 8 bit pseudocolor\n", info->node);
+
+                vga_wseq(NULL, 0x11, 0x16); /* 8bpp accel mode */
+
+                if (info->var.pixclock > 20000) {
+                        pr_debug("fb%d: not using multiplex\n", info->node);
+                        svga_wcrt_mask(0x46, 0x00, 0x04); /* 8bit pixel path */
+                        dac_set_mode(par->dac, DAC_PSEUDO8_8);
+                } else {
+                        pr_debug("fb%d: using multiplex\n", info->node);
+                        svga_wcrt_mask(0x46, 0x04, 0x04); /* 16bit pixel path */
+                        dac_set_mode(par->dac, DAC_PSEUDO8_16);
+                        hdiv = 2;
+                }
+                break;
+        case 4:
+                pr_debug("fb%d: 5/5/5 truecolor\n", info->node);
+
+                vga_wseq(NULL, 0x11, 0x1A); /* 16bpp accel mode */
+                svga_wcrt_mask(0x46, 0x04, 0x04); /* 16bit pixel path */
+                dac_set_mode(par->dac, DAC_RGB1555_16);
+                break;
+        case 5:
+                pr_debug("fb%d: 5/6/5 truecolor\n", info->node);
+
+                vga_wseq(NULL, 0x11, 0x1A); /* 16bpp accel mode */
+                svga_wcrt_mask(0x46, 0x04, 0x04); /* 16bit pixel path */
+                dac_set_mode(par->dac, DAC_RGB0565_16);
+                break;
+        case 6:
+                pr_debug("fb%d: 8/8/8 truecolor\n", info->node);
+
+                vga_wseq(NULL, 0x11, 0x16); /* 8bpp accel mode ??? */
+                svga_wcrt_mask(0x46, 0x04, 0x04); /* 16bit pixel path */
+                dac_set_mode(par->dac, DAC_RGB0888_16);
+                hmul = 3;
+                hdiv = 2;
+                break;
+        case 7:
+                pr_debug("fb%d: 8/8/8/8 truecolor\n", info->node);
+
+                vga_wseq(NULL, 0x11, 0x1E); /* 32bpp accel mode */
+                svga_wcrt_mask(0x46, 0x04, 0x04); /* 16bit pixel path */
+                dac_set_mode(par->dac, DAC_RGB8888_16);
+                hmul = 2;
+                break;
+        default:
+                printk(KERN_ERR "fb%d: unsupported mode - bug\n", info->node);
+                return -EINVAL;
+        }
+
+        ark_set_pixclock(info, (hdiv * info->var.pixclock) / hmul);
+        svga_set_timings(&ark_timing_regs, &(info->var), hmul, hdiv,
+                         (info->var.vmode & FB_VMODE_DOUBLE)     ? 2 : 1,
+                         (info->var.vmode & FB_VMODE_INTERLACED) ? 2 : 1,
+                          hmul, info->node);
+
+        /* Set interlaced mode start/end register */
+        value = info->var.xres + info->var.left_margin + info->var.right_margin + info->var.hsync_len;
+        value = ((value * hmul / hdiv) / 8) - 5;
+        vga_wcrt(NULL, 0x42, (value + 1) / 2);
+
+        memset_io(info->screen_base, 0x00, screen_size);
+        /* Device and screen back on */
+        svga_wcrt_mask(0x17, 0x80, 0x80);
+        svga_wseq_mask(0x01, 0x00, 0x20);
+
+        return 0;
+}
+
+/* Set a colour register */
+
+static int arkfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                                u_int transp, struct fb_info *fb)
+{
+        switch (fb->var.bits_per_pixel) {
+        case 0:
+        case 4:
+                if (regno >= 16)
+                        return -EINVAL;
+
+                if ((fb->var.bits_per_pixel == 4) &&
+                    (fb->var.nonstd == 0)) {
+                        outb(0xF0, VGA_PEL_MSK);
+                        outb(regno*16, VGA_PEL_IW);
+                } else {
+                        outb(0x0F, VGA_PEL_MSK);
+                        outb(regno, VGA_PEL_IW);
+                }
+                outb(red >> 10, VGA_PEL_D);
+                outb(green >> 10, VGA_PEL_D);
+                outb(blue >> 10, VGA_PEL_D);
+                break;
+        case 8:
+                if (regno >= 256)
+                        return -EINVAL;
+
+                outb(0xFF, VGA_PEL_MSK);
+                outb(regno, VGA_PEL_IW);
+                outb(red >> 10, VGA_PEL_D);
+                outb(green >> 10, VGA_PEL_D);
+                outb(blue >> 10, VGA_PEL_D);
+                break;
+        case 16:
+                if (regno >= 16)
+                        return 0;
+
+                if (fb->var.green.length == 5)
+                        ((u32*)fb->pseudo_palette)[regno] = ((red & 0xF800) >> 1) |
+                                ((green & 0xF800) >> 6) | ((blue & 0xF800) >> 11);
+                else if (fb->var.green.length == 6)
+                        ((u32*)fb->pseudo_palette)[regno] = (red & 0xF800) |
+                                ((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11);
+                else
+                        return -EINVAL;
+                break;
+        case 24:
+        case 32:
+                if (regno >= 16)
+                        return 0;
+
+                ((u32*)fb->pseudo_palette)[regno] = ((red & 0xFF00) << 8) |
+                        (green & 0xFF00) | ((blue & 0xFF00) >> 8);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* Set the display blanking state */
+
+static int arkfb_blank(int blank_mode, struct fb_info *info)
+{
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                pr_debug("fb%d: unblank\n", info->node);
+                svga_wseq_mask(0x01, 0x00, 0x20);
+                svga_wcrt_mask(0x17, 0x80, 0x80);
+                break;
+        case FB_BLANK_NORMAL:
+                pr_debug("fb%d: blank\n", info->node);
+                svga_wseq_mask(0x01, 0x20, 0x20);
+                svga_wcrt_mask(0x17, 0x80, 0x80);
+                break;
+        case FB_BLANK_POWERDOWN:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_VSYNC_SUSPEND:
+                pr_debug("fb%d: sync down\n", info->node);
+                svga_wseq_mask(0x01, 0x20, 0x20);
+                svga_wcrt_mask(0x17, 0x00, 0x80);
+                break;
+        }
+        return 0;
+}
+
+
+/* Pan the display */
+
+static int arkfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        unsigned int offset;
+
+        /* Calculate the offset */
+        if (var->bits_per_pixel == 0) {
+                offset = (var->yoffset / 16) * (var->xres_virtual / 2) + (var->xoffset / 2);
+                offset = offset >> 2;
+        } else {
+                offset = (var->yoffset * info->fix.line_length) +
+                         (var->xoffset * var->bits_per_pixel / 8);
+                offset = offset >> ((var->bits_per_pixel == 4) ? 2 : 3);
+        }
+
+        /* Set the offset */
+        svga_wcrt_multi(ark_start_address_regs, offset);
+
+        return 0;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* Frame buffer operations */
+
+static struct fb_ops arkfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_open        = arkfb_open,
+        .fb_release     = arkfb_release,
+        .fb_check_var   = arkfb_check_var,
+        .fb_set_par     = arkfb_set_par,
+        .fb_setcolreg   = arkfb_setcolreg,
+        .fb_blank       = arkfb_blank,
+        .fb_pan_display = arkfb_pan_display,
+        .fb_fillrect    = arkfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = arkfb_imageblit,
+        .fb_get_caps    = svga_get_caps,
+};
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* PCI probe */
+static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+        struct fb_info *info;
+        struct arkfb_info *par;
+        int rc;
+        u8 regval;
+
+        /* Ignore secondary VGA device because there is no VGA arbitration */
+        if (! svga_primary_device(dev)) {
+                dev_info(&(dev->dev), "ignoring secondary device\n");
+                return -ENODEV;
+        }
+
+        /* Allocate and fill driver data structure */
+        info = framebuffer_alloc(sizeof(struct arkfb_info), NULL);
+        if (! info) {
+                dev_err(&(dev->dev), "cannot allocate memory\n");
+                return -ENOMEM;
+        }
+
+        par = info->par;
+        mutex_init(&par->open_lock);
+
+        info->flags = FBINFO_PARTIAL_PAN_OK | FBINFO_HWACCEL_YPAN;
+        info->fbops = &arkfb_ops;
+
+        /* Prepare PCI device */
+        rc = pci_enable_device(dev);
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot enable PCI device\n");
+                goto err_enable_device;
+        }
+
+        rc = pci_request_regions(dev, "arkfb");
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot reserve framebuffer region\n");
+                goto err_request_regions;
+        }
+
+        par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info);
+        if (! par->dac) {
+                rc = -ENOMEM;
+                dev_err(&(dev->dev), "RAMDAC initialization failed\n");
+                goto err_dac;
+        }
+
+        info->fix.smem_start = pci_resource_start(dev, 0);
+        info->fix.smem_len = pci_resource_len(dev, 0);
+
+        /* Map physical IO memory address into kernel space */
+        info->screen_base = pci_iomap(dev, 0, 0);
+        if (! info->screen_base) {
+                rc = -ENOMEM;
+                dev_err(&(dev->dev), "iomap for framebuffer failed\n");
+                goto err_iomap;
+        }
+
+        /* FIXME get memsize */
+        regval = vga_rseq(NULL, 0x10);
+        info->screen_size = (1 << (regval >> 6)) << 20;
+        info->fix.smem_len = info->screen_size;
+
+        strcpy(info->fix.id, "ARK 2000PV");
+        info->fix.mmio_start = 0;
+        info->fix.mmio_len = 0;
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+        info->fix.ypanstep = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->pseudo_palette = (void*) (par->pseudo_palette);
+
+        /* Prepare startup mode */
+        rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
+        if (! ((rc == 1) || (rc == 2))) {
+                rc = -EINVAL;
+                dev_err(&(dev->dev), "mode %s not found\n", mode);
+                goto err_find_mode;
+        }
+
+        rc = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot allocate colormap\n");
+                goto err_alloc_cmap;
+        }
+
+        rc = register_framebuffer(info);
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot register framebugger\n");
+                goto err_reg_fb;
+        }
+
+        printk(KERN_INFO "fb%d: %s on %s, %d MB RAM\n", info->node, info->fix.id,
+                 pci_name(dev), info->fix.smem_len >> 20);
+
+        /* Record a reference to the driver data */
+        pci_set_drvdata(dev, info);
+
+#ifdef CONFIG_MTRR
+        if (mtrr) {
+                par->mtrr_reg = -1;
+                par->mtrr_reg = mtrr_add(info->fix.smem_start, info->fix.smem_len, MTRR_TYPE_WRCOMB, 1);
+        }
+#endif
+
+        return 0;
+
+        /* Error handling */
+err_reg_fb:
+        fb_dealloc_cmap(&info->cmap);
+err_alloc_cmap:
+err_find_mode:
+        pci_iounmap(dev, info->screen_base);
+err_iomap:
+        dac_release(par->dac);
+err_dac:
+        pci_release_regions(dev);
+err_request_regions:
+/*      pci_disable_device(dev); */
+err_enable_device:
+        framebuffer_release(info);
+        return rc;
+}
+
+/* PCI remove */
+
+static void __devexit ark_pci_remove(struct pci_dev *dev)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct arkfb_info *par = info->par;
+
+        if (info) {
+#ifdef CONFIG_MTRR
+                if (par->mtrr_reg >= 0) {
+                        mtrr_del(par->mtrr_reg, 0, 0);
+                        par->mtrr_reg = -1;
+                }
+#endif
+
+                dac_release(par->dac);
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
+
+                pci_iounmap(dev, info->screen_base);
+                pci_release_regions(dev);
+/*              pci_disable_device(dev); */
+
+                pci_set_drvdata(dev, NULL);
+                framebuffer_release(info);
+        }
+}
+
+
+#ifdef CONFIG_PM
+/* PCI suspend */
+
+static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct arkfb_info *par = info->par;
+
+        dev_info(&(dev->dev), "suspend\n");
+
+        acquire_console_sem();
+        mutex_lock(&(par->open_lock));
+
+        if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) {
+                mutex_unlock(&(par->open_lock));
+                release_console_sem();
+                return 0;
+        }
+
+        fb_set_suspend(info, 1);
+
+        pci_save_state(dev);
+        pci_disable_device(dev);
+        pci_set_power_state(dev, pci_choose_state(dev, state));
+
+        mutex_unlock(&(par->open_lock));
+        release_console_sem();
+
+        return 0;
+}
+
+
+/* PCI resume */
+
+static int ark_pci_resume (struct pci_dev* dev)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct arkfb_info *par = info->par;
+
+        dev_info(&(dev->dev), "resume\n");
+
+        acquire_console_sem();
+        mutex_lock(&(par->open_lock));
+
+        if (par->ref_count == 0) {
+                mutex_unlock(&(par->open_lock));
+                release_console_sem();
+                return 0;
+        }
+
+        pci_set_power_state(dev, PCI_D0);
+        pci_restore_state(dev);
+
+        if (pci_enable_device(dev))
+                goto fail;
+
+        pci_set_master(dev);
+
+        arkfb_set_par(info);
+        fb_set_suspend(info, 0);
+
+        mutex_unlock(&(par->open_lock));
+fail:
+        release_console_sem();
+        return 0;
+}
+#else
+#define ark_pci_suspend NULL
+#define ark_pci_resume NULL
+#endif /* CONFIG_PM */
+
+/* List of boards that we are trying to support */
+
+static struct pci_device_id ark_devices[] __devinitdata = {
+        {PCI_DEVICE(0xEDD8, 0xA099)},
+        {0, 0, 0, 0, 0, 0, 0}
+};
+
+
+MODULE_DEVICE_TABLE(pci, ark_devices);
+
+static struct pci_driver arkfb_pci_driver = {
+        .name           = "arkfb",
+        .id_table       = ark_devices,
+        .probe          = ark_pci_probe,
+        .remove         = __devexit_p(ark_pci_remove),
+        .suspend        = ark_pci_suspend,
+        .resume         = ark_pci_resume,
+};
+
+/* Cleanup */
+
+static void __exit arkfb_cleanup(void)
+{
+        pr_debug("arkfb: cleaning up\n");
+        pci_unregister_driver(&arkfb_pci_driver);
+}
+
+/* Driver Initialisation */
+
+static int __init arkfb_init(void)
+{
+
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("arkfb", &option))
+                return -ENODEV;
+
+        if (option && *option)
+                mode = option;
+#endif
+
+        pr_debug("arkfb: initializing\n");
+        return pci_register_driver(&arkfb_pci_driver);
+}
+
+module_init(arkfb_init);
+module_exit(arkfb_cleanup);
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
new file mode 100644
index 000000000000..e1d5bd0c98c4
--- /dev/null
+++ b/drivers/video/atmel_lcdfb.c
@@ -0,0 +1,752 @@
+/*
+ *  Driver for AT91/AT32 LCD Controller
+ *
+ *  Copyright (C) 2007 Atmel Corporation
+ *
+ * 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/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+
+#include <asm/arch/board.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/gpio.h>
+
+#include <video/atmel_lcdc.h>
+
+#define lcdc_readl(sinfo, reg)          __raw_readl((sinfo)->mmio+(reg))
+#define lcdc_writel(sinfo, reg, val)    __raw_writel((val), (sinfo)->mmio+(reg))
+
+/* configurable parameters */
+#define ATMEL_LCDC_CVAL_DEFAULT         0xc8
+#define ATMEL_LCDC_DMA_BURST_LEN        8
+
+#if defined(CONFIG_ARCH_AT91SAM9263)
+#define ATMEL_LCDC_FIFO_SIZE            2048
+#else
+#define ATMEL_LCDC_FIFO_SIZE            512
+#endif
+
+#if defined(CONFIG_ARCH_AT91)
+#define ATMEL_LCDFB_FBINFO_DEFAULT      FBINFO_DEFAULT
+
+static inline void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo,
+                                        struct fb_var_screeninfo *var)
+{
+
+}
+#elif defined(CONFIG_AVR32)
+#define ATMEL_LCDFB_FBINFO_DEFAULT      (FBINFO_DEFAULT \
+                                        | FBINFO_PARTIAL_PAN_OK \
+                                        | FBINFO_HWACCEL_XPAN \
+                                        | FBINFO_HWACCEL_YPAN)
+
+static void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo,
+                                     struct fb_var_screeninfo *var)
+{
+        u32 dma2dcfg;
+        u32 pixeloff;
+
+        pixeloff = (var->xoffset * var->bits_per_pixel) & 0x1f;
+
+        dma2dcfg = ((var->xres_virtual - var->xres) * var->bits_per_pixel) / 8;
+        dma2dcfg |= pixeloff << ATMEL_LCDC_PIXELOFF_OFFSET;
+        lcdc_writel(sinfo, ATMEL_LCDC_DMA2DCFG, dma2dcfg);
+
+        /* Update configuration */
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON,
+                    lcdc_readl(sinfo, ATMEL_LCDC_DMACON)
+                    | ATMEL_LCDC_DMAUPDT);
+}
+#endif
+
+
+static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {
+        .type           = FB_TYPE_PACKED_PIXELS,
+        .visual         = FB_VISUAL_TRUECOLOR,
+        .xpanstep       = 0,
+        .ypanstep       = 0,
+        .ywrapstep      = 0,
+        .accel          = FB_ACCEL_NONE,
+};
+
+
+static void atmel_lcdfb_update_dma(struct fb_info *info,
+                               struct fb_var_screeninfo *var)
+{
+        struct atmel_lcdfb_info *sinfo = info->par;
+        struct fb_fix_screeninfo *fix = &info->fix;
+        unsigned long dma_addr;
+
+        dma_addr = (fix->smem_start + var->yoffset * fix->line_length
+                    + var->xoffset * var->bits_per_pixel / 8);
+
+        dma_addr &= ~3UL;
+
+        /* Set framebuffer DMA base address and pixel offset */
+        lcdc_writel(sinfo, ATMEL_LCDC_DMABADDR1, dma_addr);
+
+        atmel_lcdfb_update_dma2d(sinfo, var);
+}
+
+static inline void atmel_lcdfb_free_video_memory(struct atmel_lcdfb_info *sinfo)
+{
+        struct fb_info *info = sinfo->info;
+
+        dma_free_writecombine(info->device, info->fix.smem_len,
+                                info->screen_base, info->fix.smem_start);
+}
+
+/**
+ *      atmel_lcdfb_alloc_video_memory - Allocate framebuffer memory
+ *      @sinfo: the frame buffer to allocate memory for
+ */
+static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
+{
+        struct fb_info *info = sinfo->info;
+        struct fb_var_screeninfo *var = &info->var;
+
+        info->fix.smem_len = (var->xres_virtual * var->yres_virtual
+                            * ((var->bits_per_pixel + 7) / 8));
+
+        info->screen_base = dma_alloc_writecombine(info->device, info->fix.smem_len,
+                                        (dma_addr_t *)&info->fix.smem_start, GFP_KERNEL);
+
+        if (!info->screen_base) {
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+/**
+ *      atmel_lcdfb_check_var - Validates a var passed in.
+ *      @var: frame buffer variable screen structure
+ *      @info: frame buffer structure that represents a single frame buffer
+ *
+ *      Checks to see if the hardware supports the state requested by
+ *      var passed in. This function does not alter the hardware
+ *      state!!!  This means the data stored in struct fb_info and
+ *      struct atmel_lcdfb_info do not change. This includes the var
+ *      inside of struct fb_info.  Do NOT change these. This function
+ *      can be called on its own if we intent to only test a mode and
+ *      not actually set it. The stuff in modedb.c is a example of
+ *      this. If the var passed in is slightly off by what the
+ *      hardware can support then we alter the var PASSED in to what
+ *      we can do. If the hardware doesn't support mode change a
+ *      -EINVAL will be returned by the upper layers. You don't need
+ *      to implement this function then. If you hardware doesn't
+ *      support changing the resolution then this function is not
+ *      needed. In this case the driver would just provide a var that
+ *      represents the static state the screen is in.
+ *
+ *      Returns negative errno on error, or zero on success.
+ */
+static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+        struct device *dev = info->device;
+        struct atmel_lcdfb_info *sinfo = info->par;
+        unsigned long clk_value_khz;
+
+        clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
+
+        dev_dbg(dev, "%s:\n", __func__);
+        dev_dbg(dev, "  resolution: %ux%u\n", var->xres, var->yres);
+        dev_dbg(dev, "  pixclk:     %lu KHz\n", PICOS2KHZ(var->pixclock));
+        dev_dbg(dev, "  bpp:        %u\n", var->bits_per_pixel);
+        dev_dbg(dev, "  clk:        %lu KHz\n", clk_value_khz);
+
+        if ((PICOS2KHZ(var->pixclock) * var->bits_per_pixel / 8) > clk_value_khz) {
+                dev_err(dev, "%lu KHz pixel clock is too fast\n", PICOS2KHZ(var->pixclock));
+                return -EINVAL;
+        }
+
+        /* Force same alignment for each line */
+        var->xres = (var->xres + 3) & ~3UL;
+        var->xres_virtual = (var->xres_virtual + 3) & ~3UL;
+
+        var->red.msb_right = var->green.msb_right = var->blue.msb_right = 0;
+        var->transp.msb_right = 0;
+        var->transp.offset = var->transp.length = 0;
+        var->xoffset = var->yoffset = 0;
+
+        switch (var->bits_per_pixel) {
+        case 2:
+        case 4:
+        case 8:
+                var->red.offset = var->green.offset = var->blue.offset = 0;
+                var->red.length = var->green.length = var->blue.length
+                        = var->bits_per_pixel;
+                break;
+        case 15:
+        case 16:
+                var->red.offset = 0;
+                var->green.offset = 5;
+                var->blue.offset = 10;
+                var->red.length = var->green.length = var->blue.length = 5;
+                break;
+        case 24:
+        case 32:
+                var->red.offset = 0;
+                var->green.offset = 8;
+                var->blue.offset = 16;
+                var->red.length = var->green.length = var->blue.length = 8;
+                break;
+        default:
+                dev_err(dev, "color depth %d not supported\n",
+                                        var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/**
+ *      atmel_lcdfb_set_par - Alters the hardware state.
+ *      @info: frame buffer structure that represents a single frame buffer
+ *
+ *      Using the fb_var_screeninfo in fb_info we set the resolution
+ *      of the this particular framebuffer. This function alters the
+ *      par AND the fb_fix_screeninfo stored in fb_info. It doesn't
+ *      not alter var in fb_info since we are using that data. This
+ *      means we depend on the data in var inside fb_info to be
+ *      supported by the hardware.  atmel_lcdfb_check_var is always called
+ *      before atmel_lcdfb_set_par to ensure this.  Again if you can't
+ *      change the resolution you don't need this function.
+ *
+ */
+static int atmel_lcdfb_set_par(struct fb_info *info)
+{
+        struct atmel_lcdfb_info *sinfo = info->par;
+        unsigned long value;
+        unsigned long clk_value_khz;
+
+        dev_dbg(info->device, "%s:\n", __func__);
+        dev_dbg(info->device, "  * resolution: %ux%u (%ux%u virtual)\n",
+                 info->var.xres, info->var.yres,
+                 info->var.xres_virtual, info->var.yres_virtual);
+
+        /* Turn off the LCD controller and the DMA controller */
+        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
+
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
+
+        if (info->var.bits_per_pixel <= 8)
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+        else
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+
+        info->fix.line_length = info->var.xres_virtual * (info->var.bits_per_pixel / 8);
+
+        /* Re-initialize the DMA engine... */
+        dev_dbg(info->device, "  * update DMA engine\n");
+        atmel_lcdfb_update_dma(info, &info->var);
+
+        /* ...set frame size and burst length = 8 words (?) */
+        value = (info->var.yres * info->var.xres * info->var.bits_per_pixel) / 32;
+        value |= ((ATMEL_LCDC_DMA_BURST_LEN - 1) << ATMEL_LCDC_BLENGTH_OFFSET);
+        lcdc_writel(sinfo, ATMEL_LCDC_DMAFRMCFG, value);
+
+        /* Now, the LCDC core... */
+
+        /* Set pixel clock */
+        clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
+
+        value = clk_value_khz / PICOS2KHZ(info->var.pixclock);
+
+        if (clk_value_khz % PICOS2KHZ(info->var.pixclock))
+                value++;
+
+        value = (value / 2) - 1;
+
+        if (value <= 0) {
+                dev_notice(info->device, "Bypassing pixel clock divider\n");
+                lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, ATMEL_LCDC_BYPASS);
+        } else
+                lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, value << ATMEL_LCDC_CLKVAL_OFFSET);
+
+        /* Initialize control register 2 */
+        value = sinfo->default_lcdcon2;
+
+        if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
+                value |= ATMEL_LCDC_INVLINE_INVERTED;
+        if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
+                value |= ATMEL_LCDC_INVFRAME_INVERTED;
+
+        switch (info->var.bits_per_pixel) {
+                case 1: value |= ATMEL_LCDC_PIXELSIZE_1; break;
+                case 2: value |= ATMEL_LCDC_PIXELSIZE_2; break;
+                case 4: value |= ATMEL_LCDC_PIXELSIZE_4; break;
+                case 8: value |= ATMEL_LCDC_PIXELSIZE_8; break;
+                case 15: /* fall through */
+                case 16: value |= ATMEL_LCDC_PIXELSIZE_16; break;
+                case 24: value |= ATMEL_LCDC_PIXELSIZE_24; break;
+                case 32: value |= ATMEL_LCDC_PIXELSIZE_32; break;
+                default: BUG(); break;
+        }
+        dev_dbg(info->device, "  * LCDCON2 = %08lx\n", value);
+        lcdc_writel(sinfo, ATMEL_LCDC_LCDCON2, value);
+
+        /* Vertical timing */
+        value = (info->var.vsync_len - 1) << ATMEL_LCDC_VPW_OFFSET;
+        value |= info->var.upper_margin << ATMEL_LCDC_VBP_OFFSET;
+        value |= info->var.lower_margin;
+        dev_dbg(info->device, "  * LCDTIM1 = %08lx\n", value);
+        lcdc_writel(sinfo, ATMEL_LCDC_TIM1, value);
+
+        /* Horizontal timing */
+        value = (info->var.right_margin - 1) << ATMEL_LCDC_HFP_OFFSET;
+        value |= (info->var.hsync_len - 1) << ATMEL_LCDC_HPW_OFFSET;
+        value |= (info->var.left_margin - 1);
+        dev_dbg(info->device, "  * LCDTIM2 = %08lx\n", value);
+        lcdc_writel(sinfo, ATMEL_LCDC_TIM2, value);
+
+        /* Display size */
+        value = (info->var.xres - 1) << ATMEL_LCDC_HOZVAL_OFFSET;
+        value |= info->var.yres - 1;
+        lcdc_writel(sinfo, ATMEL_LCDC_LCDFRMCFG, value);
+
+        /* FIFO Threshold: Use formula from data sheet */
+        value = ATMEL_LCDC_FIFO_SIZE - (2 * ATMEL_LCDC_DMA_BURST_LEN + 3);
+        lcdc_writel(sinfo, ATMEL_LCDC_FIFO, value);
+
+        /* Toggle LCD_MODE every frame */
+        lcdc_writel(sinfo, ATMEL_LCDC_MVAL, 0);
+
+        /* Disable all interrupts */
+        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
+
+        /* Set contrast */
+        value = ATMEL_LCDC_PS_DIV8 | ATMEL_LCDC_POL_POSITIVE | ATMEL_LCDC_ENA_PWMENABLE;
+        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, value);
+        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, ATMEL_LCDC_CVAL_DEFAULT);
+        /* ...wait for DMA engine to become idle... */
+        while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
+                msleep(10);
+
+        dev_dbg(info->device, "  * re-enable DMA engine\n");
+        /* ...and enable it with updated configuration */
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
+
+        dev_dbg(info->device, "  * re-enable LCDC core\n");
+        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
+                (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
+
+        dev_dbg(info->device, "  * DONE\n");
+
+        return 0;
+}
+
+static inline unsigned int chan_to_field(unsigned int chan, const struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+
+/**
+ *      atmel_lcdfb_setcolreg - Optional function. Sets a color register.
+ *      @regno: Which register in the CLUT we are programming
+ *      @red: The red value which can be up to 16 bits wide
+ *      @green: The green value which can be up to 16 bits wide
+ *      @blue:  The blue value which can be up to 16 bits wide.
+ *      @transp: If supported the alpha value which can be up to 16 bits wide.
+ *      @info: frame buffer info structure
+ *
+ *      Set a single color register. The values supplied have a 16 bit
+ *      magnitude which needs to be scaled in this function for the hardware.
+ *      Things to take into consideration are how many color registers, if
+ *      any, are supported with the current color visual. With truecolor mode
+ *      no color palettes are supported. Here a psuedo palette is created
+ *      which we store the value in pseudo_palette in struct fb_info. For
+ *      pseudocolor mode we have a limited color palette. To deal with this
+ *      we can program what color is displayed for a particular pixel value.
+ *      DirectColor is similar in that we can program each color field. If
+ *      we have a static colormap we don't need to implement this function.
+ *
+ *      Returns negative errno on error, or zero on success. In an
+ *      ideal world, this would have been the case, but as it turns
+ *      out, the other drivers return 1 on failure, so that's what
+ *      we're going to do.
+ */
+static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
+                             unsigned int green, unsigned int blue,
+                             unsigned int transp, struct fb_info *info)
+{
+        struct atmel_lcdfb_info *sinfo = info->par;
+        unsigned int val;
+        u32 *pal;
+        int ret = 1;
+
+        if (info->var.grayscale)
+                red = green = blue = (19595 * red + 38470 * green
+                                      + 7471 * blue) >> 16;
+
+        switch (info->fix.visual) {
+        case FB_VISUAL_TRUECOLOR:
+                if (regno < 16) {
+                        pal = info->pseudo_palette;
+
+                        val  = chan_to_field(red, &info->var.red);
+                        val |= chan_to_field(green, &info->var.green);
+                        val |= chan_to_field(blue, &info->var.blue);
+
+                        pal[regno] = val;
+                        ret = 0;
+                }
+                break;
+
+        case FB_VISUAL_PSEUDOCOLOR:
+                if (regno < 256) {
+                        val  = ((red   >> 11) & 0x001f);
+                        val |= ((green >>  6) & 0x03e0);
+                        val |= ((blue  >>  1) & 0x7c00);
+
+                        /*
+                         * TODO: intensity bit. Maybe something like
+                         *   ~(red[10] ^ green[10] ^ blue[10]) & 1
+                         */
+
+                        lcdc_writel(sinfo, ATMEL_LCDC_LUT(regno), val);
+                        ret = 0;
+                }
+                break;
+        }
+
+        return ret;
+}
+
+static int atmel_lcdfb_pan_display(struct fb_var_screeninfo *var,
+                               struct fb_info *info)
+{
+        dev_dbg(info->device, "%s\n", __func__);
+
+        atmel_lcdfb_update_dma(info, var);
+
+        return 0;
+}
+
+static struct fb_ops atmel_lcdfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = atmel_lcdfb_check_var,
+        .fb_set_par     = atmel_lcdfb_set_par,
+        .fb_setcolreg   = atmel_lcdfb_setcolreg,
+        .fb_pan_display = atmel_lcdfb_pan_display,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+static irqreturn_t atmel_lcdfb_interrupt(int irq, void *dev_id)
+{
+        struct fb_info *info = dev_id;
+        struct atmel_lcdfb_info *sinfo = info->par;
+        u32 status;
+
+        status = lcdc_readl(sinfo, ATMEL_LCDC_ISR);
+        lcdc_writel(sinfo, ATMEL_LCDC_IDR, status);
+        return IRQ_HANDLED;
+}
+
+static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo)
+{
+        struct fb_info *info = sinfo->info;
+        int ret = 0;
+
+        memset_io(info->screen_base, 0, info->fix.smem_len);
+        info->var.activate |= FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW;
+
+        dev_info(info->device,
+               "%luKiB frame buffer at %08lx (mapped at %p)\n",
+               (unsigned long)info->fix.smem_len / 1024,
+               (unsigned long)info->fix.smem_start,
+               info->screen_base);
+
+        /* Allocate colormap */
+        ret = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (ret < 0)
+                dev_err(info->device, "Alloc color map failed\n");
+
+        return ret;
+}
+
+static void atmel_lcdfb_start_clock(struct atmel_lcdfb_info *sinfo)
+{
+        if (sinfo->bus_clk)
+                clk_enable(sinfo->bus_clk);
+        clk_enable(sinfo->lcdc_clk);
+}
+
+static void atmel_lcdfb_stop_clock(struct atmel_lcdfb_info *sinfo)
+{
+        if (sinfo->bus_clk)
+                clk_disable(sinfo->bus_clk);
+        clk_disable(sinfo->lcdc_clk);
+}
+
+
+static int __init atmel_lcdfb_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct fb_info *info;
+        struct atmel_lcdfb_info *sinfo;
+        struct atmel_lcdfb_info *pdata_sinfo;
+        struct resource *regs = NULL;
+        struct resource *map = NULL;
+        int ret;
+
+        dev_dbg(dev, "%s BEGIN\n", __func__);
+
+        ret = -ENOMEM;
+        info = framebuffer_alloc(sizeof(struct atmel_lcdfb_info), dev);
+        if (!info) {
+                dev_err(dev, "cannot allocate memory\n");
+                goto out;
+        }
+
+        sinfo = info->par;
+
+        if (dev->platform_data) {
+                pdata_sinfo = (struct atmel_lcdfb_info *)dev->platform_data;
+                sinfo->default_bpp = pdata_sinfo->default_bpp;
+                sinfo->default_dmacon = pdata_sinfo->default_dmacon;
+                sinfo->default_lcdcon2 = pdata_sinfo->default_lcdcon2;
+                sinfo->default_monspecs = pdata_sinfo->default_monspecs;
+                sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
+                sinfo->guard_time = pdata_sinfo->guard_time;
+        } else {
+                dev_err(dev, "cannot get default configuration\n");
+                goto free_info;
+        }
+        sinfo->info = info;
+        sinfo->pdev = pdev;
+
+        strcpy(info->fix.id, sinfo->pdev->name);
+        info->flags = ATMEL_LCDFB_FBINFO_DEFAULT;
+        info->pseudo_palette = sinfo->pseudo_palette;
+        info->fbops = &atmel_lcdfb_ops;
+
+        memcpy(&info->monspecs, sinfo->default_monspecs, sizeof(info->monspecs));
+        info->fix = atmel_lcdfb_fix;
+
+        /* Enable LCDC Clocks */
+        if (cpu_is_at91sam9261() || cpu_is_at32ap7000()) {
+                sinfo->bus_clk = clk_get(dev, "hck1");
+                if (IS_ERR(sinfo->bus_clk)) {
+                        ret = PTR_ERR(sinfo->bus_clk);
+                        goto free_info;
+                }
+        }
+        sinfo->lcdc_clk = clk_get(dev, "lcdc_clk");
+        if (IS_ERR(sinfo->lcdc_clk)) {
+                ret = PTR_ERR(sinfo->lcdc_clk);
+                goto put_bus_clk;
+        }
+        atmel_lcdfb_start_clock(sinfo);
+
+        ret = fb_find_mode(&info->var, info, NULL, info->monspecs.modedb,
+                        info->monspecs.modedb_len, info->monspecs.modedb,
+                        sinfo->default_bpp);
+        if (!ret) {
+                dev_err(dev, "no suitable video mode found\n");
+                goto stop_clk;
+        }
+
+
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!regs) {
+                dev_err(dev, "resources unusable\n");
+                ret = -ENXIO;
+                goto stop_clk;
+        }
+
+        sinfo->irq_base = platform_get_irq(pdev, 0);
+        if (sinfo->irq_base < 0) {
+                dev_err(dev, "unable to get irq\n");
+                ret = sinfo->irq_base;
+                goto stop_clk;
+        }
+
+        /* Initialize video memory */
+        map = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (map) {
+                /* use a pre-allocated memory buffer */
+                info->fix.smem_start = map->start;
+                info->fix.smem_len = map->end - map->start + 1;
+                if (!request_mem_region(info->fix.smem_start,
+                                        info->fix.smem_len, pdev->name)) {
+                        ret = -EBUSY;
+                        goto stop_clk;
+                }
+
+                info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
+                if (!info->screen_base)
+                        goto release_intmem;
+        } else {
+                /* alocate memory buffer */
+                ret = atmel_lcdfb_alloc_video_memory(sinfo);
+                if (ret < 0) {
+                        dev_err(dev, "cannot allocate framebuffer: %d\n", ret);
+                        goto stop_clk;
+                }
+        }
+
+        /* LCDC registers */
+        info->fix.mmio_start = regs->start;
+        info->fix.mmio_len = regs->end - regs->start + 1;
+
+        if (!request_mem_region(info->fix.mmio_start,
+                                info->fix.mmio_len, pdev->name)) {
+                ret = -EBUSY;
+                goto free_fb;
+        }
+
+        sinfo->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
+        if (!sinfo->mmio) {
+                dev_err(dev, "cannot map LCDC registers\n");
+                goto release_mem;
+        }
+
+        /* interrupt */
+        ret = request_irq(sinfo->irq_base, atmel_lcdfb_interrupt, 0, pdev->name, info);
+        if (ret) {
+                dev_err(dev, "request_irq failed: %d\n", ret);
+                goto unmap_mmio;
+        }
+
+        ret = atmel_lcdfb_init_fbinfo(sinfo);
+        if (ret < 0) {
+                dev_err(dev, "init fbinfo failed: %d\n", ret);
+                goto unregister_irqs;
+        }
+
+        /*
+         * This makes sure that our colour bitfield
+         * descriptors are correctly initialised.
+         */
+        atmel_lcdfb_check_var(&info->var, info);
+
+        ret = fb_set_var(info, &info->var);
+        if (ret) {
+                dev_warn(dev, "unable to set display parameters\n");
+                goto free_cmap;
+        }
+
+        dev_set_drvdata(dev, info);
+
+        /*
+         * Tell the world that we're ready to go
+         */
+        ret = register_framebuffer(info);
+        if (ret < 0) {
+                dev_err(dev, "failed to register framebuffer device: %d\n", ret);
+                goto free_cmap;
+        }
+
+        /* Power up the LCDC screen */
+        if (sinfo->atmel_lcdfb_power_control)
+                sinfo->atmel_lcdfb_power_control(1);
+
+        dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %lu\n",
+                       info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);
+
+        return 0;
+
+
+free_cmap:
+        fb_dealloc_cmap(&info->cmap);
+unregister_irqs:
+        free_irq(sinfo->irq_base, info);
+unmap_mmio:
+        iounmap(sinfo->mmio);
+release_mem:
+        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
+free_fb:
+        if (map)
+                iounmap(info->screen_base);
+        else
+                atmel_lcdfb_free_video_memory(sinfo);
+
+release_intmem:
+        if (map)
+                release_mem_region(info->fix.smem_start, info->fix.smem_len);
+stop_clk:
+        atmel_lcdfb_stop_clock(sinfo);
+        clk_put(sinfo->lcdc_clk);
+put_bus_clk:
+        if (sinfo->bus_clk)
+                clk_put(sinfo->bus_clk);
+free_info:
+        framebuffer_release(info);
+out:
+        dev_dbg(dev, "%s FAILED\n", __func__);
+        return ret;
+}
+
+static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct atmel_lcdfb_info *sinfo = info->par;
+
+        if (!sinfo)
+                return 0;
+
+        if (sinfo->atmel_lcdfb_power_control)
+                sinfo->atmel_lcdfb_power_control(0);
+        unregister_framebuffer(info);
+        atmel_lcdfb_stop_clock(sinfo);
+        clk_put(sinfo->lcdc_clk);
+        if (sinfo->bus_clk)
+                clk_put(sinfo->bus_clk);
+        fb_dealloc_cmap(&info->cmap);
+        free_irq(sinfo->irq_base, info);
+        iounmap(sinfo->mmio);
+        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
+        if (platform_get_resource(pdev, IORESOURCE_MEM, 1)) {
+                iounmap(info->screen_base);
+                release_mem_region(info->fix.smem_start, info->fix.smem_len);
+        } else {
+                atmel_lcdfb_free_video_memory(sinfo);
+        }
+
+        dev_set_drvdata(dev, NULL);
+        framebuffer_release(info);
+
+        return 0;
+}
+
+static struct platform_driver atmel_lcdfb_driver = {
+        .remove         = __exit_p(atmel_lcdfb_remove),
+        .driver         = {
+                .name   = "atmel_lcdfb",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init atmel_lcdfb_init(void)
+{
+        return platform_driver_probe(&atmel_lcdfb_driver, atmel_lcdfb_probe);
+}
+
+static void __exit atmel_lcdfb_exit(void)
+{
+        platform_driver_unregister(&atmel_lcdfb_driver);
+}
+
+module_init(atmel_lcdfb_init);
+module_exit(atmel_lcdfb_exit);
+
+MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver");
+MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@rfo.atmel.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/aty/ati_ids.h b/drivers/video/aty/ati_ids.h
index 39ab483fc250..90e7df22f508 100644
--- a/drivers/video/aty/ati_ids.h
+++ b/drivers/video/aty/ati_ids.h
@@ -209,4 +209,4 @@
 #define PCI_CHIP_R423_5D57              0x5D57
 #define PCI_CHIP_RS350_7834             0x7834
 #define PCI_CHIP_RS350_7835             0x7835
-
+#define PCI_CHIP_RS480_5955             0x5955
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index e86d7e0c9825..7fea4d8ae8e2 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -2165,18 +2165,29 @@ static void __devexit aty128_remove(struct pci_dev *pdev)
 static int aty128fb_blank(int blank, struct fb_info *fb)
 {
         struct aty128fb_par *par = fb->par;
-        u8 state = 0;
+        u8 state;
 
         if (par->lock_blank || par->asleep)
                 return 0;
 
-        if (blank & FB_BLANK_VSYNC_SUSPEND)
-                state |= 2;
-        if (blank & FB_BLANK_HSYNC_SUSPEND)
-                state |= 1;
-        if (blank & FB_BLANK_POWERDOWN)
-                state |= 4;
-
+        switch (blank) {
+        case FB_BLANK_NORMAL:
+                state = 4;
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                state = 6;
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                state = 5;
+                break;
+        case FB_BLANK_POWERDOWN:
+                state = 7;
+                break;
+        case FB_BLANK_UNBLANK:
+        default:
+                state = 0;
+                break;
+        }
         aty_st_8(CRTC_EXT_CNTL+1, state);
 
         if (par->chip_gen == rage_M3) {
@@ -2430,7 +2441,7 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         wait_for_idle(par);
 
         /* Blank display and LCD */
-        aty128fb_blank(VESA_POWERDOWN, info);
+        aty128fb_blank(FB_BLANK_POWERDOWN, info);
 
         /* Sleep */
         par->asleep = 1;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 8514f2a6f060..8d3455da663a 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -80,8 +80,9 @@
 #include "../macmodes.h"
 #endif
 #ifdef __sparc__
-#include <asm/pbm.h>
 #include <asm/fbio.h>
+#include <asm/oplib.h>
+#include <asm/prom.h>
 #endif
 
 #ifdef CONFIG_ADB_PMU
@@ -2297,20 +2298,6 @@ static int __devinit aty_init(struct fb_info *info)
                 par->pll_limits.xclk = 53;
         }
 #endif
-        if (pll)
-                par->pll_limits.pll_max = pll;
-        if (mclk)
-                par->pll_limits.mclk = mclk;
-        if (xclk)
-                par->pll_limits.xclk = xclk;
-
-        aty_calc_mem_refresh(par, par->pll_limits.xclk);
-        par->pll_per = 1000000/par->pll_limits.pll_max;
-        par->mclk_per = 1000000/par->pll_limits.mclk;
-        par->xclk_per = 1000000/par->pll_limits.xclk;
-
-        par->ref_clk_per = 1000000000000ULL / 14318180;
-        xtal = "14.31818";
 
 #ifdef CONFIG_FB_ATY_GX
         if (!M64_HAS(INTEGRATED)) {
@@ -2338,6 +2325,7 @@ static int __devinit aty_init(struct fb_info *info)
                 case DAC_IBMRGB514:
                         par->dac_ops = &aty_dac_ibm514;
                         break;
+#ifdef CONFIG_ATARI
                 case DAC_ATI68860_B:
                 case DAC_ATI68860_C:
                         par->dac_ops = &aty_dac_ati68860b;
@@ -2346,6 +2334,7 @@ static int __devinit aty_init(struct fb_info *info)
                 case DAC_ATT21C498:
                         par->dac_ops = &aty_dac_att21c498;
                         break;
+#endif
                 default:
                         PRINTKI("aty_init: DAC type not implemented yet!\n");
                         par->dac_ops = &aty_dac_unsupported;
@@ -2389,8 +2378,29 @@ static int __devinit aty_init(struct fb_info *info)
                 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */
                 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM)
                         par->pll_limits.mclk = 63;
+                /* Mobility + 32bit memory interface need halved XCLK. */
+                if (M64_HAS(MOBIL_BUS) && par->ram_type == SDRAM32)
+                        par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
         }
+#endif
 
+        /* Allow command line to override clocks. */
+        if (pll)
+                par->pll_limits.pll_max = pll;
+        if (mclk)
+                par->pll_limits.mclk = mclk;
+        if (xclk)
+                par->pll_limits.xclk = xclk;
+
+        aty_calc_mem_refresh(par, par->pll_limits.xclk);
+        par->pll_per = 1000000/par->pll_limits.pll_max;
+        par->mclk_per = 1000000/par->pll_limits.mclk;
+        par->xclk_per = 1000000/par->pll_limits.xclk;
+
+        par->ref_clk_per = 1000000000000ULL / 14318180;
+        xtal = "14.31818";
+
+#ifdef CONFIG_FB_ATY_CT
         if (M64_HAS(GTB_DSP)) {
                 u8 pll_ref_div = aty_ld_pll_ct(PLL_REF_DIV, par);
 
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index 1fdcfdbf669b..cc9e9779b75f 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -608,12 +608,10 @@ static void aty_resume_pll_ct(const struct fb_info *info,
                 aty_st_pll_ct(SCLK_FB_DIV, pll->ct.sclk_fb_div, par);
                 aty_st_pll_ct(SPLL_CNTL2, pll->ct.spll_cntl2, par);
                 /*
-                 * The sclk has been started. However, I believe the first clock
-                 * ticks it generates are not very stable. Hope this primitive loop
-                 * helps for Rage Mobilities that sometimes crash when
-                 * we switch to sclk. (Daniel Mantione, 13-05-2003)
+                 * SCLK has been started. Wait for the PLL to lock. 5 ms
+                 * should be enough according to mach64 programmer's guide.
                  */
-                udelay(500);
+                mdelay(5);
         }
 
         aty_st_pll_ct(PLL_REF_DIV, pll->ct.pll_ref_div, par);
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index 2a7f381c330f..fe2c6ad01a8d 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -11,7 +11,6 @@
 #include <asm/uaccess.h>
 
 #ifdef __sparc__
-#include <asm/pbm.h>
 #include <asm/fbio.h>
 #endif
 
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index a4b3fd185de7..2ce050193018 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -100,6 +100,8 @@
         { PCI_VENDOR_ID_ATI, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (flags) | (CHIP_FAMILY_##family) }
 
 static struct pci_device_id radeonfb_pci_table[] = {
+        /* Radeon Xpress 200m */
+        CHIP_DEF(PCI_CHIP_RS480_5955,   RS480,  CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
         /* Mobility M6 */
         CHIP_DEF(PCI_CHIP_RADEON_LY,    RV100,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
         CHIP_DEF(PCI_CHIP_RADEON_LZ,    RV100,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
@@ -422,7 +424,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 
         if (dp == NULL)
                 return -ENODEV;
-        val = get_property(dp, "ATY,RefCLK", NULL);
+        val = of_get_property(dp, "ATY,RefCLK", NULL);
         if (!val || !*val) {
                 printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n");
                 return -EINVAL;
@@ -430,11 +432,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 
         rinfo->pll.ref_clk = (*val) / 10;
 
-        val = get_property(dp, "ATY,SCLK", NULL);
+        val = of_get_property(dp, "ATY,SCLK", NULL);
         if (val && *val)
                 rinfo->pll.sclk = (*val) / 10;
 
-        val = get_property(dp, "ATY,MCLK", NULL);
+        val = of_get_property(dp, "ATY,MCLK", NULL);
         if (val && *val)
                 rinfo->pll.mclk = (*val) / 10;
 
@@ -1994,7 +1996,8 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
         /* framebuffer size */
         if ((rinfo->family == CHIP_FAMILY_RS100) ||
             (rinfo->family == CHIP_FAMILY_RS200) ||
-            (rinfo->family == CHIP_FAMILY_RS300)) {
+            (rinfo->family == CHIP_FAMILY_RS300) ||
+            (rinfo->family == CHIP_FAMILY_RS480) ) {
           u32 tom = INREG(NB_TOM);
           tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);
 
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 737b5c09dbdb..2030ed813429 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -70,7 +70,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         int i, mt = MT_NONE;  
         
         RTRACE("analyzing OF properties...\n");
-        pmt = get_property(dp, "display-type", NULL);
+        pmt = of_get_property(dp, "display-type", NULL);
         if (!pmt)
                 return MT_NONE;
         RTRACE("display-type: %s\n", pmt);
@@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         }
 
         for (i = 0; propnames[i] != NULL; ++i) {
-                pedid = get_property(dp, propnames[i], NULL);
+                pedid = of_get_property(dp, propnames[i], NULL);
                 if (pedid != NULL)
                         break;
         }
@@ -98,9 +98,10 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
          * single-head cards have hdno == -1 and skip this step
          */
         if (pedid == NULL && dp->parent && (hdno != -1))
-                pedid = get_property(dp->parent, (hdno == 0) ? "EDID1" : "EDID2", NULL);
+                pedid = of_get_property(dp->parent,
+                                (hdno == 0) ? "EDID1" : "EDID2", NULL);
         if (pedid == NULL && dp->parent && (hdno == 0))
-                pedid = get_property(dp->parent, "EDID", NULL);
+                pedid = of_get_property(dp->parent, "EDID", NULL);
         if (pedid == NULL)
                 return mt;
 
@@ -130,7 +131,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
                 do {
                         if (!dp)
                                 return MT_NONE;
-                        pname = get_property(dp, "name", NULL);
+                        pname = of_get_property(dp, "name", NULL);
                         if (!pname)
                                 return MT_NONE;
                         len = strlen(pname);
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index c411293cefc8..be1d57bf9dc8 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -1290,7 +1290,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
                 if (rinfo->of_node != NULL) {
                         int size;
 
-                        mrtable = get_property(rinfo->of_node, "ATY,MRT", &size);
+                        mrtable = of_get_property(rinfo->of_node, "ATY,MRT", &size);
                         if (mrtable)
                                 mrtable_size = size >> 2;
                         else
@@ -2826,11 +2826,15 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis
         rinfo->pm_reg = pci_find_capability(rinfo->pdev, PCI_CAP_ID_PM);
 
         /* Enable/Disable dynamic clocks: TODO add sysfs access */
-        rinfo->dynclk = dynclk;
-        if (dynclk == 1) {
+        if (rinfo->family == CHIP_FAMILY_RS480)
+                rinfo->dynclk = -1;
+        else
+                rinfo->dynclk = dynclk;
+
+        if (rinfo->dynclk == 1) {
                 radeon_pm_enable_dynamic_mode(rinfo);
                 printk("radeonfb: Dynamic Clock Power Management enabled\n");
-        } else if (dynclk == 0) {
+        } else if (rinfo->dynclk == 0) {
                 radeon_pm_disable_dynamic_mode(rinfo);
                 printk("radeonfb: Dynamic Clock Power Management disabled\n");
         }
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 319000360285..7ebffcdfd1e3 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -48,6 +48,7 @@ enum radeon_family {
         CHIP_FAMILY_RV350,
         CHIP_FAMILY_RV380,    /* RV370/RV380/M22/M24 */
         CHIP_FAMILY_R420,     /* R420/R423/M18 */
+        CHIP_FAMILY_RS480,
         CHIP_FAMILY_LAST,
 };
 
@@ -64,7 +65,8 @@ enum radeon_family {
                                 ((rinfo)->family == CHIP_FAMILY_RV350) || \
                                 ((rinfo)->family == CHIP_FAMILY_R350)  || \
                                 ((rinfo)->family == CHIP_FAMILY_RV380) || \
-                                ((rinfo)->family == CHIP_FAMILY_R420))
+                                ((rinfo)->family == CHIP_FAMILY_R420)  || \
+                                ((rinfo)->family == CHIP_FAMILY_RS480) )
 
 /*
  * Chip flags
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 47d15b5d985a..fbef663fc057 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -63,3 +63,11 @@ config BACKLIGHT_PROGEAR
         help
           If you have a Frontpath ProGear say Y to enable the
           backlight driver.
+
+config BACKLIGHT_CARILLO_RANCH
+        tristate "Intel Carillo Ranch Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && LCD_CLASS_DEVICE && PCI && X86 && FB_LE80578
+        default n
+        help
+          If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
+          backlight driver.
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 0c3ce46f5094..c6e2266f63e2 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_BACKLIGHT_CORGI)	+= corgi_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
+obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
new file mode 100644
index 000000000000..e9bbc3455c94
--- /dev/null
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *
+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
+ * develop this driver.
+ *
+ * This file is part of the Carillo Ranch video subsystem driver.
+ * The Carillo Ranch video subsystem driver 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.
+ *
+ * The Carillo Ranch video subsystem driver 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 driver; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
+ *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/lcd.h>
+#include <linux/pci.h>
+#include <asm/uaccess.h>
+
+/* The LVDS- and panel power controls sits on the
+ * GPIO port of the ISA bridge.
+ */
+
+#define CRVML_DEVICE_LPC    0x27B8
+#define CRVML_REG_GPIOBAR   0x48
+#define CRVML_REG_GPIOEN    0x4C
+#define CRVML_GPIOEN_BIT    (1 << 4)
+#define CRVML_PANEL_PORT    0x38
+#define CRVML_LVDS_ON       0x00000001
+#define CRVML_PANEL_ON      0x00000002
+#define CRVML_BACKLIGHT_OFF 0x00000004
+
+/* The PLL Clock register sits on Host bridge */
+#define CRVML_DEVICE_MCH   0x5001
+#define CRVML_REG_MCHBAR   0x44
+#define CRVML_REG_MCHEN    0x54
+#define CRVML_MCHEN_BIT    (1 << 28)
+#define CRVML_MCHMAP_SIZE  4096
+#define CRVML_REG_CLOCK    0xc3c
+#define CRVML_CLOCK_SHIFT  8
+#define CRVML_CLOCK_MASK   0x00000f00
+
+static struct pci_dev *lpc_dev;
+static u32 gpio_bar;
+
+struct cr_panel {
+        struct backlight_device *cr_backlight_device;
+        struct lcd_device *cr_lcd_device;
+};
+
+static int cr_backlight_set_intensity(struct backlight_device *bd)
+{
+        int intensity = bd->props.brightness;
+        u32 addr = gpio_bar + CRVML_PANEL_PORT;
+        u32 cur = inl(addr);
+
+        if (bd->props.power == FB_BLANK_UNBLANK)
+                intensity = FB_BLANK_UNBLANK;
+        if (bd->props.fb_blank == FB_BLANK_UNBLANK)
+                intensity = FB_BLANK_UNBLANK;
+        if (bd->props.power == FB_BLANK_POWERDOWN)
+                intensity = FB_BLANK_POWERDOWN;
+        if (bd->props.fb_blank == FB_BLANK_POWERDOWN)
+                intensity = FB_BLANK_POWERDOWN;
+
+        if (intensity == FB_BLANK_UNBLANK) { /* FULL ON */
+                cur &= ~CRVML_BACKLIGHT_OFF;
+                outl(cur, addr);
+        } else if (intensity == FB_BLANK_POWERDOWN) { /* OFF */
+                cur |= CRVML_BACKLIGHT_OFF;
+                outl(cur, addr);
+        } /* anything else, don't bother */
+
+        return 0;
+}
+
+static int cr_backlight_get_intensity(struct backlight_device *bd)
+{
+        u32 addr = gpio_bar + CRVML_PANEL_PORT;
+        u32 cur = inl(addr);
+        u8 intensity;
+
+        if (cur & CRVML_BACKLIGHT_OFF)
+                intensity = FB_BLANK_POWERDOWN;
+        else
+                intensity = FB_BLANK_UNBLANK;
+
+        return intensity;
+}
+
+static struct backlight_ops cr_backlight_ops = {
+        .get_brightness = cr_backlight_get_intensity,
+        .update_status = cr_backlight_set_intensity,
+};
+
+static void cr_panel_on(void)
+{
+        u32 addr = gpio_bar + CRVML_PANEL_PORT;
+        u32 cur = inl(addr);
+
+        if (!(cur & CRVML_PANEL_ON)) {
+                /* Make sure LVDS controller is down. */
+                if (cur & 0x00000001) {
+                        cur &= ~CRVML_LVDS_ON;
+                        outl(cur, addr);
+                }
+                /* Power up Panel */
+                schedule_timeout(HZ / 10);
+                cur |= CRVML_PANEL_ON;
+                outl(cur, addr);
+        }
+
+        /* Power up LVDS controller */
+
+        if (!(cur & CRVML_LVDS_ON)) {
+                schedule_timeout(HZ / 10);
+                outl(cur | CRVML_LVDS_ON, addr);
+        }
+}
+
+static void cr_panel_off(void)
+{
+        u32 addr = gpio_bar + CRVML_PANEL_PORT;
+        u32 cur = inl(addr);
+
+        /* Power down LVDS controller first to avoid high currents */
+        if (cur & CRVML_LVDS_ON) {
+                cur &= ~CRVML_LVDS_ON;
+                outl(cur, addr);
+        }
+        if (cur & CRVML_PANEL_ON) {
+                schedule_timeout(HZ / 10);
+                outl(cur & ~CRVML_PANEL_ON, addr);
+        }
+}
+
+static int cr_lcd_set_power(struct lcd_device *ld, int power)
+{
+        if (power == FB_BLANK_UNBLANK)
+                cr_panel_on();
+        if (power == FB_BLANK_POWERDOWN)
+                cr_panel_off();
+
+        return 0;
+}
+
+static struct lcd_ops cr_lcd_ops = {
+        .set_power = cr_lcd_set_power,
+};
+
+static int cr_backlight_probe(struct platform_device *pdev)
+{
+        struct cr_panel *crp;
+        u8 dev_en;
+
+        crp = kzalloc(sizeof(crp), GFP_KERNEL);
+        if (crp == NULL)
+                return -ENOMEM;
+
+        lpc_dev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                        CRVML_DEVICE_LPC, NULL);
+        if (!lpc_dev) {
+                printk("INTEL CARILLO RANCH LPC not found.\n");
+                return -ENODEV;
+        }
+
+        pci_read_config_byte(lpc_dev, CRVML_REG_GPIOEN, &dev_en);
+        if (!(dev_en & CRVML_GPIOEN_BIT)) {
+                printk(KERN_ERR
+                       "Carillo Ranch GPIO device was not enabled.\n");
+                pci_dev_put(lpc_dev);
+                return -ENODEV;
+        }
+
+        crp->cr_backlight_device = backlight_device_register("cr-backlight",
+                                                             &pdev->dev, NULL,
+                                                             &cr_backlight_ops);
+        if (IS_ERR(crp->cr_backlight_device)) {
+                pci_dev_put(lpc_dev);
+                return PTR_ERR(crp->cr_backlight_device);
+        }
+
+        crp->cr_lcd_device = lcd_device_register("cr-lcd",
+                                                        &pdev->dev,
+                                                        &cr_lcd_ops);
+
+        if (IS_ERR(crp->cr_lcd_device)) {
+                pci_dev_put(lpc_dev);
+                return PTR_ERR(crp->cr_backlight_device);
+        }
+
+        pci_read_config_dword(lpc_dev, CRVML_REG_GPIOBAR,
+                              &gpio_bar);
+        gpio_bar &= ~0x3F;
+
+        crp->cr_backlight_device->props.power = FB_BLANK_UNBLANK;
+        crp->cr_backlight_device->props.brightness = 0;
+        crp->cr_backlight_device->props.max_brightness = 0;
+        cr_backlight_set_intensity(crp->cr_backlight_device);
+
+        cr_lcd_set_power(crp->cr_lcd_device, FB_BLANK_UNBLANK);
+
+        platform_set_drvdata(pdev, crp);
+
+        return 0;
+}
+
+static int cr_backlight_remove(struct platform_device *pdev)
+{
+        struct cr_panel *crp = platform_get_drvdata(pdev);
+        crp->cr_backlight_device->props.power = FB_BLANK_POWERDOWN;
+        crp->cr_backlight_device->props.brightness = 0;
+        crp->cr_backlight_device->props.max_brightness = 0;
+        cr_backlight_set_intensity(crp->cr_backlight_device);
+        cr_lcd_set_power(crp->cr_lcd_device, FB_BLANK_POWERDOWN);
+        backlight_device_unregister(crp->cr_backlight_device);
+        lcd_device_unregister(crp->cr_lcd_device);
+        pci_dev_put(lpc_dev);
+
+        return 0;
+}
+
+static struct platform_driver cr_backlight_driver = {
+        .probe = cr_backlight_probe,
+        .remove = cr_backlight_remove,
+        .driver = {
+                   .name = "cr_backlight",
+                   },
+};
+
+static struct platform_device *crp;
+
+static int __init cr_backlight_init(void)
+{
+        int ret = platform_driver_register(&cr_backlight_driver);
+
+        if (!ret) {
+                crp = platform_device_alloc("cr_backlight", -1);
+                if (!crp)
+                        return -ENOMEM;
+
+                ret = platform_device_add(crp);
+
+                if (ret) {
+                        platform_device_put(crp);
+                        platform_driver_unregister(&cr_backlight_driver);
+                }
+        }
+
+        printk("Carillo Ranch Backlight Driver Initialized.\n");
+
+        return ret;
+}
+
+static void __exit cr_backlight_exit(void)
+{
+        platform_device_unregister(crp);
+        platform_driver_unregister(&cr_backlight_driver);
+}
+
+module_init(cr_backlight_init);
+module_exit(cr_backlight_exit);
+
+MODULE_AUTHOR("Tungsten Graphics Inc.");
+MODULE_DESCRIPTION("Carillo Ranch Backlight Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index 6faea4034e3d..032210f45be3 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -22,8 +22,6 @@
  *  help moving some redundant computations and branches out of the loop, too.
  */
 
-
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -31,6 +29,7 @@
 #include <linux/slab.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include "fb_draw.h"
 
 #if BITS_PER_LONG == 32
 #  define FB_WRITEL fb_writel
@@ -41,17 +40,6 @@
 #endif
 
     /*
-     *  Compose two values, using a bitmask as decision value
-     *  This is equivalent to (a & mask) | (b & ~mask)
-     */
-
-static inline unsigned long
-comp(unsigned long a, unsigned long b, unsigned long mask)
-{
-    return ((a ^ b) & mask) ^ b;
-}
-
-    /*
      *  Generic bitwise copy algorithm
      */
 
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index f00b50aab606..71623b4f8ca2 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <asm/types.h>
+#include "fb_draw.h"
 
 #if BITS_PER_LONG == 32
 #  define FB_WRITEL fb_writel
@@ -31,73 +32,6 @@
 #endif
 
     /*
-     *  Compose two values, using a bitmask as decision value
-     *  This is equivalent to (a & mask) | (b & ~mask)
-     */
-
-static inline unsigned long
-comp(unsigned long a, unsigned long b, unsigned long mask)
-{
-    return ((a ^ b) & mask) ^ b;
-}
-
-    /*
-     *  Create a pattern with the given pixel's color
-     */
-
-#if BITS_PER_LONG == 64
-static inline unsigned long
-pixel_to_pat( u32 bpp, u32 pixel)
-{
-        switch (bpp) {
-        case 1:
-                return 0xfffffffffffffffful*pixel;
-        case 2:
-                return 0x5555555555555555ul*pixel;
-        case 4:
-                return 0x1111111111111111ul*pixel;
-        case 8:
-                return 0x0101010101010101ul*pixel;
-        case 12:
-                return 0x0001001001001001ul*pixel;
-        case 16:
-                return 0x0001000100010001ul*pixel;
-        case 24:
-                return 0x0000000001000001ul*pixel;
-        case 32:
-                return 0x0000000100000001ul*pixel;
-        default:
-                panic("pixel_to_pat(): unsupported pixelformat\n");
-    }
-}
-#else
-static inline unsigned long
-pixel_to_pat( u32 bpp, u32 pixel)
-{
-        switch (bpp) {
-        case 1:
-                return 0xfffffffful*pixel;
-        case 2:
-                return 0x55555555ul*pixel;
-        case 4:
-                return 0x11111111ul*pixel;
-        case 8:
-                return 0x01010101ul*pixel;
-        case 12:
-                return 0x00001001ul*pixel;
-        case 16:
-                return 0x00010001ul*pixel;
-        case 24:
-                return 0x00000001ul*pixel;
-        case 32:
-                return 0x00000001ul*pixel;
-        default:
-                panic("pixel_to_pat(): unsupported pixelformat\n");
-    }
-}
-#endif
-
-    /*
      *  Aligned pattern fill using 32/64-bit memory accesses
      */
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 2c4bc6205738..8269d704ab2a 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -98,15 +98,6 @@
 #define assert(expr)
 #endif
 
-#ifdef TRUE
-#undef TRUE
-#endif
-#ifdef FALSE
-#undef FALSE
-#endif
-#define TRUE  1
-#define FALSE 0
-
 #define MB_ (1024*1024)
 #define KB_ (1024)
 
@@ -146,9 +137,9 @@ static const struct cirrusfb_board_info_rec {
         char *name;             /* ASCII name of chipset */
         long maxclock[5];               /* maximum video clock */
         /* for  1/4bpp, 8bpp 15/16bpp, 24bpp, 32bpp - numbers from xorg code */
-        unsigned init_sr07 : 1; /* init SR07 during init_vgachip() */
-        unsigned init_sr1f : 1; /* write SR1F during init_vgachip() */
-        unsigned scrn_start_bit19 : 1; /* construct bit 19 of screen start address */
+        bool init_sr07 : 1; /* init SR07 during init_vgachip() */
+        bool init_sr1f : 1; /* write SR1F during init_vgachip() */
+        bool scrn_start_bit19 : 1; /* construct bit 19 of screen start address */
 
         /* initial SR07 value, then for each mode */
         unsigned char sr07;
@@ -166,9 +157,9 @@ static const struct cirrusfb_board_info_rec {
                         /* the SD64/P4 have a higher max. videoclock */
                         140000, 140000, 140000, 140000, 140000,
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = TRUE,
-                .scrn_start_bit19       = TRUE,
+                .init_sr07              = true,
+                .init_sr1f              = true,
+                .scrn_start_bit19       = true,
                 .sr07                   = 0xF0,
                 .sr07_1bpp              = 0xF0,
                 .sr07_8bpp              = 0xF1,
@@ -180,9 +171,9 @@ static const struct cirrusfb_board_info_rec {
                         /* guess */
                         90000, 90000, 90000, 90000, 90000
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = TRUE,
-                .scrn_start_bit19       = FALSE,
+                .init_sr07              = true,
+                .init_sr1f              = true,
+                .scrn_start_bit19       = false,
                 .sr07                   = 0x80,
                 .sr07_1bpp              = 0x80,
                 .sr07_8bpp              = 0x81,
@@ -194,9 +185,9 @@ static const struct cirrusfb_board_info_rec {
                         /* guess */
                         90000, 90000, 90000, 90000, 90000
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = TRUE,
-                .scrn_start_bit19       = FALSE,
+                .init_sr07              = true,
+                .init_sr1f              = true,
+                .scrn_start_bit19       = false,
                 .sr07                   = 0x20,
                 .sr07_1bpp              = 0x20,
                 .sr07_8bpp              = 0x21,
@@ -208,9 +199,9 @@ static const struct cirrusfb_board_info_rec {
                         /* guess */
                         90000, 90000, 90000, 90000, 90000
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = TRUE,
-                .scrn_start_bit19       = FALSE,
+                .init_sr07              = true,
+                .init_sr1f              = true,
+                .scrn_start_bit19       = false,
                 .sr07                   = 0x80,
                 .sr07_1bpp              = 0x80,
                 .sr07_8bpp              = 0x81,
@@ -221,9 +212,9 @@ static const struct cirrusfb_board_info_rec {
                 .maxclock               = {
                         135100, 135100, 85500, 85500, 0
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = FALSE,
-                .scrn_start_bit19       = TRUE,
+                .init_sr07              = true,
+                .init_sr1f              = false,
+                .scrn_start_bit19       = true,
                 .sr07                   = 0x20,
                 .sr07_1bpp              = 0x20,
                 .sr07_8bpp              = 0x21,
@@ -235,9 +226,9 @@ static const struct cirrusfb_board_info_rec {
                         /* for the GD5430.  GD5446 can do more... */
                         85500, 85500, 50000, 28500, 0
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = TRUE,
-                .scrn_start_bit19       = TRUE,
+                .init_sr07              = true,
+                .init_sr1f              = true,
+                .scrn_start_bit19       = true,
                 .sr07                   = 0xA0,
                 .sr07_1bpp              = 0xA1,
                 .sr07_1bpp_mux          = 0xA7,
@@ -250,9 +241,9 @@ static const struct cirrusfb_board_info_rec {
                 .maxclock               = {
                         135100, 200000, 200000, 135100, 135100
                 },
-                .init_sr07              = TRUE,
-                .init_sr1f              = TRUE,
-                .scrn_start_bit19       = TRUE,
+                .init_sr07              = true,
+                .init_sr1f              = true,
+                .scrn_start_bit19       = true,
                 .sr07                   = 0x10,
                 .sr07_1bpp              = 0x11,
                 .sr07_8bpp              = 0x11,
@@ -264,9 +255,9 @@ static const struct cirrusfb_board_info_rec {
                         /* guess */
                         135100, 135100, 135100, 135100, 135100,
                 },
-                .init_sr07              = FALSE,
-                .init_sr1f              = FALSE,
-                .scrn_start_bit19       = TRUE,
+                .init_sr07              = false,
+                .init_sr1f              = false,
+                .scrn_start_bit19       = true,
         }
 };
 
@@ -815,7 +806,7 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
 
         default:
                 DPRINTK("Unsupported bpp size: %d\n", var->bits_per_pixel);
-                assert (FALSE);
+                assert(false);
                 /* should never occur */
                 break;
         }
@@ -886,7 +877,7 @@ static int cirrusfb_decode_var (const struct fb_var_screeninfo *var,
 
         default:
                 DPRINTK("Unsupported bpp size: %d\n", var->bits_per_pixel);
-                assert (FALSE);
+                assert(false);
                 /* should never occur */
                 break;
         }
@@ -3203,7 +3194,7 @@ void cirrusfb_dbg_print_regs (caddr_t regbase, cirrusfb_dbg_reg_class_t reg_clas
                         break;
                 default:
                         /* should never occur */
-                        assert (FALSE);
+                        assert(false);
                         break;
                 }
 
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index aa3935df852a..63b85bf81a65 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -19,13 +19,6 @@ config VGA_CONSOLE
 
           Say Y.
 
-#       if [ "$CONFIG_PCI" = "y" -a "$CONFIG_VGA_CONSOLE" = "y" ]; then
-#          bool '   Allow VGA on any bus?' CONFIG_VGA_HOSE
-#          if [ "$CONFIG_VGA_HOSE" = "y" ]; then
-#             define_bool CONFIG_DUMMY_CONSOLE y
-#          fi
-#       fi
-
 config VGACON_SOFT_SCROLLBACK
        bool "Enable Scrollback Buffer in System RAM"
        depends on VGA_CONSOLE
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 0429fd2cece0..73813c60d03a 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -107,7 +107,9 @@ static struct display fb_display[MAX_NR_CONSOLES];
 
 static signed char con2fb_map[MAX_NR_CONSOLES];
 static signed char con2fb_map_boot[MAX_NR_CONSOLES];
+#ifndef MODULE
 static int logo_height;
+#endif
 static int logo_lines;
 /* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
    enums.  */
@@ -576,6 +578,13 @@ static int fbcon_takeover(int show_logo)
         return err;
 }
 
+#ifdef MODULE
+static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
+                               int cols, int rows, int new_cols, int new_rows)
+{
+        logo_shown = FBCON_LOGO_DONTSHOW;
+}
+#else
 static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
                                int cols, int rows, int new_cols, int new_rows)
 {
@@ -584,6 +593,11 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
         int cnt, erase = vc->vc_video_erase_char, step;
         unsigned short *save = NULL, *r, *q;
 
+        if (info->flags & FBINFO_MODULE) {
+                logo_shown = FBCON_LOGO_DONTSHOW;
+                return;
+        }
+
         /*
          * remove underline attribute from erase character
          * if black and white framebuffer.
@@ -618,8 +632,13 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
                         r -= cols;
                 }
                 if (!save) {
-                        vc->vc_y += logo_lines;
-                        vc->vc_pos += logo_lines * vc->vc_size_row;
+                        int lines;
+                        if (vc->vc_y + logo_lines >= rows)
+                                lines = rows - vc->vc_y - 1;
+                        else
+                                lines = logo_lines;
+                        vc->vc_y += lines;
+                        vc->vc_pos += lines * vc->vc_size_row;
                 }
         }
         scr_memsetw((unsigned short *) vc->vc_origin,
@@ -650,6 +669,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
                 vc->vc_top = logo_lines;
         }
 }
+#endif /* MODULE */
 
 #ifdef CONFIG_FB_TILEBLITTING
 static void set_blitting_type(struct vc_data *vc, struct fb_info *info)
@@ -665,6 +685,17 @@ static void set_blitting_type(struct vc_data *vc, struct fb_info *info)
                 fbcon_set_bitops(ops);
         }
 }
+
+static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)
+{
+        int err = 0;
+
+        if (info->flags & FBINFO_MISC_TILEBLITTING &&
+            info->tileops->fb_get_tilemax(info) < charcount)
+                err = 1;
+
+        return err;
+}
 #else
 static void set_blitting_type(struct vc_data *vc, struct fb_info *info)
 {
@@ -675,6 +706,12 @@ static void set_blitting_type(struct vc_data *vc, struct fb_info *info)
         fbcon_set_rotation(info);
         fbcon_set_bitops(ops);
 }
+
+static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)
+{
+        return 0;
+}
+
 #endif /* CONFIG_MISC_TILEBLITTING */
 
 
@@ -968,7 +1005,9 @@ static const char *fbcon_startup(void)
         if (!p->fontdata) {
                 if (!fontname[0] || !(font = find_font(fontname)))
                         font = get_default_font(info->var.xres,
-                                                info->var.yres);
+                                                info->var.yres,
+                                                info->pixmap.blit_x,
+                                                info->pixmap.blit_y);
                 vc->vc_font.width = font->width;
                 vc->vc_font.height = font->height;
                 vc->vc_font.data = (void *)(p->fontdata = font->data);
@@ -1088,7 +1127,9 @@ static void fbcon_init(struct vc_data *vc, int init)
 
                         if (!fontname[0] || !(font = find_font(fontname)))
                                 font = get_default_font(info->var.xres,
-                                                        info->var.yres);
+                                                        info->var.yres,
+                                                        info->pixmap.blit_x,
+                                                        info->pixmap.blit_y);
                         vc->vc_font.width = font->width;
                         vc->vc_font.height = font->height;
                         vc->vc_font.data = (void *)(p->fontdata = font->data);
@@ -1305,7 +1346,7 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
         int y;
         int c = scr_readw((u16 *) vc->vc_pos);
 
-        if (fbcon_is_inactive(vc, info))
+        if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
                 return;
 
         ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
@@ -2475,6 +2516,7 @@ static int fbcon_copy_font(struct vc_data *vc, int con)
 
 static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigned flags)
 {
+        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
         unsigned charcount = font->charcount;
         int w = font->width;
         int h = font->height;
@@ -2488,6 +2530,15 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne
         if (charcount != 256 && charcount != 512)
                 return -EINVAL;
 
+        /* Make sure drawing engine can handle the font */
+        if (!(info->pixmap.blit_x & (1 << (font->width - 1))) ||
+            !(info->pixmap.blit_y & (1 << (font->height - 1))))
+                return -EINVAL;
+
+        /* Make sure driver can handle the font length */
+        if (fbcon_invalid_charcount(info, charcount))
+                return -EINVAL;
+
         size = h * pitch * charcount;
 
         new_data = kmalloc(FONT_EXTRA_WORDS * sizeof(int) + size, GFP_USER);
@@ -2532,7 +2583,8 @@ static int fbcon_set_def_font(struct vc_data *vc, struct console_font *font, cha
         const struct font_desc *f;
 
         if (!name)
-                f = get_default_font(info->var.xres, info->var.yres);
+                f = get_default_font(info->var.xres, info->var.yres,
+                                     info->pixmap.blit_x, info->pixmap.blit_y);
         else if (!(f = find_font(name)))
                 return -ENOENT;
 
@@ -2829,7 +2881,7 @@ static void fbcon_set_all_vcs(struct fb_info *info)
         struct fbcon_ops *ops = info->fbcon_par;
         struct vc_data *vc;
         struct display *p;
-        int i, rows, cols;
+        int i, rows, cols, fg = -1;
 
         if (!ops || ops->currcon < 0)
                 return;
@@ -2840,34 +2892,23 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                     registered_fb[con2fb_map[i]] != info)
                         continue;
 
+                if (CON_IS_VISIBLE(vc)) {
+                        fg = i;
+                        continue;
+                }
+
                 p = &fb_display[vc->vc_num];
                 set_blitting_type(vc, info);
                 var_to_display(p, &info->var, info);
-                cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
-                rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
+                cols = FBCON_SWAP(p->rotate, info->var.xres, info->var.yres);
+                rows = FBCON_SWAP(p->rotate, info->var.yres, info->var.xres);
                 cols /= vc->vc_font.width;
                 rows /= vc->vc_font.height;
                 vc_resize(vc, cols, rows);
-
-                if (CON_IS_VISIBLE(vc)) {
-                        updatescrollmode(p, info, vc);
-                        scrollback_max = 0;
-                        scrollback_current = 0;
-
-                        if (!fbcon_is_inactive(vc, info)) {
-                            ops->var.xoffset = ops->var.yoffset =
-                                p->yscroll = 0;
-                            ops->update_start(info);
-                        }
-
-                        fbcon_set_palette(vc, color_table);
-                        update_screen(vc);
-                        if (softback_buf)
-                                fbcon_update_softback(vc);
-                }
         }
 
-        ops->p = &fb_display[ops->currcon];
+        if (fg != -1)
+                fbcon_modechanged(info);
 }
 
 static int fbcon_mode_deleted(struct fb_info *info,
@@ -3002,6 +3043,42 @@ static void fbcon_new_modelist(struct fb_info *info)
         }
 }
 
+static void fbcon_get_requirement(struct fb_info *info,
+                                  struct fb_blit_caps *caps)
+{
+        struct vc_data *vc;
+        struct display *p;
+
+        if (caps->flags) {
+                int i, charcnt;
+
+                for (i = first_fb_vc; i <= last_fb_vc; i++) {
+                        vc = vc_cons[i].d;
+                        if (vc && vc->vc_mode == KD_TEXT &&
+                            info->node == con2fb_map[i]) {
+                                p = &fb_display[i];
+                                caps->x |= 1 << (vc->vc_font.width - 1);
+                                caps->y |= 1 << (vc->vc_font.height - 1);
+                                charcnt = (p->userfont) ?
+                                        FNTCHARCNT(p->fontdata) : 256;
+                                if (caps->len < charcnt)
+                                        caps->len = charcnt;
+                        }
+                }
+        } else {
+                vc = vc_cons[fg_console].d;
+
+                if (vc && vc->vc_mode == KD_TEXT &&
+                    info->node == con2fb_map[fg_console]) {
+                        p = &fb_display[fg_console];
+                        caps->x = 1 << (vc->vc_font.width - 1);
+                        caps->y = 1 << (vc->vc_font.height - 1);
+                        caps->len = (p->userfont) ?
+                                FNTCHARCNT(p->fontdata) : 256;
+                }
+        }
+}
+
 static int fbcon_event_notify(struct notifier_block *self, 
                               unsigned long action, void *data)
 {
@@ -3009,6 +3086,7 @@ static int fbcon_event_notify(struct notifier_block *self,
         struct fb_info *info = event->info;
         struct fb_videomode *mode;
         struct fb_con2fbmap *con2fb;
+        struct fb_blit_caps *caps;
         int ret = 0;
 
         /*
@@ -3057,6 +3135,10 @@ static int fbcon_event_notify(struct notifier_block *self,
         case FB_EVENT_NEW_MODELIST:
                 fbcon_new_modelist(info);
                 break;
+        case FB_EVENT_GET_REQ:
+                caps = event->data;
+                fbcon_get_requirement(info, caps);
+                break;
         }
 
 done:
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index c960728b7e82..a6828d0a4c56 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -98,6 +98,8 @@ const struct font_desc *find_font(const char *name)
  *      get_default_font - get default font
  *      @xres: screen size of X
  *      @yres: screen size of Y
+ *      @font_w: bit array of supported widths (1 - 32)
+ *      @font_h: bit array of supported heights (1 - 32)
  *
  *      Get the default font for a specified screen size.
  *      Dimensions are in pixels.
@@ -107,7 +109,8 @@ const struct font_desc *find_font(const char *name)
  *
  */
 
-const struct font_desc *get_default_font(int xres, int yres)
+const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
+                                         u32 font_h)
 {
     int i, c, cc;
     const struct font_desc *f, *g;
@@ -129,6 +132,11 @@ const struct font_desc *get_default_font(int xres, int yres)
 #endif
         if ((yres < 400) == (f->height <= 8))
             c += 1000;
+
+        if (!(font_w & (1 << (f->width - 1))) ||
+            !(font_w & (1 << (f->height - 1))))
+            c += 1000;
+
         if (c > cc) {
             cc = c;
             g = f;
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 124ecbe6f88c..bd8d995fe25d 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -384,7 +384,7 @@ static inline u16 mda_convert_attr(u16 ch)
 }
 
 static u8 mdacon_build_attr(struct vc_data *c, u8 color, u8 intensity, 
-                            u8 blink, u8 underline, u8 reverse)
+                            u8 blink, u8 underline, u8 reverse, u8 italic)
 {
         /* The attribute is just a bit vector:
          *
@@ -397,6 +397,7 @@ static u8 mdacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
         return (intensity & 3) |
                 ((underline & 1) << 2) |
                 ((reverse   & 1) << 3) |
+                (!!italic << 4) |
                 ((blink     & 1) << 7);
 }
 
diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c
index b78eac63459f..ae02e4eb18e7 100644
--- a/drivers/video/console/promcon.c
+++ b/drivers/video/console/promcon.c
@@ -548,7 +548,8 @@ promcon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
 }
 
 #if !(PROMCON_COLOR)
-static u8 promcon_build_attr(struct vc_data *conp, u8 _color, u8 _intensity, u8 _blink, u8 _underline, u8 _reverse)
+static u8 promcon_build_attr(struct vc_data *conp, u8 _color, u8 _intensity,
+    u8 _blink, u8 _underline, u8 _reverse, u8 _italic)
 {
         return (_reverse) ? 0xf : 0x7;
 }
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index f577bd80e020..03cfb7ac5733 100644
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/video/softcursor.c
+ * linux/drivers/video/console/softcursor.c
  *
  * Generic software cursor for frame buffer devices
  *
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 57b21e533036..67a682d6cc7b 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -314,7 +314,7 @@ static unsigned long sticon_getxy(struct vc_data *conp, unsigned long pos,
 }
 
 static u8 sticon_build_attr(struct vc_data *conp, u8 color, u8 intens,
-                            u8 blink, u8 underline, u8 reverse)
+                            u8 blink, u8 underline, u8 reverse, u8 italic)
 {
     u8 attr = ((color & 0x70) >> 1) | ((color & 7));
 
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 88e7038eab88..717b360d0415 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -495,7 +495,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
                 return NULL;
         fbfont = find_font(fbfont_name);
         if (!fbfont)
-                fbfont = get_default_font(1024,768);
+                fbfont = get_default_font(1024,768, ~(u32)0, ~(u32)0);
         if (!fbfont)
                 return NULL;
 
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 3e67c34df9a5..f46fe95f69fb 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -86,8 +86,6 @@ static int vgacon_set_origin(struct vc_data *c);
 static void vgacon_save_screen(struct vc_data *c);
 static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                          int lines);
-static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
-                            u8 blink, u8 underline, u8 reverse);
 static void vgacon_invert_region(struct vc_data *c, u16 * p, int count);
 static unsigned long vgacon_uni_pagedir[2];
 
@@ -370,9 +368,14 @@ static const char *vgacon_startup(void)
 #endif
         }
 
+        /* SCREEN_INFO initialized? */
+        if ((ORIG_VIDEO_MODE  == 0) &&
+            (ORIG_VIDEO_LINES == 0) &&
+            (ORIG_VIDEO_COLS  == 0))
+                goto no_vga;
+
         /* VGA16 modes are not handled by VGACON */
-        if ((ORIG_VIDEO_MODE == 0x00) ||        /* SCREEN_INFO not initialized */
-            (ORIG_VIDEO_MODE == 0x0D) ||        /* 320x200/4 */
+        if ((ORIG_VIDEO_MODE == 0x0D) ||        /* 320x200/4 */
             (ORIG_VIDEO_MODE == 0x0E) ||        /* 640x200/4 */
             (ORIG_VIDEO_MODE == 0x10) ||        /* 640x350/4 */
             (ORIG_VIDEO_MODE == 0x12) ||        /* 640x480/4 */
@@ -578,12 +581,14 @@ static void vgacon_deinit(struct vc_data *c)
 }
 
 static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
-                            u8 blink, u8 underline, u8 reverse)
+                            u8 blink, u8 underline, u8 reverse, u8 italic)
 {
         u8 attr = color;
 
         if (vga_can_do_color) {
-                if (underline)
+                if (italic)
+                        attr = (attr & 0xF0) | c->vc_itcolor;
+                else if (underline)
                         attr = (attr & 0xf0) | c->vc_ulcolor;
                 else if (intensity == 0)
                         attr = (attr & 0xf0) | c->vc_halfcolor;
@@ -597,7 +602,9 @@ static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
         if (intensity == 2)
                 attr ^= 0x08;
         if (!vga_can_do_color) {
-                if (underline)
+                if (italic)
+                        attr = (attr & 0xF8) | 0x02;
+                else if (underline)
                         attr = (attr & 0xf8) | 0x01;
                 else if (intensity == 0)
                         attr = (attr & 0xf0) | 0x08;
@@ -658,6 +665,9 @@ static void vgacon_set_cursor_size(int xpos, int from, int to)
 
 static void vgacon_cursor(struct vc_data *c, int mode)
 {
+        if (c->vc_mode != KD_TEXT)
+                return;
+
         vgacon_restore_screen(c);
 
         switch (mode) {
@@ -1316,7 +1326,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
         unsigned long oldo;
         unsigned int delta;
 
-        if (t || b != c->vc_rows || vga_is_gfx)
+        if (t || b != c->vc_rows || vga_is_gfx || c->vc_mode != KD_TEXT)
                 return 0;
 
         if (!vga_hardscroll_enabled || lines >= c->vc_rows / 2)
diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
new file mode 100644
index 000000000000..f99af931d4f8
--- /dev/null
+++ b/drivers/video/display/Kconfig
@@ -0,0 +1,24 @@
+#
+# Display drivers configuration
+#
+
+menu "Display device support"
+
+config DISPLAY_SUPPORT
+        tristate "Display panel/monitor support"
+        ---help---
+          This framework adds support for low-level control of a display.
+          This includes support for power.
+
+          Enable this to be able to choose the drivers for controlling the
+          physical display panel/monitor on some platforms. This not only
+          covers LCD displays for PDAs but also other types of displays
+          such as CRT, TVout etc.
+
+          To have support for your specific display panel you will have to
+          select the proper drivers which depend on this option.
+
+comment "Display hardware drivers"
+        depends on DISPLAY_SUPPORT
+
+endmenu
diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile
new file mode 100644
index 000000000000..c0ea832bf171
--- /dev/null
+++ b/drivers/video/display/Makefile
@@ -0,0 +1,6 @@
+# Display drivers
+
+display-objs                            := display-sysfs.o
+
+obj-$(CONFIG_DISPLAY_SUPPORT)           += display.o
+
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
new file mode 100644
index 000000000000..35477177bef4
--- /dev/null
+++ b/drivers/video/display/display-sysfs.c
@@ -0,0 +1,217 @@
+/*
+ *  display-sysfs.c - Display output driver sysfs interface
+ *
+ *  Copyright (C) 2007 James Simmons <jsimmons@infradead.org>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/module.h>
+#include <linux/display.h>
+#include <linux/ctype.h>
+#include <linux/idr.h>
+#include <linux/err.h>
+
+static ssize_t display_show_name(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+        return snprintf(buf, PAGE_SIZE, "%s\n", dsp->name);
+}
+
+static ssize_t display_show_type(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+        return snprintf(buf, PAGE_SIZE, "%s\n", dsp->type);
+}
+
+static ssize_t display_show_contrast(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+        ssize_t rc = -ENXIO;
+
+        mutex_lock(&dsp->lock);
+        if (likely(dsp->driver) && dsp->driver->get_contrast)
+                rc = sprintf(buf, "%d\n", dsp->driver->get_contrast(dsp));
+        mutex_unlock(&dsp->lock);
+        return rc;
+}
+
+static ssize_t display_store_contrast(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+        ssize_t ret = -EINVAL, size;
+        int contrast;
+        char *endp;
+
+        contrast = simple_strtoul(buf, &endp, 0);
+        size = endp - buf;
+
+        if (*endp && isspace(*endp))
+                size++;
+
+        if (size != count)
+                return ret;
+
+        mutex_lock(&dsp->lock);
+        if (likely(dsp->driver && dsp->driver->set_contrast)) {
+                pr_debug("display: set contrast to %d\n", contrast);
+                dsp->driver->set_contrast(dsp, contrast);
+                ret = count;
+        }
+        mutex_unlock(&dsp->lock);
+        return ret;
+}
+
+static ssize_t display_show_max_contrast(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+        ssize_t rc = -ENXIO;
+
+        mutex_lock(&dsp->lock);
+        if (likely(dsp->driver))
+                rc = sprintf(buf, "%d\n", dsp->driver->max_contrast);
+        mutex_unlock(&dsp->lock);
+        return rc;
+}
+
+static struct device_attribute display_attrs[] = {
+        __ATTR(name, S_IRUGO, display_show_name, NULL),
+        __ATTR(type, S_IRUGO, display_show_type, NULL),
+        __ATTR(contrast, S_IRUGO | S_IWUSR, display_show_contrast, display_store_contrast),
+        __ATTR(max_contrast, S_IRUGO, display_show_max_contrast, NULL),
+};
+
+static int display_suspend(struct device *dev, pm_message_t state)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+
+        mutex_lock(&dsp->lock);
+        if (likely(dsp->driver->suspend))
+                dsp->driver->suspend(dsp, state);
+        mutex_unlock(&dsp->lock);
+        return 0;
+};
+
+static int display_resume(struct device *dev)
+{
+        struct display_device *dsp = dev_get_drvdata(dev);
+
+        mutex_lock(&dsp->lock);
+        if (likely(dsp->driver->resume))
+                dsp->driver->resume(dsp);
+        mutex_unlock(&dsp->lock);
+        return 0;
+};
+
+static struct mutex allocated_dsp_lock;
+static DEFINE_IDR(allocated_dsp);
+static struct class *display_class;
+
+struct display_device *display_device_register(struct display_driver *driver,
+                                                struct device *parent, void *devdata)
+{
+        struct display_device *new_dev = NULL;
+        int ret = -EINVAL;
+
+        if (unlikely(!driver))
+                return ERR_PTR(ret);
+
+        mutex_lock(&allocated_dsp_lock);
+        ret = idr_pre_get(&allocated_dsp, GFP_KERNEL);
+        mutex_unlock(&allocated_dsp_lock);
+        if (!ret)
+                return ERR_PTR(ret);
+
+        new_dev = kzalloc(sizeof(struct display_device), GFP_KERNEL);
+        if (likely(new_dev) && unlikely(driver->probe(new_dev, devdata))) {
+                // Reserve the index for this display
+                mutex_lock(&allocated_dsp_lock);
+                ret = idr_get_new(&allocated_dsp, new_dev, &new_dev->idx);
+                mutex_unlock(&allocated_dsp_lock);
+
+                if (!ret) {
+                        new_dev->dev = device_create(display_class, parent, 0,
+                                                "display%d", new_dev->idx);
+                        if (!IS_ERR(new_dev->dev)) {
+                                dev_set_drvdata(new_dev->dev, new_dev);
+                                new_dev->parent = parent;
+                                new_dev->driver = driver;
+                                mutex_init(&new_dev->lock);
+                                return new_dev;
+                        }
+                        mutex_lock(&allocated_dsp_lock);
+                        idr_remove(&allocated_dsp, new_dev->idx);
+                        mutex_unlock(&allocated_dsp_lock);
+                        ret = -EINVAL;
+                }
+        }
+        kfree(new_dev);
+        return ERR_PTR(ret);
+}
+EXPORT_SYMBOL(display_device_register);
+
+void display_device_unregister(struct display_device *ddev)
+{
+        if (!ddev)
+                return;
+        // Free device
+        mutex_lock(&ddev->lock);
+        device_unregister(ddev->dev);
+        mutex_unlock(&ddev->lock);
+        // Mark device index as avaliable
+        mutex_lock(&allocated_dsp_lock);
+        idr_remove(&allocated_dsp, ddev->idx);
+        mutex_unlock(&allocated_dsp_lock);
+        kfree(ddev);
+}
+EXPORT_SYMBOL(display_device_unregister);
+
+static int __init display_class_init(void)
+{
+        display_class = class_create(THIS_MODULE, "display");
+        if (IS_ERR(display_class)) {
+                printk(KERN_ERR "Failed to create display class\n");
+                display_class = NULL;
+                return -EINVAL;
+        }
+        display_class->dev_attrs = display_attrs;
+        display_class->suspend = display_suspend;
+        display_class->resume = display_resume;
+        mutex_init(&allocated_dsp_lock);
+        return 0;
+}
+
+static void __exit display_class_exit(void)
+{
+        class_destroy(display_class);
+}
+
+module_init(display_class_init);
+module_exit(display_class_exit);
+
+MODULE_DESCRIPTION("Display Hardware handling");
+MODULE_AUTHOR("James Simmons <jsimmons@infradead.org>");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 29e07c109887..ca2c54ce508e 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -403,17 +403,10 @@ static inline unsigned long copy_to_user16(void *to, const void *from,
 
 
 static ssize_t
-epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
+epson1355fb_read(struct fb_info *info, char *buf, size_t count, loff_t * ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int fbidx = iminor(inode);
-        struct fb_info *info = registered_fb[fbidx];
         unsigned long p = *ppos;
 
-        /* from fbmem.c except for our own copy_*_user */
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
         if (p >= info->fix.smem_len)
                 return 0;
         if (count >= info->fix.smem_len)
@@ -434,20 +427,13 @@ epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
 }
 
 static ssize_t
-epson1355fb_write(struct file *file, const char *buf,
+epson1355fb_write(struct fb_info *info, const char *buf,
                   size_t count, loff_t * ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int fbidx = iminor(inode);
-        struct fb_info *info = registered_fb[fbidx];
         unsigned long p = *ppos;
         int err;
 
         /* from fbmem.c except for our own copy_*_user */
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
-        /* from fbmem.c except for our own copy_*_user */
         if (p > info->fix.smem_len)
                 return -ENOSPC;
         if (count >= info->fix.smem_len)
@@ -650,9 +636,10 @@ int __init epson1355fb_probe(struct platform_device *dev)
         }
 
         info = framebuffer_alloc(sizeof(struct epson1355_par) + sizeof(u32) * 256, &dev->dev);
-        if (!info)
+        if (!info) {
                 rc = -ENOMEM;
                 goto bail;
+        }
 
         default_par = info->par;
         default_par->reg_addr = (unsigned long) ioremap(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN);
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
new file mode 100644
index 000000000000..1a8643f053d8
--- /dev/null
+++ b/drivers/video/fb_defio.c
@@ -0,0 +1,151 @@
+/*
+ *  linux/drivers/video/fb_defio.c
+ *
+ *  Copyright (C) 2006 Jaya Kumar
+ *
+ * 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/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/list.h>
+#include <asm/uaccess.h>
+
+/* to support deferred IO */
+#include <linux/rmap.h>
+#include <linux/pagemap.h>
+
+/* this is to find and return the vmalloc-ed fb pages */
+static struct page* fb_deferred_io_nopage(struct vm_area_struct *vma,
+                                        unsigned long vaddr, int *type)
+{
+        unsigned long offset;
+        struct page *page;
+        struct fb_info *info = vma->vm_private_data;
+        /* info->screen_base is in System RAM */
+        void *screen_base = (void __force *) info->screen_base;
+
+        offset = (vaddr - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
+        if (offset >= info->fix.smem_len)
+                return NOPAGE_SIGBUS;
+
+        page = vmalloc_to_page(screen_base + offset);
+        if (!page)
+                return NOPAGE_OOM;
+
+        get_page(page);
+        if (type)
+                *type = VM_FAULT_MINOR;
+        return page;
+}
+
+int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync)
+{
+        struct fb_info *info = file->private_data;
+
+        /* Kill off the delayed work */
+        cancel_rearming_delayed_work(&info->deferred_work);
+
+        /* Run it immediately */
+        return schedule_delayed_work(&info->deferred_work, 0);
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_fsync);
+
+/* vm_ops->page_mkwrite handler */
+static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
+                                  struct page *page)
+{
+        struct fb_info *info = vma->vm_private_data;
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+
+        /* this is a callback we get when userspace first tries to
+        write to the page. we schedule a workqueue. that workqueue
+        will eventually mkclean the touched pages and execute the
+        deferred framebuffer IO. then if userspace touches a page
+        again, we repeat the same scheme */
+
+        /* protect against the workqueue changing the page list */
+        mutex_lock(&fbdefio->lock);
+        list_add(&page->lru, &fbdefio->pagelist);
+        mutex_unlock(&fbdefio->lock);
+
+        /* come back after delay to process the deferred IO */
+        schedule_delayed_work(&info->deferred_work, fbdefio->delay);
+        return 0;
+}
+
+static struct vm_operations_struct fb_deferred_io_vm_ops = {
+        .nopage         = fb_deferred_io_nopage,
+        .page_mkwrite   = fb_deferred_io_mkwrite,
+};
+
+static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+        vma->vm_ops = &fb_deferred_io_vm_ops;
+        vma->vm_flags |= ( VM_IO | VM_RESERVED | VM_DONTEXPAND );
+        vma->vm_private_data = info;
+        return 0;
+}
+
+/* workqueue callback */
+static void fb_deferred_io_work(struct work_struct *work)
+{
+        struct fb_info *info = container_of(work, struct fb_info,
+                                                deferred_work.work);
+        struct list_head *node, *next;
+        struct page *cur;
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+
+        /* here we mkclean the pages, then do all deferred IO */
+        mutex_lock(&fbdefio->lock);
+        list_for_each_entry(cur, &fbdefio->pagelist, lru) {
+                lock_page(cur);
+                page_mkclean(cur);
+                unlock_page(cur);
+        }
+
+        /* driver's callback with pagelist */
+        fbdefio->deferred_io(info, &fbdefio->pagelist);
+
+        /* clear the list */
+        list_for_each_safe(node, next, &fbdefio->pagelist) {
+                list_del(node);
+        }
+        mutex_unlock(&fbdefio->lock);
+}
+
+void fb_deferred_io_init(struct fb_info *info)
+{
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+
+        BUG_ON(!fbdefio);
+        mutex_init(&fbdefio->lock);
+        info->fbops->fb_mmap = fb_deferred_io_mmap;
+        INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
+        INIT_LIST_HEAD(&fbdefio->pagelist);
+        if (fbdefio->delay == 0) /* set a default of 1 s */
+                fbdefio->delay = HZ;
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_init);
+
+void fb_deferred_io_cleanup(struct fb_info *info)
+{
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+
+        BUG_ON(!fbdefio);
+        cancel_delayed_work(&info->deferred_work);
+        flush_scheduled_work();
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h
new file mode 100644
index 000000000000..c5c45203833b
--- /dev/null
+++ b/drivers/video/fb_draw.h
@@ -0,0 +1,72 @@
+#ifndef _FB_DRAW_H
+#define _FB_DRAW_H
+
+#include <asm/types.h>
+
+    /*
+     *  Compose two values, using a bitmask as decision value
+     *  This is equivalent to (a & mask) | (b & ~mask)
+     */
+
+static inline unsigned long
+comp(unsigned long a, unsigned long b, unsigned long mask)
+{
+    return ((a ^ b) & mask) ^ b;
+}
+
+    /*
+     *  Create a pattern with the given pixel's color
+     */
+
+#if BITS_PER_LONG == 64
+static inline unsigned long
+pixel_to_pat( u32 bpp, u32 pixel)
+{
+        switch (bpp) {
+        case 1:
+                return 0xfffffffffffffffful*pixel;
+        case 2:
+                return 0x5555555555555555ul*pixel;
+        case 4:
+                return 0x1111111111111111ul*pixel;
+        case 8:
+                return 0x0101010101010101ul*pixel;
+        case 12:
+                return 0x0001001001001001ul*pixel;
+        case 16:
+                return 0x0001000100010001ul*pixel;
+        case 24:
+                return 0x0000000001000001ul*pixel;
+        case 32:
+                return 0x0000000100000001ul*pixel;
+        default:
+                panic("pixel_to_pat(): unsupported pixelformat\n");
+    }
+}
+#else
+static inline unsigned long
+pixel_to_pat( u32 bpp, u32 pixel)
+{
+        switch (bpp) {
+        case 1:
+                return 0xfffffffful*pixel;
+        case 2:
+                return 0x55555555ul*pixel;
+        case 4:
+                return 0x11111111ul*pixel;
+        case 8:
+                return 0x01010101ul*pixel;
+        case 12:
+                return 0x00001001ul*pixel;
+        case 16:
+                return 0x00010001ul*pixel;
+        case 24:
+                return 0x00000001ul*pixel;
+        case 32:
+                return 0x00000001ul*pixel;
+        default:
+                panic("pixel_to_pat(): unsupported pixelformat\n");
+    }
+}
+#endif
+#endif /* FB_DRAW_H */
diff --git a/drivers/video/fb_sys_fops.c b/drivers/video/fb_sys_fops.c
new file mode 100644
index 000000000000..cf2538d669cd
--- /dev/null
+++ b/drivers/video/fb_sys_fops.c
@@ -0,0 +1,104 @@
+/*
+ * linux/drivers/video/fb_sys_read.c - Generic file operations where
+ * framebuffer is in system RAM
+ *
+ * Copyright (C) 2007 Antonino Daplas <adaplas@pol.net>
+ *
+ * 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/fb.h>
+#include <linux/module.h>
+#include <asm/uaccess.h>
+
+ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count,
+                    loff_t *ppos)
+{
+        unsigned long p = *ppos;
+        void *src;
+        int err = 0;
+        unsigned long total_size;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
+
+        total_size = info->screen_size;
+
+        if (total_size == 0)
+                total_size = info->fix.smem_len;
+
+        if (p >= total_size)
+                return 0;
+
+        if (count >= total_size)
+                count = total_size;
+
+        if (count + p > total_size)
+                count = total_size - p;
+
+        src = (void __force *)(info->screen_base + p);
+
+        if (info->fbops->fb_sync)
+                info->fbops->fb_sync(info);
+
+        if (copy_to_user(buf, src, count))
+                err = -EFAULT;
+
+        if  (!err)
+                *ppos += count;
+
+        return (err) ? err : count;
+}
+EXPORT_SYMBOL_GPL(fb_sys_read);
+
+ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
+                     size_t count, loff_t *ppos)
+{
+        unsigned long p = *ppos;
+        void *dst;
+        int err = 0;
+        unsigned long total_size;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
+
+        total_size = info->screen_size;
+
+        if (total_size == 0)
+                total_size = info->fix.smem_len;
+
+        if (p > total_size)
+                return -EFBIG;
+
+        if (count > total_size) {
+                err = -EFBIG;
+                count = total_size;
+        }
+
+        if (count + p > total_size) {
+                if (!err)
+                        err = -ENOSPC;
+
+                count = total_size - p;
+        }
+
+        dst = (void __force *) (info->screen_base + p);
+
+        if (info->fbops->fb_sync)
+                info->fbops->fb_sync(info);
+
+        if (copy_from_user(dst, buf, count))
+                err = -EFAULT;
+
+        if  (!err)
+                *ppos += count;
+
+        return (err) ? err : count;
+}
+EXPORT_SYMBOL_GPL(fb_sys_write);
+
+MODULE_AUTHOR("Antonino Daplas <adaplas@pol.net>");
+MODULE_DESCRIPTION("Generic file read (fb in system RAM)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 28225265159a..38c2e2558f5e 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -354,59 +354,59 @@ static void fb_rotate_logo(struct fb_info *info, u8 *dst,
         if (rotate == FB_ROTATE_UD) {
                 fb_rotate_logo_ud(image->data, dst, image->width,
                                   image->height);
-                image->dx = info->var.xres - image->width;
-                image->dy = info->var.yres - image->height;
+                image->dx = info->var.xres - image->width - image->dx;
+                image->dy = info->var.yres - image->height - image->dy;
         } else if (rotate == FB_ROTATE_CW) {
                 fb_rotate_logo_cw(image->data, dst, image->width,
                                   image->height);
                 tmp = image->width;
                 image->width = image->height;
                 image->height = tmp;
-                image->dx = info->var.xres - image->width;
+                tmp = image->dy;
+                image->dy = image->dx;
+                image->dx = info->var.xres - image->width - tmp;
         } else if (rotate == FB_ROTATE_CCW) {
                 fb_rotate_logo_ccw(image->data, dst, image->width,
                                    image->height);
                 tmp = image->width;
                 image->width = image->height;
                 image->height = tmp;
-                image->dy = info->var.yres - image->height;
+                tmp = image->dx;
+                image->dx = image->dy;
+                image->dy = info->var.yres - image->height - tmp;
         }
 
         image->data = dst;
 }
 
 static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
-                            int rotate)
+                            int rotate, unsigned int num)
 {
-        int x;
+        unsigned int x;
 
         if (rotate == FB_ROTATE_UR) {
-                for (x = 0; x < num_online_cpus() &&
-                             x * (fb_logo.logo->width + 8) <=
-                             info->var.xres - fb_logo.logo->width; x++) {
+                for (x = 0;
+                     x < num && image->dx + image->width <= info->var.xres;
+                     x++) {
                         info->fbops->fb_imageblit(info, image);
-                        image->dx += fb_logo.logo->width + 8;
+                        image->dx += image->width + 8;
                 }
         } else if (rotate == FB_ROTATE_UD) {
-                for (x = 0; x < num_online_cpus() &&
-                             x * (fb_logo.logo->width + 8) <=
-                             info->var.xres - fb_logo.logo->width; x++) {
+                for (x = 0; x < num && image->dx >= 0; x++) {
                         info->fbops->fb_imageblit(info, image);
-                        image->dx -= fb_logo.logo->width + 8;
+                        image->dx -= image->width + 8;
                 }
         } else if (rotate == FB_ROTATE_CW) {
-                for (x = 0; x < num_online_cpus() &&
-                             x * (fb_logo.logo->width + 8) <=
-                             info->var.yres - fb_logo.logo->width; x++) {
+                for (x = 0;
+                     x < num && image->dy + image->height <= info->var.yres;
+                     x++) {
                         info->fbops->fb_imageblit(info, image);
-                        image->dy += fb_logo.logo->width + 8;
+                        image->dy += image->height + 8;
                 }
         } else if (rotate == FB_ROTATE_CCW) {
-                for (x = 0; x < num_online_cpus() &&
-                             x * (fb_logo.logo->width + 8) <=
-                             info->var.yres - fb_logo.logo->width; x++) {
+                for (x = 0; x < num && image->dy >= 0; x++) {
                         info->fbops->fb_imageblit(info, image);
-                        image->dy -= fb_logo.logo->width + 8;
+                        image->dy -= image->height + 8;
                 }
         }
 }
@@ -418,7 +418,8 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
 
         memset(&fb_logo, 0, sizeof(struct logo_data));
 
-        if (info->flags & FBINFO_MISC_TILEBLITTING)
+        if (info->flags & FBINFO_MISC_TILEBLITTING ||
+            info->flags & FBINFO_MODULE)
                 return 0;
 
         if (info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
@@ -483,7 +484,8 @@ int fb_show_logo(struct fb_info *info, int rotate)
         struct fb_image image;
 
         /* Return if the frame buffer is not mapped or suspended */
-        if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING)
+        if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING ||
+            info->flags & FBINFO_MODULE)
                 return 0;
 
         image.depth = 8;
@@ -532,7 +534,7 @@ int fb_show_logo(struct fb_info *info, int rotate)
                         fb_rotate_logo(info, logo_rotate, &image, rotate);
         }
 
-        fb_do_show_logo(info, &image, rotate);
+        fb_do_show_logo(info, &image, rotate, num_online_cpus());
 
         kfree(palette);
         if (saved_pseudo_palette != NULL)
@@ -586,7 +588,7 @@ fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 return -EPERM;
 
         if (info->fbops->fb_read)
-                return info->fbops->fb_read(file, buf, count, ppos);
+                return info->fbops->fb_read(info, buf, count, ppos);
         
         total_size = info->screen_size;
 
@@ -661,7 +663,7 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 return -EPERM;
 
         if (info->fbops->fb_write)
-                return info->fbops->fb_write(file, buf, count, ppos);
+                return info->fbops->fb_write(info, buf, count, ppos);
         
         total_size = info->screen_size;
 
@@ -771,14 +773,37 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
         return 0;
 }
 
+static int fb_check_caps(struct fb_info *info, struct fb_var_screeninfo *var,
+                         u32 activate)
+{
+        struct fb_event event;
+        struct fb_blit_caps caps, fbcaps;
+        int err = 0;
+
+        memset(&caps, 0, sizeof(caps));
+        memset(&fbcaps, 0, sizeof(fbcaps));
+        caps.flags = (activate & FB_ACTIVATE_ALL) ? 1 : 0;
+        event.info = info;
+        event.data = &caps;
+        fb_notifier_call_chain(FB_EVENT_GET_REQ, &event);
+        info->fbops->fb_get_caps(info, &fbcaps, var);
+
+        if (((fbcaps.x ^ caps.x) & caps.x) ||
+            ((fbcaps.y ^ caps.y) & caps.y) ||
+            (fbcaps.len < caps.len))
+                err = -EINVAL;
+
+        return err;
+}
+
 int
 fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 {
-        int err, flags = info->flags;
+        int flags = info->flags;
+        int ret = 0;
 
         if (var->activate & FB_ACTIVATE_INV_MODE) {
                 struct fb_videomode mode1, mode2;
-                int ret = 0;
 
                 fb_var_to_videomode(&mode1, var);
                 fb_var_to_videomode(&mode2, &info->var);
@@ -796,40 +821,51 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                 if (!ret)
                     fb_delete_videomode(&mode1, &info->modelist);
 
-                return ret;
+
+                ret = (ret) ? -EINVAL : 0;
+                goto done;
         }
 
         if ((var->activate & FB_ACTIVATE_FORCE) ||
             memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
+                u32 activate = var->activate;
+
                 if (!info->fbops->fb_check_var) {
                         *var = info->var;
-                        return 0;
+                        goto done;
                 }
 
-                if ((err = info->fbops->fb_check_var(var, info)))
-                        return err;
+                ret = info->fbops->fb_check_var(var, info);
+
+                if (ret)
+                        goto done;
 
                 if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
                         struct fb_videomode mode;
-                        int err = 0;
+
+                        if (info->fbops->fb_get_caps) {
+                                ret = fb_check_caps(info, var, activate);
+
+                                if (ret)
+                                        goto done;
+                        }
 
                         info->var = *var;
+
                         if (info->fbops->fb_set_par)
                                 info->fbops->fb_set_par(info);
 
                         fb_pan_display(info, &info->var);
-
                         fb_set_cmap(&info->cmap, info);
-
                         fb_var_to_videomode(&mode, &info->var);
 
                         if (info->modelist.prev && info->modelist.next &&
                             !list_empty(&info->modelist))
-                                err = fb_add_videomode(&mode, &info->modelist);
+                                ret = fb_add_videomode(&mode, &info->modelist);
 
-                        if (!err && (flags & FBINFO_MISC_USEREVENT)) {
+                        if (!ret && (flags & FBINFO_MISC_USEREVENT)) {
                                 struct fb_event event;
-                                int evnt = (var->activate & FB_ACTIVATE_ALL) ?
+                                int evnt = (activate & FB_ACTIVATE_ALL) ?
                                         FB_EVENT_MODE_CHANGE_ALL :
                                         FB_EVENT_MODE_CHANGE;
 
@@ -839,7 +875,9 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                         }
                 }
         }
-        return 0;
+
+ done:
+        return ret;
 }
 
 int
@@ -1198,6 +1236,10 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
         pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
 #elif defined(__arm__) || defined(__sh__) || defined(__m32r__)
         vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+#elif defined(__avr32__)
+        vma->vm_page_prot = __pgprot((pgprot_val(vma->vm_page_prot)
+                                      & ~_PAGE_CACHABLE)
+                                     | (_PAGE_BUFFER | _PAGE_DIRTY));
 #elif defined(__ia64__)
         if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start))
                 vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
@@ -1266,6 +1308,9 @@ static const struct file_operations fb_fops = {
 #ifdef HAVE_ARCH_FB_UNMAPPED_AREA
         .get_unmapped_area = get_fb_unmapped_area,
 #endif
+#ifdef CONFIG_FB_DEFERRED_IO
+        .fsync =        fb_deferred_io_fsync,
+#endif
 };
 
 struct class *fb_class;
@@ -1316,6 +1361,12 @@ register_framebuffer(struct fb_info *fb_info)
         }       
         fb_info->pixmap.offset = 0;
 
+        if (!fb_info->pixmap.blit_x)
+                fb_info->pixmap.blit_x = ~(u32)0;
+
+        if (!fb_info->pixmap.blit_y)
+                fb_info->pixmap.blit_y = ~(u32)0;
+
         if (!fb_info->modelist.prev || !fb_info->modelist.next)
                 INIT_LIST_HEAD(&fb_info->modelist);
 
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 6b385c39b8b5..438b9411905c 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -48,8 +48,9 @@
 #define DPRINTK(fmt, args...)
 #endif
 
-#define FBMON_FIX_HEADER 1
-#define FBMON_FIX_INPUT  2
+#define FBMON_FIX_HEADER  1
+#define FBMON_FIX_INPUT   2
+#define FBMON_FIX_TIMINGS 3
 
 #ifdef CONFIG_FB_MODE_HELPERS
 struct broken_edid {
@@ -71,6 +72,12 @@ static const struct broken_edid brokendb[] = {
                 .model        = 0x5a44,
                 .fix          = FBMON_FIX_INPUT,
         },
+        /* Sharp UXGA? */
+        {
+                .manufacturer = "SHP",
+                .model        = 0x138e,
+                .fix          = FBMON_FIX_TIMINGS,
+        },
 };
 
 static const unsigned char edid_v1_header[] = { 0x00, 0xff, 0xff, 0xff,
@@ -87,6 +94,55 @@ static void copy_string(unsigned char *c, unsigned char *s)
   while (i-- && (*--s == 0x20)) *s = 0;
 }
 
+static int edid_is_serial_block(unsigned char *block)
+{
+        if ((block[0] == 0x00) && (block[1] == 0x00) &&
+            (block[2] == 0x00) && (block[3] == 0xff) &&
+            (block[4] == 0x00))
+                return 1;
+        else
+                return 0;
+}
+
+static int edid_is_ascii_block(unsigned char *block)
+{
+        if ((block[0] == 0x00) && (block[1] == 0x00) &&
+            (block[2] == 0x00) && (block[3] == 0xfe) &&
+            (block[4] == 0x00))
+                return 1;
+        else
+                return 0;
+}
+
+static int edid_is_limits_block(unsigned char *block)
+{
+        if ((block[0] == 0x00) && (block[1] == 0x00) &&
+            (block[2] == 0x00) && (block[3] == 0xfd) &&
+            (block[4] == 0x00))
+                return 1;
+        else
+                return 0;
+}
+
+static int edid_is_monitor_block(unsigned char *block)
+{
+        if ((block[0] == 0x00) && (block[1] == 0x00) &&
+            (block[2] == 0x00) && (block[3] == 0xfc) &&
+            (block[4] == 0x00))
+                return 1;
+        else
+                return 0;
+}
+
+static int edid_is_timing_block(unsigned char *block)
+{
+        if ((block[0] != 0x00) || (block[1] != 0x00) ||
+            (block[2] != 0x00) || (block[4] != 0x00))
+                return 1;
+        else
+                return 0;
+}
+
 static int check_edid(unsigned char *edid)
 {
         unsigned char *block = edid + ID_MANUFACTURER_NAME, manufacturer[4];
@@ -104,9 +160,6 @@ static int check_edid(unsigned char *edid)
         for (i = 0; i < ARRAY_SIZE(brokendb); i++) {
                 if (!strncmp(manufacturer, brokendb[i].manufacturer, 4) &&
                         brokendb[i].model == model) {
-                        printk("fbmon: The EDID Block of "
-                               "Manufacturer: %s Model: 0x%x is known to "
-                               "be broken,\n",  manufacturer, model);
                         fix = brokendb[i].fix;
                         break;
                 }
@@ -115,8 +168,10 @@ static int check_edid(unsigned char *edid)
         switch (fix) {
         case FBMON_FIX_HEADER:
                 for (i = 0; i < 8; i++) {
-                        if (edid[i] != edid_v1_header[i])
+                        if (edid[i] != edid_v1_header[i]) {
                                 ret = fix;
+                                break;
+                        }
                 }
                 break;
         case FBMON_FIX_INPUT:
@@ -126,14 +181,34 @@ static int check_edid(unsigned char *edid)
                 if (b[4] & 0x01 && b[0] & 0x80)
                         ret = fix;
                 break;
+        case FBMON_FIX_TIMINGS:
+                b = edid + DETAILED_TIMING_DESCRIPTIONS_START;
+                ret = fix;
+
+                for (i = 0; i < 4; i++) {
+                        if (edid_is_limits_block(b)) {
+                                ret = 0;
+                                break;
+                        }
+
+                        b += DETAILED_TIMING_DESCRIPTION_SIZE;
+                }
+
+                break;
         }
 
+        if (ret)
+                printk("fbmon: The EDID Block of "
+                       "Manufacturer: %s Model: 0x%x is known to "
+                       "be broken,\n",  manufacturer, model);
+
         return ret;
 }
 
 static void fix_edid(unsigned char *edid, int fix)
 {
-        unsigned char *b;
+        int i;
+        unsigned char *b, csum = 0;
 
         switch (fix) {
         case FBMON_FIX_HEADER:
@@ -145,6 +220,37 @@ static void fix_edid(unsigned char *edid, int fix)
                 b = edid + EDID_STRUCT_DISPLAY;
                 b[0] &= ~0x80;
                 edid[127] += 0x80;
+                break;
+        case FBMON_FIX_TIMINGS:
+                printk("fbmon: trying to fix monitor timings\n");
+                b = edid + DETAILED_TIMING_DESCRIPTIONS_START;
+                for (i = 0; i < 4; i++) {
+                        if (!(edid_is_serial_block(b) ||
+                              edid_is_ascii_block(b) ||
+                              edid_is_monitor_block(b) ||
+                              edid_is_timing_block(b))) {
+                                b[0] = 0x00;
+                                b[1] = 0x00;
+                                b[2] = 0x00;
+                                b[3] = 0xfd;
+                                b[4] = 0x00;
+                                b[5] = 60;   /* vfmin */
+                                b[6] = 60;   /* vfmax */
+                                b[7] = 30;   /* hfmin */
+                                b[8] = 75;   /* hfmax */
+                                b[9] = 17;   /* pixclock - 170 MHz*/
+                                b[10] = 0;   /* GTF */
+                                break;
+                        }
+
+                        b += DETAILED_TIMING_DESCRIPTION_SIZE;
+                }
+
+                for (i = 0; i < EDID_LENGTH - 1; i++)
+                        csum += edid[i];
+
+                edid[127] = 256 - csum;
+                break;
         }
 }
 
@@ -273,46 +379,6 @@ static void get_chroma(unsigned char *block, struct fb_monspecs *specs)
         DPRINTK("WhiteY:   0.%03d\n", specs->chroma.whitey);
 }
 
-static int edid_is_serial_block(unsigned char *block)
-{
-        if ((block[0] == 0x00) && (block[1] == 0x00) && 
-            (block[2] == 0x00) && (block[3] == 0xff) &&
-            (block[4] == 0x00))
-                return 1;
-        else
-                return 0;
-}
-
-static int edid_is_ascii_block(unsigned char *block)
-{
-        if ((block[0] == 0x00) && (block[1] == 0x00) && 
-            (block[2] == 0x00) && (block[3] == 0xfe) &&
-            (block[4] == 0x00))
-                return 1;
-        else
-                return 0;
-}
-
-static int edid_is_limits_block(unsigned char *block)
-{
-        if ((block[0] == 0x00) && (block[1] == 0x00) && 
-            (block[2] == 0x00) && (block[3] == 0xfd) &&
-            (block[4] == 0x00))
-                return 1;
-        else
-                return 0;
-}
-
-static int edid_is_monitor_block(unsigned char *block)
-{
-        if ((block[0] == 0x00) && (block[1] == 0x00) && 
-            (block[2] == 0x00) && (block[3] == 0xfc) &&
-            (block[4] == 0x00))
-                return 1;
-        else
-                return 0;
-}
-
 static void calc_mode_timings(int xres, int yres, int refresh,
                               struct fb_videomode *mode)
 {
@@ -795,15 +861,6 @@ static void get_monspecs(unsigned char *edid, struct fb_monspecs *specs)
         }
 }
 
-static int edid_is_timing_block(unsigned char *block)
-{
-        if ((block[0] != 0x00) || (block[1] != 0x00) ||
-            (block[2] != 0x00) || (block[4] != 0x00))
-                return 1;
-        else
-                return 0;
-}
-
 int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
 {
         int i;
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 40c80c8190e2..d4a2c11d9809 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -376,7 +376,7 @@ static ssize_t show_pan(struct device *device,
 {
         struct fb_info *fb_info = dev_get_drvdata(device);
         return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xoffset,
-                        fb_info->var.xoffset);
+                        fb_info->var.yoffset);
 }
 
 static ssize_t show_name(struct device *device,
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
new file mode 100644
index 000000000000..abfcb50364c8
--- /dev/null
+++ b/drivers/video/hecubafb.c
@@ -0,0 +1,471 @@
+/*
+ * linux/drivers/video/hecubafb.c -- FB driver for Hecuba controller
+ *
+ * Copyright (C) 2006, Jaya Kumar
+ * This work was sponsored by CIS(M) Sdn Bhd
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ * This work was possible because of apollo display code from E-Ink's website
+ * http://support.eink.com/community
+ * All information used to write this code is from public material made
+ * available by E-Ink on its support site. Some commands such as 0xA4
+ * were found by looping through cmd=0x00 thru 0xFF and supplying random
+ * values. There are other commands that the display is capable of,
+ * beyond the 5 used here but they are more complex.
+ *
+ * This driver is written to be used with the Hecuba display controller
+ * board, and tested with the EInk 800x600 display in 1 bit mode.
+ * The interface between Hecuba and the host is TTL based GPIO. The
+ * GPIO requirements are 8 writable data lines and 6 lines for control.
+ * Only 4 of the controls are actually used here but 6 for future use.
+ * The driver requires the IO addresses for data and control GPIO at
+ * load time. It is also possible to use this display with a standard
+ * PC parallel port.
+ *
+ * General notes:
+ * - User must set hecubafb_enable=1 to enable it
+ * - User must set dio_addr=0xIOADDR cio_addr=0xIOADDR c2io_addr=0xIOADDR
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <asm/uaccess.h>
+
+/* Apollo controller specific defines */
+#define APOLLO_START_NEW_IMG    0xA0
+#define APOLLO_STOP_IMG_DATA    0xA1
+#define APOLLO_DISPLAY_IMG      0xA2
+#define APOLLO_ERASE_DISPLAY    0xA3
+#define APOLLO_INIT_DISPLAY     0xA4
+
+/* Hecuba interface specific defines */
+/* WUP is inverted, CD is inverted, DS is inverted */
+#define HCB_NWUP_BIT    0x01
+#define HCB_NDS_BIT     0x02
+#define HCB_RW_BIT      0x04
+#define HCB_NCD_BIT     0x08
+#define HCB_ACK_BIT     0x80
+
+/* Display specific information */
+#define DPY_W 600
+#define DPY_H 800
+
+struct hecubafb_par {
+        unsigned long dio_addr;
+        unsigned long cio_addr;
+        unsigned long c2io_addr;
+        unsigned char ctl;
+        struct fb_info *info;
+        unsigned int irq;
+};
+
+static struct fb_fix_screeninfo hecubafb_fix __devinitdata = {
+        .id =           "hecubafb",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_MONO01,
+        .xpanstep =     0,
+        .ypanstep =     0,
+        .ywrapstep =    0,
+        .accel =        FB_ACCEL_NONE,
+};
+
+static struct fb_var_screeninfo hecubafb_var __devinitdata = {
+        .xres           = DPY_W,
+        .yres           = DPY_H,
+        .xres_virtual   = DPY_W,
+        .yres_virtual   = DPY_H,
+        .bits_per_pixel = 1,
+        .nonstd         = 1,
+};
+
+static unsigned long dio_addr;
+static unsigned long cio_addr;
+static unsigned long c2io_addr;
+static unsigned long splashval;
+static unsigned int nosplash;
+static unsigned int hecubafb_enable;
+static unsigned int irq;
+
+static DECLARE_WAIT_QUEUE_HEAD(hecubafb_waitq);
+
+static void hcb_set_ctl(struct hecubafb_par *par)
+{
+        outb(par->ctl, par->cio_addr);
+}
+
+static unsigned char hcb_get_ctl(struct hecubafb_par *par)
+{
+        return inb(par->c2io_addr);
+}
+
+static void hcb_set_data(struct hecubafb_par *par, unsigned char value)
+{
+        outb(value, par->dio_addr);
+}
+
+static int __devinit apollo_init_control(struct hecubafb_par *par)
+{
+        unsigned char ctl;
+        /* for init, we want the following setup to be set:
+        WUP = lo
+        ACK = hi
+        DS = hi
+        RW = hi
+        CD = lo
+        */
+
+        /* write WUP to lo, DS to hi, RW to hi, CD to lo */
+        par->ctl = HCB_NWUP_BIT | HCB_RW_BIT | HCB_NCD_BIT ;
+        par->ctl &= ~HCB_NDS_BIT;
+        hcb_set_ctl(par);
+
+        /* check ACK is not lo */
+        ctl = hcb_get_ctl(par);
+        if ((ctl & HCB_ACK_BIT)) {
+                printk(KERN_ERR "Fail because ACK is already low\n");
+                return -ENXIO;
+        }
+
+        return 0;
+}
+
+static void hcb_wait_for_ack(struct hecubafb_par *par)
+{
+
+        int timeout;
+        unsigned char ctl;
+
+        timeout=500;
+        do {
+                ctl = hcb_get_ctl(par);
+                if ((ctl & HCB_ACK_BIT))
+                        return;
+                udelay(1);
+        } while (timeout--);
+        printk(KERN_ERR "timed out waiting for ack\n");
+}
+
+static void hcb_wait_for_ack_clear(struct hecubafb_par *par)
+{
+
+        int timeout;
+        unsigned char ctl;
+
+        timeout=500;
+        do {
+                ctl = hcb_get_ctl(par);
+                if (!(ctl & HCB_ACK_BIT))
+                        return;
+                udelay(1);
+        } while (timeout--);
+        printk(KERN_ERR "timed out waiting for clear\n");
+}
+
+static void apollo_send_data(struct hecubafb_par *par, unsigned char data)
+{
+        /* set data */
+        hcb_set_data(par, data);
+
+        /* set DS low */
+        par->ctl |= HCB_NDS_BIT;
+        hcb_set_ctl(par);
+
+        hcb_wait_for_ack(par);
+
+        /* set DS hi */
+        par->ctl &= ~(HCB_NDS_BIT);
+        hcb_set_ctl(par);
+
+        hcb_wait_for_ack_clear(par);
+}
+
+static void apollo_send_command(struct hecubafb_par *par, unsigned char data)
+{
+        /* command so set CD to high */
+        par->ctl &= ~(HCB_NCD_BIT);
+        hcb_set_ctl(par);
+
+        /* actually strobe with command */
+        apollo_send_data(par, data);
+
+        /* clear CD back to low */
+        par->ctl |= (HCB_NCD_BIT);
+        hcb_set_ctl(par);
+}
+
+/* main hecubafb functions */
+
+static void hecubafb_dpy_update(struct hecubafb_par *par)
+{
+        int i;
+        unsigned char *buf = (unsigned char __force *)par->info->screen_base;
+
+        apollo_send_command(par, 0xA0);
+
+        for (i=0; i < (DPY_W*DPY_H/8); i++) {
+                apollo_send_data(par, *(buf++));
+        }
+
+        apollo_send_command(par, 0xA1);
+        apollo_send_command(par, 0xA2);
+}
+
+/* this is called back from the deferred io workqueue */
+static void hecubafb_dpy_deferred_io(struct fb_info *info,
+                                struct list_head *pagelist)
+{
+        hecubafb_dpy_update(info->par);
+}
+
+static void hecubafb_fillrect(struct fb_info *info,
+                                   const struct fb_fillrect *rect)
+{
+        struct hecubafb_par *par = info->par;
+
+        sys_fillrect(info, rect);
+
+        hecubafb_dpy_update(par);
+}
+
+static void hecubafb_copyarea(struct fb_info *info,
+                                   const struct fb_copyarea *area)
+{
+        struct hecubafb_par *par = info->par;
+
+        sys_copyarea(info, area);
+
+        hecubafb_dpy_update(par);
+}
+
+static void hecubafb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        struct hecubafb_par *par = info->par;
+
+        sys_imageblit(info, image);
+
+        hecubafb_dpy_update(par);
+}
+
+/*
+ * this is the slow path from userspace. they can seek and write to
+ * the fb. it's inefficient to do anything less than a full screen draw
+ */
+static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        unsigned long p;
+        int err=-EINVAL;
+        struct hecubafb_par *par;
+        unsigned int xres;
+        unsigned int fbmemlength;
+
+        p = *ppos;
+        par = info->par;
+        xres = info->var.xres;
+        fbmemlength = (xres * info->var.yres)/8;
+
+        if (p > fbmemlength)
+                return -ENOSPC;
+
+        err = 0;
+        if ((count + p) > fbmemlength) {
+                count = fbmemlength - p;
+                err = -ENOSPC;
+        }
+
+        if (count) {
+                char *base_addr;
+
+                base_addr = (char __force *)info->screen_base;
+                count -= copy_from_user(base_addr + p, buf, count);
+                *ppos += count;
+                err = -EFAULT;
+        }
+
+        hecubafb_dpy_update(par);
+
+        if (count)
+                return count;
+
+        return err;
+}
+
+static struct fb_ops hecubafb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_read        = fb_sys_read,
+        .fb_write       = hecubafb_write,
+        .fb_fillrect    = hecubafb_fillrect,
+        .fb_copyarea    = hecubafb_copyarea,
+        .fb_imageblit   = hecubafb_imageblit,
+};
+
+static struct fb_deferred_io hecubafb_defio = {
+        .delay          = HZ,
+        .deferred_io    = hecubafb_dpy_deferred_io,
+};
+
+static int __devinit hecubafb_probe(struct platform_device *dev)
+{
+        struct fb_info *info;
+        int retval = -ENOMEM;
+        int videomemorysize;
+        unsigned char *videomemory;
+        struct hecubafb_par *par;
+
+        videomemorysize = (DPY_W*DPY_H)/8;
+
+        if (!(videomemory = vmalloc(videomemorysize)))
+                return retval;
+
+        memset(videomemory, 0, videomemorysize);
+
+        info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
+        if (!info)
+                goto err;
+
+        info->screen_base = (char __iomem *) videomemory;
+        info->fbops = &hecubafb_ops;
+
+        info->var = hecubafb_var;
+        info->fix = hecubafb_fix;
+        info->fix.smem_len = videomemorysize;
+        par = info->par;
+        par->info = info;
+
+        if (!dio_addr || !cio_addr || !c2io_addr) {
+                printk(KERN_WARNING "no IO addresses supplied\n");
+                goto err1;
+        }
+        par->dio_addr = dio_addr;
+        par->cio_addr = cio_addr;
+        par->c2io_addr = c2io_addr;
+        info->flags = FBINFO_FLAG_DEFAULT;
+
+        info->fbdefio = &hecubafb_defio;
+        fb_deferred_io_init(info);
+
+        retval = register_framebuffer(info);
+        if (retval < 0)
+                goto err1;
+        platform_set_drvdata(dev, info);
+
+        printk(KERN_INFO
+               "fb%d: Hecuba frame buffer device, using %dK of video memory\n",
+               info->node, videomemorysize >> 10);
+
+        /* this inits the dpy */
+        apollo_init_control(par);
+
+        apollo_send_command(par, APOLLO_INIT_DISPLAY);
+        apollo_send_data(par, 0x81);
+
+        /* have to wait while display resets */
+        udelay(1000);
+
+        /* if we were told to splash the screen, we just clear it */
+        if (!nosplash) {
+                apollo_send_command(par, APOLLO_ERASE_DISPLAY);
+                apollo_send_data(par, splashval);
+        }
+
+        return 0;
+err1:
+        framebuffer_release(info);
+err:
+        vfree(videomemory);
+        return retval;
+}
+
+static int __devexit hecubafb_remove(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+
+        if (info) {
+                fb_deferred_io_cleanup(info);
+                unregister_framebuffer(info);
+                vfree((void __force *)info->screen_base);
+                framebuffer_release(info);
+        }
+        return 0;
+}
+
+static struct platform_driver hecubafb_driver = {
+        .probe  = hecubafb_probe,
+        .remove = hecubafb_remove,
+        .driver = {
+                .name   = "hecubafb",
+        },
+};
+
+static struct platform_device *hecubafb_device;
+
+static int __init hecubafb_init(void)
+{
+        int ret;
+
+        if (!hecubafb_enable) {
+                printk(KERN_ERR "Use hecubafb_enable to enable the device\n");
+                return -ENXIO;
+        }
+
+        ret = platform_driver_register(&hecubafb_driver);
+        if (!ret) {
+                hecubafb_device = platform_device_alloc("hecubafb", 0);
+                if (hecubafb_device)
+                        ret = platform_device_add(hecubafb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(hecubafb_device);
+                        platform_driver_unregister(&hecubafb_driver);
+                }
+        }
+        return ret;
+
+}
+
+static void __exit hecubafb_exit(void)
+{
+        platform_device_unregister(hecubafb_device);
+        platform_driver_unregister(&hecubafb_driver);
+}
+
+module_param(nosplash, uint, 0);
+MODULE_PARM_DESC(nosplash, "Disable doing the splash screen");
+module_param(hecubafb_enable, uint, 0);
+MODULE_PARM_DESC(hecubafb_enable, "Enable communication with Hecuba board");
+module_param(dio_addr, ulong, 0);
+MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480");
+module_param(cio_addr, ulong, 0);
+MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400");
+module_param(c2io_addr, ulong, 0);
+MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408");
+module_param(splashval, ulong, 0);
+MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white");
+module_param(irq, uint, 0);
+MODULE_PARM_DESC(irq, "IRQ for the Hecuba board");
+
+module_init(hecubafb_init);
+module_exit(hecubafb_exit);
+
+MODULE_DESCRIPTION("fbdev driver for Hecuba board");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index aa65ffce915b..889e4ea5edc1 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -133,7 +133,7 @@
 /* Masks (AND ops) and OR's */
 #define FB_START_MASK               (0x3f << (32 - 6))
 #define MMIO_ADDR_MASK              (0x1FFF << (32 - 13))
-#define FREQ_MASK                   0x1EF
+#define FREQ_MASK                   (1 << 4)
 #define SCR_OFF                     0x20
 #define DRAM_ON                     0x08            
 #define DRAM_OFF                    0xE7
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 7e760197cf29..1a7d7789d877 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1717,7 +1717,7 @@ static int __devinit i810_alloc_agp_mem(struct fb_info *info)
  * @info: pointer to device specific info structure
  *
  * DESCRIPTION:
- * Sets the the user monitor's horizontal and vertical
+ * Sets the user monitor's horizontal and vertical
  * frequency limits
  */
 static void __devinit i810_init_monspecs(struct fb_info *info)
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index c1eb18bf0883..16bc8d75e36e 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -1428,6 +1428,24 @@ static void refresh_ring(struct intelfb_info *dinfo);
 static void reset_state(struct intelfb_info *dinfo);
 static void do_flush(struct intelfb_info *dinfo);
 
+static  u32 get_ring_space(struct intelfb_info *dinfo)
+{
+        u32 ring_space;
+
+        if (dinfo->ring_tail >= dinfo->ring_head)
+                ring_space = dinfo->ring.size -
+                        (dinfo->ring_tail - dinfo->ring_head);
+        else
+                ring_space = dinfo->ring_head - dinfo->ring_tail;
+
+        if (ring_space > RING_MIN_FREE)
+                ring_space -= RING_MIN_FREE;
+        else
+                ring_space = 0;
+
+        return ring_space;
+}
+
 static int
 wait_ring(struct intelfb_info *dinfo, int n)
 {
@@ -1442,13 +1460,8 @@ wait_ring(struct intelfb_info *dinfo, int n)
         end = jiffies + (HZ * 3);
         while (dinfo->ring_space < n) {
                 dinfo->ring_head = INREG(PRI_RING_HEAD) & RING_HEAD_MASK;
-                if (dinfo->ring_tail + RING_MIN_FREE < dinfo->ring_head)
-                        dinfo->ring_space = dinfo->ring_head
-                                - (dinfo->ring_tail + RING_MIN_FREE);
-                else
-                        dinfo->ring_space = (dinfo->ring.size +
-                                             dinfo->ring_head)
-                                - (dinfo->ring_tail + RING_MIN_FREE);
+                dinfo->ring_space = get_ring_space(dinfo);
+
                 if (dinfo->ring_head != last_head) {
                         end = jiffies + (HZ * 3);
                         last_head = dinfo->ring_head;
@@ -1513,12 +1526,7 @@ refresh_ring(struct intelfb_info *dinfo)
 
         dinfo->ring_head = INREG(PRI_RING_HEAD) & RING_HEAD_MASK;
         dinfo->ring_tail = INREG(PRI_RING_TAIL) & RING_TAIL_MASK;
-        if (dinfo->ring_tail + RING_MIN_FREE < dinfo->ring_head)
-                dinfo->ring_space = dinfo->ring_head
-                        - (dinfo->ring_tail + RING_MIN_FREE);
-        else
-                dinfo->ring_space = (dinfo->ring.size + dinfo->ring_head)
-                        - (dinfo->ring_tail + RING_MIN_FREE);
+        dinfo->ring_space = get_ring_space(dinfo);
 }
 
 static void
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index f0e6512c87ff..9397bcef3018 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -2,73 +2,69 @@
 # Logo configuration
 #
 
-menu "Logo configuration"
-
-config LOGO
+menuconfig LOGO
         bool "Bootup logo"
         depends on FB || SGI_NEWPORT_CONSOLE
         help
           Enable and select frame buffer bootup logos.
 
+if LOGO
+
 config LOGO_LINUX_MONO
         bool "Standard black and white Linux logo"
-        depends on LOGO
         default y
 
 config LOGO_LINUX_VGA16
         bool "Standard 16-color Linux logo"
-        depends on LOGO
         default y
 
 config LOGO_LINUX_CLUT224
         bool "Standard 224-color Linux logo"
-        depends on LOGO
         default y
 
 config LOGO_DEC_CLUT224
         bool "224-color Digital Equipment Corporation Linux logo"
-        depends on LOGO && (MACH_DECSTATION || ALPHA)
+        depends on MACH_DECSTATION || ALPHA
         default y
 
 config LOGO_MAC_CLUT224
         bool "224-color Macintosh Linux logo"
-        depends on LOGO && MAC
+        depends on MAC
         default y
 
 config LOGO_PARISC_CLUT224
         bool "224-color PA-RISC Linux logo"
-        depends on LOGO && PARISC
+        depends on PARISC
         default y
 
 config LOGO_SGI_CLUT224
         bool "224-color SGI Linux logo"
-        depends on LOGO && (SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS)
+        depends on SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS
         default y
 
 config LOGO_SUN_CLUT224
         bool "224-color Sun Linux logo"
-        depends on LOGO && SPARC
+        depends on SPARC
         default y
 
 config LOGO_SUPERH_MONO
         bool "Black and white SuperH Linux logo"
-        depends on LOGO && SUPERH
+        depends on SUPERH
         default y
 
 config LOGO_SUPERH_VGA16
         bool "16-color SuperH Linux logo"
-        depends on LOGO && SUPERH
+        depends on SUPERH
         default y
 
 config LOGO_SUPERH_CLUT224
         bool "224-color SuperH Linux logo"
-        depends on LOGO && SUPERH
+        depends on SUPERH
         default y
 
 config LOGO_M32R_CLUT224
         bool "224-color M32R Linux logo"
-        depends on LOGO && M32R
+        depends on M32R
         default y
 
-endmenu
-
+endif # LOGO
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index a5690a5f29d5..9445cdb759b1 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -72,7 +72,7 @@
  *     (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  *
  * (following author is not in any relation with this code, but his ideas
- *  were used when writting this driver)
+ *  were used when writing this driver)
  *
  *               FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk>
  *
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index a5c825d99466..c57aaadf410c 100644
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -70,7 +70,7 @@
  *     (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  *
  * (following author is not in any relation with this code, but his ideas
- *  were used when writting this driver)
+ *  were used when writing this driver)
  *
  *               FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk>
  *
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index cb2aa402ddfd..c8559a756b75 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -93,7 +93,7 @@
  *     (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  *
  * (following author is not in any relation with this code, but his ideas
- *  were used when writting this driver)
+ *  were used when writing this driver)
  *
  *               FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk>
  *
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index 18886b629cb1..5948e54b9ef9 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -78,7 +78,7 @@
  *     (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  *
  * (following author is not in any relation with this code, but his ideas
- *  were used when writting this driver)
+ *  were used when writing this driver)
  *
  *               FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk>
  *
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 3e517940c5a5..3741ad729401 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -395,7 +395,7 @@ static int my_atoi(const char *name)
 
     for (;; name++) {
         switch (*name) {
-            case '0'...'9':
+            case '0' ... '9':
                 val = 10*val+(*name-'0');
                 break;
             default:
@@ -548,7 +548,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     } else
                         goto done;
                     break;
-                case '0'...'9':
+                case '0' ... '9':
                     break;
                 case 'M':
                     if (!yres_specified)
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 395ccedde9a6..bd30aba242d0 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -665,6 +665,7 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         var->red.msb_right = 0;
         var->green.msb_right = 0;
         var->blue.msb_right = 0;
+        var->transp.msb_right = 0;
 
         switch (var->bits_per_pixel) {
         case 8:         /* PSEUDOCOLOUR, 256 */
diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c
index 9efb8a3854e2..fa4821c5572b 100644
--- a/drivers/video/nvidia/nv_accel.c
+++ b/drivers/video/nvidia/nv_accel.c
@@ -69,27 +69,38 @@ static const int NVCopyROP_PM[16] = {
         0x5A,                   /* invert */
 };
 
-static inline void NVFlush(struct nvidia_par *par)
+static inline void nvidiafb_safe_mode(struct fb_info *info)
 {
+        struct nvidia_par *par = info->par;
+
+        touch_softlockup_watchdog();
+        info->pixmap.scan_align = 1;
+        par->lockup = 1;
+}
+
+static inline void NVFlush(struct fb_info *info)
+{
+        struct nvidia_par *par = info->par;
         int count = 1000000000;
 
         while (--count && READ_GET(par) != par->dmaPut) ;
 
         if (!count) {
                 printk("nvidiafb: DMA Flush lockup\n");
-                par->lockup = 1;
+                nvidiafb_safe_mode(info);
         }
 }
 
-static inline void NVSync(struct nvidia_par *par)
+static inline void NVSync(struct fb_info *info)
 {
+        struct nvidia_par *par = info->par;
         int count = 1000000000;
 
         while (--count && NV_RD32(par->PGRAPH, 0x0700)) ;
 
         if (!count) {
                 printk("nvidiafb: DMA Sync lockup\n");
-                par->lockup = 1;
+                nvidiafb_safe_mode(info);
         }
 }
 
@@ -101,8 +112,9 @@ static void NVDmaKickoff(struct nvidia_par *par)
         }
 }
 
-static void NVDmaWait(struct nvidia_par *par, int size)
+static void NVDmaWait(struct fb_info *info, int size)
 {
+        struct nvidia_par *par = info->par;
         int dmaGet;
         int count = 1000000000, cnt;
         size++;
@@ -135,34 +147,38 @@ static void NVDmaWait(struct nvidia_par *par, int size)
         }
 
         if (!count) {
-                printk("DMA Wait Lockup\n");
-                par->lockup = 1;
+                printk("nvidiafb: DMA Wait Lockup\n");
+                nvidiafb_safe_mode(info);
         }
 }
 
-static void NVSetPattern(struct nvidia_par *par, u32 clr0, u32 clr1,
+static void NVSetPattern(struct fb_info *info, u32 clr0, u32 clr1,
                          u32 pat0, u32 pat1)
 {
-        NVDmaStart(par, PATTERN_COLOR_0, 4);
+        struct nvidia_par *par = info->par;
+
+        NVDmaStart(info, par, PATTERN_COLOR_0, 4);
         NVDmaNext(par, clr0);
         NVDmaNext(par, clr1);
         NVDmaNext(par, pat0);
         NVDmaNext(par, pat1);
 }
 
-static void NVSetRopSolid(struct nvidia_par *par, u32 rop, u32 planemask)
+static void NVSetRopSolid(struct fb_info *info, u32 rop, u32 planemask)
 {
+        struct nvidia_par *par = info->par;
+
         if (planemask != ~0) {
-                NVSetPattern(par, 0, planemask, ~0, ~0);
+                NVSetPattern(info, 0, planemask, ~0, ~0);
                 if (par->currentRop != (rop + 32)) {
-                        NVDmaStart(par, ROP_SET, 1);
+                        NVDmaStart(info, par, ROP_SET, 1);
                         NVDmaNext(par, NVCopyROP_PM[rop]);
                         par->currentRop = rop + 32;
                 }
         } else if (par->currentRop != rop) {
                 if (par->currentRop >= 16)
-                        NVSetPattern(par, ~0, ~0, ~0, ~0);
-                NVDmaStart(par, ROP_SET, 1);
+                        NVSetPattern(info, ~0, ~0, ~0, ~0);
+                NVDmaStart(info, par, ROP_SET, 1);
                 NVDmaNext(par, NVCopyROP[rop]);
                 par->currentRop = rop;
         }
@@ -175,7 +191,7 @@ static void NVSetClippingRectangle(struct fb_info *info, int x1, int y1,
         int h = y2 - y1 + 1;
         int w = x2 - x1 + 1;
 
-        NVDmaStart(par, CLIP_POINT, 2);
+        NVDmaStart(info, par, CLIP_POINT, 2);
         NVDmaNext(par, (y1 << 16) | x1);
         NVDmaNext(par, (h << 16) | w);
 }
@@ -237,23 +253,23 @@ void NVResetGraphics(struct fb_info *info)
                 break;
         }
 
-        NVDmaStart(par, SURFACE_FORMAT, 4);
+        NVDmaStart(info, par, SURFACE_FORMAT, 4);
         NVDmaNext(par, surfaceFormat);
         NVDmaNext(par, pitch | (pitch << 16));
         NVDmaNext(par, 0);
         NVDmaNext(par, 0);
 
-        NVDmaStart(par, PATTERN_FORMAT, 1);
+        NVDmaStart(info, par, PATTERN_FORMAT, 1);
         NVDmaNext(par, patternFormat);
 
-        NVDmaStart(par, RECT_FORMAT, 1);
+        NVDmaStart(info, par, RECT_FORMAT, 1);
         NVDmaNext(par, rectFormat);
 
-        NVDmaStart(par, LINE_FORMAT, 1);
+        NVDmaStart(info, par, LINE_FORMAT, 1);
         NVDmaNext(par, lineFormat);
 
         par->currentRop = ~0;   /* set to something invalid */
-        NVSetRopSolid(par, ROP_COPY, ~0);
+        NVSetRopSolid(info, ROP_COPY, ~0);
 
         NVSetClippingRectangle(info, 0, 0, info->var.xres_virtual,
                                info->var.yres_virtual);
@@ -269,10 +285,10 @@ int nvidiafb_sync(struct fb_info *info)
                 return 0;
 
         if (!par->lockup)
-                NVFlush(par);
+                NVFlush(info);
 
         if (!par->lockup)
-                NVSync(par);
+                NVSync(info);
 
         return 0;
 }
@@ -287,7 +303,7 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
         if (par->lockup)
                 return cfb_copyarea(info, region);
 
-        NVDmaStart(par, BLIT_POINT_SRC, 3);
+        NVDmaStart(info, par, BLIT_POINT_SRC, 3);
         NVDmaNext(par, (region->sy << 16) | region->sx);
         NVDmaNext(par, (region->dy << 16) | region->dx);
         NVDmaNext(par, (region->height << 16) | region->width);
@@ -312,19 +328,19 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
                 color = ((u32 *) info->pseudo_palette)[rect->color];
 
         if (rect->rop != ROP_COPY)
-                NVSetRopSolid(par, rect->rop, ~0);
+                NVSetRopSolid(info, rect->rop, ~0);
 
-        NVDmaStart(par, RECT_SOLID_COLOR, 1);
+        NVDmaStart(info, par, RECT_SOLID_COLOR, 1);
         NVDmaNext(par, color);
 
-        NVDmaStart(par, RECT_SOLID_RECTS(0), 2);
+        NVDmaStart(info, par, RECT_SOLID_RECTS(0), 2);
         NVDmaNext(par, (rect->dx << 16) | rect->dy);
         NVDmaNext(par, (rect->width << 16) | rect->height);
 
         NVDmaKickoff(par);
 
         if (rect->rop != ROP_COPY)
-                NVSetRopSolid(par, ROP_COPY, ~0);
+                NVSetRopSolid(info, ROP_COPY, ~0);
 }
 
 static void nvidiafb_mono_color_expand(struct fb_info *info,
@@ -346,7 +362,7 @@ static void nvidiafb_mono_color_expand(struct fb_info *info,
                 bg = ((u32 *) info->pseudo_palette)[image->bg_color] | mask;
         }
 
-        NVDmaStart(par, RECT_EXPAND_TWO_COLOR_CLIP, 7);
+        NVDmaStart(info, par, RECT_EXPAND_TWO_COLOR_CLIP, 7);
         NVDmaNext(par, (image->dy << 16) | (image->dx & 0xffff));
         NVDmaNext(par, ((image->dy + image->height) << 16) |
                   ((image->dx + image->width) & 0xffff));
@@ -357,7 +373,7 @@ static void nvidiafb_mono_color_expand(struct fb_info *info,
         NVDmaNext(par, (image->dy << 16) | (image->dx & 0xffff));
 
         while (dsize >= RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS) {
-                NVDmaStart(par, RECT_EXPAND_TWO_COLOR_DATA(0),
+                NVDmaStart(info, par, RECT_EXPAND_TWO_COLOR_DATA(0),
                            RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS);
 
                 for (j = RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS; j--;) {
@@ -370,7 +386,7 @@ static void nvidiafb_mono_color_expand(struct fb_info *info,
         }
 
         if (dsize) {
-                NVDmaStart(par, RECT_EXPAND_TWO_COLOR_DATA(0), dsize);
+                NVDmaStart(info, par, RECT_EXPAND_TWO_COLOR_DATA(0), dsize);
 
                 for (j = dsize; j--;) {
                         tmp = data[k++];
diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index ea426115c6f9..aff11bbf59a7 100644
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -150,7 +150,8 @@ static void nvGetClocks(struct nvidia_par *par, unsigned int *MClk,
                 M = pll & 0xFF;
                 N = (pll >> 8) & 0xFF;
                 if (((par->Chipset & 0xfff0) == 0x0290) ||
-                                ((par->Chipset & 0xfff0) == 0x0390)) {
+                        ((par->Chipset & 0xfff0) == 0x0390) ||
+                        ((par->Chipset & 0xfff0) == 0x02E0)) {
                         MB = 1;
                         NB = 1;
                 } else {
@@ -686,7 +687,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
 
         if ((par->Chipset & 0x0FF0) == 0x01A0) {
                 unsigned int uMClkPostDiv;
-                dev = pci_find_slot(0, 3);
+                dev = pci_get_bus_and_slot(0, 3);
                 pci_read_config_dword(dev, 0x6C, &uMClkPostDiv);
                 uMClkPostDiv = (uMClkPostDiv >> 8) & 0xf;
 
@@ -694,11 +695,11 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
                         uMClkPostDiv = 4;
                 MClk = 400000 / uMClkPostDiv;
         } else {
-                dev = pci_find_slot(0, 5);
+                dev = pci_get_bus_and_slot(0, 5);
                 pci_read_config_dword(dev, 0x4c, &MClk);
                 MClk /= 1000;
         }
-
+        pci_dev_put(dev);
         pll = NV_RD32(par->PRAMDAC0, 0x0500);
         M = (pll >> 0) & 0xFF;
         N = (pll >> 8) & 0xFF;
@@ -707,19 +708,21 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
         sim_data.pix_bpp = (char)pixelDepth;
         sim_data.enable_video = 0;
         sim_data.enable_mp = 0;
-        pci_find_slot(0, 1);
+        dev = pci_get_bus_and_slot(0, 1);
         pci_read_config_dword(dev, 0x7C, &sim_data.memory_type);
+        pci_dev_put(dev);
         sim_data.memory_type = (sim_data.memory_type >> 12) & 1;
         sim_data.memory_width = 64;
 
-        dev = pci_find_slot(0, 3);
+        dev = pci_get_bus_and_slot(0, 3);
         pci_read_config_dword(dev, 0, &memctrl);
+        pci_dev_put(dev);
         memctrl >>= 16;
 
         if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) {
                 int dimm[3];
 
-                pci_find_slot(0, 2);
+                dev = pci_get_bus_and_slot(0, 2);
                 pci_read_config_dword(dev, 0x40, &dimm[0]);
                 dimm[0] = (dimm[0] >> 8) & 0x4f;
                 pci_read_config_dword(dev, 0x44, &dimm[1]);
@@ -731,6 +734,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
                         printk("nvidiafb: your nForce DIMMs are not arranged "
                                "in optimal banks!\n");
                 }
+                pci_dev_put(dev);
         }
 
         sim_data.mem_latency = 3;
@@ -960,6 +964,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
 
                 if (((par->Chipset & 0xfff0) == 0x0090) ||
                     ((par->Chipset & 0xfff0) == 0x01D0) ||
+                    ((par->Chipset & 0xfff0) == 0x02E0) ||
                     ((par->Chipset & 0xfff0) == 0x0290))
                         regions = 15;
                 for(i = 0; i < regions; i++) {
@@ -1272,6 +1277,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
                                                 0x00100000);
                                         break;
                                 case 0x0090:
+                                case 0x02E0:
                                 case 0x0290:
                                         NV_WR32(par->PRAMDAC, 0x0608,
                                                 NV_RD32(par->PRAMDAC, 0x0608) |
@@ -1349,6 +1355,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
                         } else {
                                 if (((par->Chipset & 0xfff0) == 0x0090) ||
                                     ((par->Chipset & 0xfff0) == 0x01D0) ||
+                                    ((par->Chipset & 0xfff0) == 0x02E0) ||
                                     ((par->Chipset & 0xfff0) == 0x0290)) {
                                         for (i = 0; i < 60; i++) {
                                                 NV_WR32(par->PGRAPH,
@@ -1400,6 +1407,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
                                 } else {
                                         if ((par->Chipset & 0xfff0) == 0x0090 ||
                                             (par->Chipset & 0xfff0) == 0x01D0 ||
+                                            (par->Chipset & 0xfff0) == 0x02E0 ||
                                             (par->Chipset & 0xfff0) == 0x0290) {
                                                 NV_WR32(par->PGRAPH, 0x0DF0,
                                                         NV_RD32(par->PFB, 0x0200));
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index b8588973e400..afe4567e1ff4 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -30,16 +30,14 @@ static void nvidia_gpio_setscl(void *data, int state)
         struct nvidia_par *par = chan->par;
         u32 val;
 
-        VGA_WR08(par->PCIO, 0x3d4, chan->ddc_base + 1);
-        val = VGA_RD08(par->PCIO, 0x3d5) & 0xf0;
+        val = NVReadCrtc(par, chan->ddc_base + 1) & 0xf0;
 
         if (state)
                 val |= 0x20;
         else
                 val &= ~0x20;
 
-        VGA_WR08(par->PCIO, 0x3d4, chan->ddc_base + 1);
-        VGA_WR08(par->PCIO, 0x3d5, val | 0x1);
+        NVWriteCrtc(par, chan->ddc_base + 1, val | 0x01);
 }
 
 static void nvidia_gpio_setsda(void *data, int state)
@@ -48,16 +46,14 @@ static void nvidia_gpio_setsda(void *data, int state)
         struct nvidia_par *par = chan->par;
         u32 val;
 
-        VGA_WR08(par->PCIO, 0x3d4, chan->ddc_base + 1);
-        val = VGA_RD08(par->PCIO, 0x3d5) & 0xf0;
+        val = NVReadCrtc(par, chan->ddc_base + 1) & 0xf0;
 
         if (state)
                 val |= 0x10;
         else
                 val &= ~0x10;
 
-        VGA_WR08(par->PCIO, 0x3d4, chan->ddc_base + 1);
-        VGA_WR08(par->PCIO, 0x3d5, val | 0x1);
+        NVWriteCrtc(par, chan->ddc_base + 1, val | 0x01);
 }
 
 static int nvidia_gpio_getscl(void *data)
@@ -66,12 +62,9 @@ static int nvidia_gpio_getscl(void *data)
         struct nvidia_par *par = chan->par;
         u32 val = 0;
 
-        VGA_WR08(par->PCIO, 0x3d4, chan->ddc_base);
-        if (VGA_RD08(par->PCIO, 0x3d5) & 0x04)
+        if (NVReadCrtc(par, chan->ddc_base) & 0x04)
                 val = 1;
 
-        val = VGA_RD08(par->PCIO, 0x3d5);
-
         return val;
 }
 
@@ -81,20 +74,21 @@ static int nvidia_gpio_getsda(void *data)
         struct nvidia_par *par = chan->par;
         u32 val = 0;
 
-        VGA_WR08(par->PCIO, 0x3d4, chan->ddc_base);
-        if (VGA_RD08(par->PCIO, 0x3d5) & 0x08)
+        if (NVReadCrtc(par, chan->ddc_base) & 0x08)
                 val = 1;
 
         return val;
 }
 
-static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
+static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name,
+                                unsigned int i2c_class)
 {
         int rc;
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner = THIS_MODULE;
         chan->adapter.id = I2C_HW_B_NVIDIA;
+        chan->adapter.class = i2c_class;
         chan->adapter.algo_data = &chan->algo;
         chan->adapter.dev.parent = &chan->par->pci_dev->dev;
         chan->algo.setsda = nvidia_gpio_setsda;
@@ -127,83 +121,39 @@ static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
 
 void nvidia_create_i2c_busses(struct nvidia_par *par)
 {
-        par->bus = 3;
-
         par->chan[0].par = par;
         par->chan[1].par = par;
         par->chan[2].par = par;
 
-        par->chan[0].ddc_base = 0x3e;
-        nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0");
+        par->chan[0].ddc_base = 0x36;
+        nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", I2C_CLASS_HWMON);
 
-        par->chan[1].ddc_base = 0x36;
-        nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1");
+        par->chan[1].ddc_base = 0x3e;
+        nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", 0);
 
         par->chan[2].ddc_base = 0x50;
-        nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2");
+        nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2", 0);
 }
 
 void nvidia_delete_i2c_busses(struct nvidia_par *par)
 {
-        if (par->chan[0].par)
-                i2c_del_adapter(&par->chan[0].adapter);
-        par->chan[0].par = NULL;
-
-        if (par->chan[1].par)
-                i2c_del_adapter(&par->chan[1].adapter);
-        par->chan[1].par = NULL;
-
-        if (par->chan[2].par)
-                i2c_del_adapter(&par->chan[2].adapter);
-        par->chan[2].par = NULL;
-
-}
+        int i;
 
-static u8 *nvidia_do_probe_i2c_edid(struct nvidia_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                 .addr = 0x50,
-                 .len = 1,
-                 .buf = &start,
-                 }, {
-                     .addr = 0x50,
-                     .flags = I2C_M_RD,
-                     .len = EDID_LENGTH,
-                     },
-        };
-        u8 *buf;
-
-        if (!chan->par)
-                return NULL;
-
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-        if (!buf) {
-                dev_warn(&chan->par->pci_dev->dev, "Out of memory!\n");
-                return NULL;
+        for (i = 0; i < 3; i++) {
+                if (!par->chan[i].par)
+                        continue;
+                i2c_del_adapter(&par->chan[i].adapter);
+                par->chan[i].par = NULL;
         }
-        msgs[1].buf = buf;
-
-        if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
-                return buf;
-        dev_dbg(&chan->par->pci_dev->dev, "Unable to read EDID block.\n");
-        kfree(buf);
-        return NULL;
 }
 
 int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
 {
         struct nvidia_par *par = info->par;
         u8 *edid = NULL;
-        int i;
 
-        for (i = 0; i < 3; i++) {
-                /* Do the real work */
-                edid = nvidia_do_probe_i2c_edid(&par->chan[conn - 1]);
-                if (edid)
-                        break;
-        }
+        if (par->chan[conn - 1].par)
+                edid = fb_ddc_read(&par->chan[conn - 1].adapter);
 
         if (!edid && conn == 1) {
                 /* try to get from firmware */
diff --git a/drivers/video/nvidia/nv_local.h b/drivers/video/nvidia/nv_local.h
index e009d242ea10..68e508daa417 100644
--- a/drivers/video/nvidia/nv_local.h
+++ b/drivers/video/nvidia/nv_local.h
@@ -73,9 +73,9 @@
 #define NVDmaNext(par, data) \
      NV_WR32(&(par)->dmaBase[(par)->dmaCurrent++], 0, (data))
 
-#define NVDmaStart(par, tag, size) {          \
+#define NVDmaStart(info, par, tag, size) {    \
      if((par)->dmaFree <= (size))             \
-        NVDmaWait(par, size);                 \
+        NVDmaWait(info, size);                \
      NVDmaNext(par, ((size) << 18) | (tag));  \
      (par)->dmaFree -= ((size) + 1);          \
 }
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 163a774a1b30..73afd7eb9977 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -46,15 +46,15 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
 
                 for (dp = NULL;
                      (dp = of_get_next_child(parent, dp)) != NULL;) {
-                        pname = get_property(dp, "name", NULL);
+                        pname = of_get_property(dp, "name", NULL);
                         if (!pname)
                                 continue;
                         len = strlen(pname);
                         if ((pname[len-1] == 'A' && conn == 1) ||
                             (pname[len-1] == 'B' && conn == 2)) {
                                 for (i = 0; propnames[i] != NULL; ++i) {
-                                        pedid = get_property(dp, propnames[i],
-                                                             NULL);
+                                        pedid = of_get_property(dp,
+                                                        propnames[i], NULL);
                                         if (pedid != NULL)
                                                 break;
                                 }
@@ -65,7 +65,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
         }
         if (pedid == NULL) {
                 for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = get_property(parent, propnames[i], NULL);
+                        pedid = of_get_property(parent, propnames[i], NULL);
                         if (pedid != NULL)
                                 break;
                 }
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index eab3e282a4de..707e2c8a13ed 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -261,7 +261,7 @@ static void nv10GetConfig(struct nvidia_par *par)
         }
 #endif
 
-        dev = pci_find_slot(0, 1);
+        dev = pci_get_bus_and_slot(0, 1);
         if ((par->Chipset & 0xffff) == 0x01a0) {
                 int amt = 0;
 
@@ -276,6 +276,7 @@ static void nv10GetConfig(struct nvidia_par *par)
                 par->RamAmountKBytes =
                     (NV_RD32(par->PFB, 0x020C) & 0xFFF00000) >> 10;
         }
+        pci_dev_put(dev);
 
         par->CrystalFreqKHz = (NV_RD32(par->PEXTDEV, 0x0000) & (1 << 6)) ?
             14318 : 13500;
@@ -656,7 +657,7 @@ int NVCommonSetup(struct fb_info *info)
         par->LVDS = 0;
         if (par->FlatPanel && par->twoHeads) {
                 NV_WR32(par->PRAMDAC0, 0x08B0, 0x00010004);
-                if (par->PRAMDAC0[0x08b4] & 1)
+                if (NV_RD32(par->PRAMDAC0, 0x08b4) & 1)
                         par->LVDS = 1;
                 printk("nvidiafb: Panel is %s\n", par->LVDS ? "LVDS" : "TMDS");
         }
diff --git a/drivers/video/nvidia/nv_type.h b/drivers/video/nvidia/nv_type.h
index 86e65dea60d3..38f7cc0a2331 100644
--- a/drivers/video/nvidia/nv_type.h
+++ b/drivers/video/nvidia/nv_type.h
@@ -4,8 +4,9 @@
 #include <linux/fb.h>
 #include <linux/types.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
+#include <linux/mutex.h>
+#include <video/vga.h>
 
 #define NV_ARCH_04  0x04
 #define NV_ARCH_10  0x10
@@ -94,13 +95,15 @@ struct riva_regs {
 struct nvidia_par {
         RIVA_HW_STATE SavedReg;
         RIVA_HW_STATE ModeReg;
+        RIVA_HW_STATE initial_state;
         RIVA_HW_STATE *CurrentState;
+        struct vgastate vgastate;
+        struct mutex open_lock;
         u32 pseudo_palette[16];
         struct pci_dev *pci_dev;
         u32 Architecture;
         u32 CursorStart;
         int Chipset;
-        int bus;
         unsigned long FbAddress;
         u8 __iomem *FbStart;
         u32 FbMapSize;
@@ -143,6 +146,7 @@ struct nvidia_par {
         int BlendingPossible;
         u32 paletteEnabled;
         u32 forceCRTC;
+        u32 open_count;
         u8 DDCBase;
 #ifdef CONFIG_MTRR
         struct {
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index b97ec6901263..41f63658572f 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -37,7 +37,6 @@
 #include "nv_proto.h"
 #include "nv_dma.h"
 
-#undef CONFIG_FB_NVIDIA_DEBUG
 #ifdef CONFIG_FB_NVIDIA_DEBUG
 #define NVTRACE          printk
 #else
@@ -200,7 +199,7 @@ static int nvidia_panel_tweak(struct nvidia_par *par,
    return tweak;
 }
 
-static void nvidia_vga_protect(struct nvidia_par *par, int on)
+static void nvidia_screen_off(struct nvidia_par *par, int on)
 {
         unsigned char tmp;
 
@@ -649,7 +648,7 @@ static int nvidiafb_set_par(struct fb_info *info)
                 NVLockUnlock(par, 0);
         }
 
-        nvidia_vga_protect(par, 1);
+        nvidia_screen_off(par, 1);
 
         nvidia_write_regs(par, &par->ModeReg);
         NVSetStartAddress(par, 0);
@@ -687,7 +686,7 @@ static int nvidiafb_set_par(struct fb_info *info)
 
         par->cursor_reset = 1;
 
-        nvidia_vga_protect(par, 0);
+        nvidia_screen_off(par, 0);
 
 #ifdef CONFIG_BOOTX_TEXT
         /* Update debug text engine */
@@ -696,6 +695,7 @@ static int nvidiafb_set_par(struct fb_info *info)
                              info->var.bits_per_pixel, info->fix.line_length);
 #endif
 
+        NVLockUnlock(par, 0);
         NVTRACE_LEAVE();
         return 0;
 }
@@ -948,8 +948,80 @@ static int nvidiafb_blank(int blank, struct fb_info *info)
         return 0;
 }
 
+/*
+ * Because the VGA registers are not mapped linearly in its MMIO space,
+ * restrict VGA register saving and restore to x86 only, where legacy VGA IO
+ * access is legal. Consequently, we must also check if the device is the
+ * primary display.
+ */
+#ifdef CONFIG_X86
+static void save_vga_x86(struct nvidia_par *par)
+{
+        struct resource *res= &par->pci_dev->resource[PCI_ROM_RESOURCE];
+
+        if (res && res->flags & IORESOURCE_ROM_SHADOW) {
+                memset(&par->vgastate, 0, sizeof(par->vgastate));
+                par->vgastate.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS |
+                        VGA_SAVE_CMAP;
+                save_vga(&par->vgastate);
+        }
+}
+
+static void restore_vga_x86(struct nvidia_par *par)
+{
+        struct resource *res= &par->pci_dev->resource[PCI_ROM_RESOURCE];
+
+        if (res && res->flags & IORESOURCE_ROM_SHADOW)
+                restore_vga(&par->vgastate);
+}
+#else
+#define save_vga_x86(x) do {} while (0)
+#define restore_vga_x86(x) do {} while (0)
+#endif /* X86 */
+
+static int nvidiafb_open(struct fb_info *info, int user)
+{
+        struct nvidia_par *par = info->par;
+
+        mutex_lock(&par->open_lock);
+
+        if (!par->open_count) {
+                save_vga_x86(par);
+                nvidia_save_vga(par, &par->initial_state);
+        }
+
+        par->open_count++;
+        mutex_unlock(&par->open_lock);
+        return 0;
+}
+
+static int nvidiafb_release(struct fb_info *info, int user)
+{
+        struct nvidia_par *par = info->par;
+        int err = 0;
+
+        mutex_lock(&par->open_lock);
+
+        if (!par->open_count) {
+                err = -EINVAL;
+                goto done;
+        }
+
+        if (par->open_count == 1) {
+                nvidia_write_regs(par, &par->initial_state);
+                restore_vga_x86(par);
+        }
+
+        par->open_count--;
+done:
+        mutex_unlock(&par->open_lock);
+        return err;
+}
+
 static struct fb_ops nvidia_fb_ops = {
         .owner          = THIS_MODULE,
+        .fb_open        = nvidiafb_open,
+        .fb_release     = nvidiafb_release,
         .fb_check_var   = nvidiafb_check_var,
         .fb_set_par     = nvidiafb_set_par,
         .fb_setcolreg   = nvidiafb_setcolreg,
@@ -1170,6 +1242,7 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
         case 0x0140:            /* GeForce 6600 */
         case 0x0160:            /* GeForce 6200 */
         case 0x01D0:            /* GeForce 7200, 7300, 7400 */
+        case 0x02E0:            /* GeForce 7300 GT */
         case 0x0090:            /* GeForce 7800 */
         case 0x0210:            /* GeForce 6800 */
         case 0x0220:            /* GeForce 6200 */
@@ -1207,7 +1280,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 
         par = info->par;
         par->pci_dev = pd;
-
+        mutex_init(&par->open_lock);
         info->pixmap.addr = kzalloc(8 * 1024, GFP_KERNEL);
 
         if (info->pixmap.addr == NULL)
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 9576a55eaf16..885b42836cbb 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -322,8 +322,8 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                             ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
                         par->cmap_data = par->cmap_adr + 1;
                         par->cmap_type = cmap_m64;
-                } else if (dp && (device_is_compatible(dp, "pci1014,b7") ||
-                                  device_is_compatible(dp, "pci1014,21c"))) {
+                } else if (dp && (of_device_is_compatible(dp, "pci1014,b7") ||
+                                  of_device_is_compatible(dp, "pci1014,21c"))) {
                         par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);
                         if (par->cmap_adr)
                                 par->cmap_type = cmap_gxt2000;
@@ -425,27 +425,27 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
         const u32 *pp, *addrp, *up;
         u64 asize;
 
-        pp = get_property(dp, "linux,bootx-depth", &len);
+        pp = of_get_property(dp, "linux,bootx-depth", &len);
         if (pp == NULL)
-                pp = get_property(dp, "depth", &len);
+                pp = of_get_property(dp, "depth", &len);
         if (pp && len == sizeof(u32))
                 depth = *pp;
 
-        pp = get_property(dp, "linux,bootx-width", &len);
+        pp = of_get_property(dp, "linux,bootx-width", &len);
         if (pp == NULL)
-                pp = get_property(dp, "width", &len);
+                pp = of_get_property(dp, "width", &len);
         if (pp && len == sizeof(u32))
                 width = *pp;
 
-        pp = get_property(dp, "linux,bootx-height", &len);
+        pp = of_get_property(dp, "linux,bootx-height", &len);
         if (pp == NULL)
-                pp = get_property(dp, "height", &len);
+                pp = of_get_property(dp, "height", &len);
         if (pp && len == sizeof(u32))
                 height = *pp;
 
-        pp = get_property(dp, "linux,bootx-linebytes", &len);
+        pp = of_get_property(dp, "linux,bootx-linebytes", &len);
         if (pp == NULL)
-                pp = get_property(dp, "linebytes", &len);
+                pp = of_get_property(dp, "linebytes", &len);
         if (pp && len == sizeof(u32) && (*pp != 0xffffffffu))
                 pitch = *pp;
         else
@@ -463,9 +463,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
          * ranges and pick one that is both big enough and if possible encloses
          * the "address" property. If none match, we pick the biggest
          */
-        up = get_property(dp, "linux,bootx-addr", &len);
+        up = of_get_property(dp, "linux,bootx-addr", &len);
         if (up == NULL)
-                up = get_property(dp, "address", &len);
+                up = of_get_property(dp, "address", &len);
         if (up && len == sizeof(u32))
                 addr_prop = *up;
 
@@ -521,7 +521,7 @@ static int __init offb_init(void)
                 return -ENODEV;
 
         /* Check if we have a MacOS display without a node spec */
-        if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
+        if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
                 /* The old code tried to work out which node was the MacOS
                  * display based on the address. I'm dropping that since the
                  * lack of a node spec only happens with old BootX versions
@@ -532,14 +532,14 @@ static int __init offb_init(void)
         }
 
         for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (get_property(dp, "linux,opened", NULL) &&
-                    get_property(dp, "linux,boot-display", NULL)) {
+                if (of_get_property(dp, "linux,opened", NULL) &&
+                    of_get_property(dp, "linux,boot-display", NULL)) {
                         boot_disp = dp;
                         offb_init_nodriver(dp, 0);
                 }
         }
         for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (get_property(dp, "linux,opened", NULL) &&
+                if (of_get_property(dp, "linux,opened", NULL) &&
                     dp != boot_disp)
                         offb_init_nodriver(dp, 0);
         }
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index a560a2223825..ab5e66890e4e 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -81,8 +81,6 @@ static int lowvsync;
 struct pm2fb_par
 {
         pm2type_t       type;           /* Board type */
-        u32             fb_size;        /* framebuffer memory size */
-        unsigned char   __iomem *v_fb;  /* virtual address of frame buffer */
         unsigned char   __iomem *v_regs;/* virtual address of p_regs */
         u32             memclock;       /* memclock */
         u32             video;          /* video flags before blanking */
@@ -103,7 +101,7 @@ static struct fb_fix_screeninfo pm2fb_fix __devinitdata = {
         .xpanstep =     1,
         .ypanstep =     1,
         .ywrapstep =    0, 
-        .accel =        FB_ACCEL_NONE,
+        .accel =        FB_ACCEL_3DLABS_PERMEDIA2,
 };
 
 /*
@@ -302,10 +300,10 @@ static void pm2v_mnp(u32 clk, unsigned char* mm, unsigned char* nn,
         s32 delta = 1000;
 
         *mm = *nn = *pp = 0;
-        for (n = 1; n; n++) {
-                for ( m = 1; m; m++) {
+        for ( m = 1; m < 128; m++) {
+                for (n = 2 * m + 1; n; n++) {
                         for ( p = 0; p < 2; p++) {
-                                f = PM2_REFERENCE_CLOCK * n / (m * (1 << (p + 1)));
+                                f = ( PM2_REFERENCE_CLOCK >> ( p + 1 )) * n / m;
                                 if ( clk > f - delta && clk < f + delta ) {
                                         delta = ( clk > f ) ? clk - f : f - clk;
                                         *mm=m;
@@ -462,21 +460,43 @@ static void set_memclock(struct pm2fb_par* par, u32 clk)
         int i;
         unsigned char m, n, p;
 
-        pm2_mnp(clk, &m, &n, &p);
-        WAIT_FIFO(par, 10);
-        pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_3, 6);
-        wmb();
-        pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_1, m);
-        pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_2, n);
-        wmb();
-        pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_3, 8|p);
-        wmb();
-        pm2_RDAC_RD(par, PM2I_RD_MEMORY_CLOCK_STATUS);
-        rmb();
-        for (i = 256;
-             i && !(pm2_RD(par, PM2R_RD_INDEXED_DATA) & PM2F_PLL_LOCKED);
-             i--)
-                ;
+        switch (par->type) {
+        case PM2_TYPE_PERMEDIA2V:
+                pm2v_mnp(clk/2, &m, &n, &p);
+                WAIT_FIFO(par, 8);
+                pm2_WR(par, PM2VR_RD_INDEX_HIGH, PM2VI_RD_MCLK_CONTROL >> 8);
+                pm2v_RDAC_WR(par, PM2VI_RD_MCLK_CONTROL, 0);
+                wmb();
+                pm2v_RDAC_WR(par, PM2VI_RD_MCLK_PRESCALE, m);
+                pm2v_RDAC_WR(par, PM2VI_RD_MCLK_FEEDBACK, n);
+                pm2v_RDAC_WR(par, PM2VI_RD_MCLK_POSTSCALE, p);
+                wmb();
+                pm2v_RDAC_WR(par, PM2VI_RD_MCLK_CONTROL, 1);
+                rmb();
+                for (i = 256;
+                     i && !(pm2_RDAC_RD(par, PM2VI_RD_MCLK_CONTROL) & 2);
+                     i--)
+                        ;
+                pm2_WR(par, PM2VR_RD_INDEX_HIGH, 0);
+                break;
+        case PM2_TYPE_PERMEDIA2:
+                pm2_mnp(clk, &m, &n, &p);
+                WAIT_FIFO(par, 10);
+                pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_3, 6);
+                wmb();
+                pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_1, m);
+                pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_2, n);
+                wmb();
+                pm2_RDAC_WR(par, PM2I_RD_MEMORY_CLOCK_3, 8|p);
+                wmb();
+                pm2_RDAC_RD(par, PM2I_RD_MEMORY_CLOCK_STATUS);
+                rmb();
+                for (i = 256;
+                     i && !(pm2_RD(par, PM2R_RD_INDEXED_DATA) & PM2F_PLL_LOCKED);
+                     i--)
+                        ;
+                break;
+        }
 }
 
 static void set_pixclock(struct pm2fb_par* par, u32 clk)
@@ -623,6 +643,8 @@ static int pm2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 return -EINVAL;
         }
 
+        var->transp.offset = 0;
+        var->transp.length = 0;
         switch(var->bits_per_pixel) {
         case 8:
                 var->red.length = var->green.length = var->blue.length = 8;
@@ -1017,6 +1039,131 @@ static int pm2fb_blank(int blank_mode, struct fb_info *info)
         return 0;
 }
 
+static int pm2fb_sync(struct fb_info *info)
+{
+        struct pm2fb_par *par = info->par;
+
+        WAIT_FIFO(par, 1);
+        pm2_WR(par, PM2R_SYNC, 0);
+        mb();
+        do {
+                while (pm2_RD(par, PM2R_OUT_FIFO_WORDS) == 0)
+                        udelay(10);
+                rmb();
+        } while (pm2_RD(par, PM2R_OUT_FIFO) != PM2TAG(PM2R_SYNC));
+
+        return 0;
+}
+
+/*
+ * block operation. copy=0: rectangle fill, copy=1: rectangle copy.
+ */
+static void pm2fb_block_op(struct fb_info* info, int copy,
+                                s32 xsrc, s32 ysrc,
+                                s32 x, s32 y, s32 w, s32 h,
+                                u32 color) {
+        struct pm2fb_par *par = info->par;
+
+        if (!w || !h)
+                return;
+        WAIT_FIFO(par, 6);
+        pm2_WR(par, PM2R_CONFIG, PM2F_CONFIG_FB_WRITE_ENABLE |
+                PM2F_CONFIG_FB_READ_SOURCE_ENABLE);
+        pm2_WR(par, PM2R_FB_PIXEL_OFFSET, 0);
+        if (copy)
+                pm2_WR(par, PM2R_FB_SOURCE_DELTA,
+                        ((ysrc-y) & 0xfff) << 16 | ((xsrc-x) & 0xfff));
+        else
+                pm2_WR(par, PM2R_FB_BLOCK_COLOR, color);
+        pm2_WR(par, PM2R_RECTANGLE_ORIGIN, (y << 16) | x);
+        pm2_WR(par, PM2R_RECTANGLE_SIZE, (h << 16) | w);
+        wmb();
+        pm2_WR(par, PM2R_RENDER,PM2F_RENDER_RECTANGLE |
+                                (x<xsrc ? PM2F_INCREASE_X : 0) |
+                                (y<ysrc ? PM2F_INCREASE_Y : 0) |
+                                (copy ? 0 : PM2F_RENDER_FASTFILL));
+}
+
+static void pm2fb_fillrect (struct fb_info *info,
+                                const struct fb_fillrect *region)
+{
+        struct fb_fillrect modded;
+        int vxres, vyres;
+        u32 color = (info->fix.visual == FB_VISUAL_TRUECOLOR) ?
+                ((u32*)info->pseudo_palette)[region->color] : region->color;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+        if ((info->flags & FBINFO_HWACCEL_DISABLED) ||
+                region->rop != ROP_COPY ) {
+                cfb_fillrect(info, region);
+                return;
+        }
+
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+
+        memcpy(&modded, region, sizeof(struct fb_fillrect));
+
+        if(!modded.width || !modded.height ||
+           modded.dx >= vxres || modded.dy >= vyres)
+                return;
+
+        if(modded.dx + modded.width  > vxres)
+                modded.width  = vxres - modded.dx;
+        if(modded.dy + modded.height > vyres)
+                modded.height = vyres - modded.dy;
+
+        if(info->var.bits_per_pixel == 8)
+                color |= color << 8;
+        if(info->var.bits_per_pixel <= 16)
+                color |= color << 16;
+
+        if(info->var.bits_per_pixel != 24)
+                pm2fb_block_op(info, 0, 0, 0,
+                                modded.dx, modded.dy,
+                                modded.width, modded.height, color);
+        else
+                cfb_fillrect(info, region);
+}
+
+static void pm2fb_copyarea(struct fb_info *info,
+                                const struct fb_copyarea *area)
+{
+        struct fb_copyarea modded;
+        u32 vxres, vyres;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+        if (info->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_copyarea(info, area);
+                return;
+        }
+
+        memcpy(&modded, area, sizeof(struct fb_copyarea));
+
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+
+        if(!modded.width || !modded.height ||
+           modded.sx >= vxres || modded.sy >= vyres ||
+           modded.dx >= vxres || modded.dy >= vyres)
+                return;
+
+        if(modded.sx + modded.width > vxres)
+                modded.width = vxres - modded.sx;
+        if(modded.dx + modded.width > vxres)
+                modded.width = vxres - modded.dx;
+        if(modded.sy + modded.height > vyres)
+                modded.height = vyres - modded.sy;
+        if(modded.dy + modded.height > vyres)
+                modded.height = vyres - modded.dy;
+
+        pm2fb_block_op(info, 1, modded.sx, modded.sy,
+                        modded.dx, modded.dy,
+                        modded.width, modded.height, 0);
+}
+
 /* ------------ Hardware Independent Functions ------------ */
 
 /*
@@ -1030,9 +1177,10 @@ static struct fb_ops pm2fb_ops = {
         .fb_setcolreg   = pm2fb_setcolreg,
         .fb_blank       = pm2fb_blank,
         .fb_pan_display = pm2fb_pan_display,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
+        .fb_fillrect    = pm2fb_fillrect,
+        .fb_copyarea    = pm2fb_copyarea,
         .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = pm2fb_sync,
 };
 
 /*
@@ -1119,38 +1267,47 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
 
         if(default_par->mem_control == 0 &&
                 default_par->boot_address == 0x31 &&
-                default_par->mem_config == 0x259fffff &&
-                pdev->subsystem_vendor == 0x1048 &&
-                pdev->subsystem_device == 0x0a31) {
-                DPRINTK("subsystem_vendor: %04x, subsystem_device: %04x\n",
-                        pdev->subsystem_vendor, pdev->subsystem_device);
-                DPRINTK("We have not been initialized by VGA BIOS "
-                        "and are running on an Elsa Winner 2000 Office\n");
-                DPRINTK("Initializing card timings manually...\n");
+                default_par->mem_config == 0x259fffff) {
+                default_par->memclock = CVPPC_MEMCLOCK;
                 default_par->mem_control=0;
                 default_par->boot_address=0x20;
                 default_par->mem_config=0xe6002021;
-                default_par->memclock=100000;
+                if (pdev->subsystem_vendor == 0x1048 &&
+                        pdev->subsystem_device == 0x0a31) {
+                        DPRINTK("subsystem_vendor: %04x, subsystem_device: %04x\n",
+                                pdev->subsystem_vendor, pdev->subsystem_device);
+                        DPRINTK("We have not been initialized by VGA BIOS "
+                                "and are running on an Elsa Winner 2000 Office\n");
+                        DPRINTK("Initializing card timings manually...\n");
+                        default_par->memclock=70000;
+                }
+                if (pdev->subsystem_vendor == 0x3d3d &&
+                        pdev->subsystem_device == 0x0100) {
+                        DPRINTK("subsystem_vendor: %04x, subsystem_device: %04x\n",
+                                pdev->subsystem_vendor, pdev->subsystem_device);
+                        DPRINTK("We have not been initialized by VGA BIOS "
+                                "and are running on an 3dlabs reference board\n");
+                        DPRINTK("Initializing card timings manually...\n");
+                        default_par->memclock=74894;
+                }
         }
 
         /* Now work out how big lfb is going to be. */
         switch(default_par->mem_config & PM2F_MEM_CONFIG_RAM_MASK) {
         case PM2F_MEM_BANKS_1:
-                default_par->fb_size=0x200000;
+                pm2fb_fix.smem_len=0x200000;
                 break;
         case PM2F_MEM_BANKS_2:
-                default_par->fb_size=0x400000;
+                pm2fb_fix.smem_len=0x400000;
                 break;
         case PM2F_MEM_BANKS_3:
-                default_par->fb_size=0x600000;
+                pm2fb_fix.smem_len=0x600000;
                 break;
         case PM2F_MEM_BANKS_4:
-                default_par->fb_size=0x800000;
+                pm2fb_fix.smem_len=0x800000;
                 break;
         }
-        default_par->memclock = CVPPC_MEMCLOCK;
         pm2fb_fix.smem_start = pci_resource_start(pdev, 1);
-        pm2fb_fix.smem_len = default_par->fb_size;
 
         /* Linear frame buffer - request region and map it. */
         if ( !request_mem_region(pm2fb_fix.smem_start, pm2fb_fix.smem_len,
@@ -1158,9 +1315,9 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                 printk(KERN_WARNING "pm2fb: Can't reserve smem.\n");
                 goto err_exit_mmio;
         }
-        info->screen_base = default_par->v_fb =
+        info->screen_base =
                 ioremap_nocache(pm2fb_fix.smem_start, pm2fb_fix.smem_len);
-        if ( !default_par->v_fb ) {
+        if ( !info->screen_base ) {
                 printk(KERN_WARNING "pm2fb: Can't ioremap smem area.\n");
                 release_mem_region(pm2fb_fix.smem_start, pm2fb_fix.smem_len);
                 goto err_exit_mmio;
@@ -1170,7 +1327,9 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
         info->fix               = pm2fb_fix;    
         info->pseudo_palette    = default_par->palette;
         info->flags             = FBINFO_DEFAULT |
-                                  FBINFO_HWACCEL_YPAN;
+                                  FBINFO_HWACCEL_YPAN |
+                                  FBINFO_HWACCEL_COPYAREA |
+                                  FBINFO_HWACCEL_FILLRECT;
 
         if (!mode)
                 mode = "640x480@60";
@@ -1180,13 +1339,13 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                 info->var = pm2fb_var;
 
         if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
-                goto err_exit_all;
+                goto err_exit_both;
 
         if (register_framebuffer(info) < 0)
-                goto err_exit_both;
+                goto err_exit_all;
 
         printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",
-               info->node, info->fix.id, default_par->fb_size / 1024);
+               info->node, info->fix.id, pm2fb_fix.smem_len / 1024);
 
         /*
          * Our driver data
@@ -1242,6 +1401,9 @@ static struct pci_device_id pm2fb_id_table[] = {
         { PCI_VENDOR_ID_3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2V,
           PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
           0xff0000, 0 },
+        { PCI_VENDOR_ID_3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2V,
+          PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NOT_DEFINED_VGA << 8,
+          0xff00, 0 },
         { 0, }
 };
 
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index bd787e80177d..c77a1a1fd46b 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -1,55 +1,25 @@
 /*
  *  linux/drivers/video/pm3fb.c -- 3DLabs Permedia3 frame buffer device
- *  
- *  Copyright (C) 2001 Romain Dolbeau <dolbeau@irisa.fr>
+ *
+ *  Copyright (C) 2001 Romain Dolbeau <romain@dolbeau.org>.
+ *
+ *  Ported to 2.6 kernel on 1 May 2007 by Krzysztof Helt <krzysztof.h1@wp.pl>
+ *      based on pm2fb.c
+ *
  *  Based on code written by:
- *           Sven Luther, <luther@dpt-info.u-strasbg.fr>
- *           Alan Hourihane, <alanh@fairlite.demon.co.uk>
- *           Russell King, <rmk@arm.linux.org.uk>
+ *         Sven Luther, <luther@dpt-info.u-strasbg.fr>
+ *         Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *         Russell King, <rmk@arm.linux.org.uk>
  *  Based on linux/drivers/video/skeletonfb.c:
  *      Copyright (C) 1997 Geert Uytterhoeven
  *  Based on linux/driver/video/pm2fb.c:
- *      Copyright (C) 1998-1999 Ilario Nardinocchi (nardinoc@CS.UniBO.IT)
- *      Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *      Copyright (C) 1998-1999 Ilario Nardinocchi (nardinoc@CS.UniBO.IT)
+ *      Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
  *
  *  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.
  *
- *  $Header: /cvsroot/linux/drivers/video/pm3fb.c,v 1.1 2002/02/25 19:11:06 marcelo Exp $
- *
- *  CHANGELOG:
- *  Mon Feb 11 10:35:48 MET 2002, v 1.4.11B: Cosmetic update.
- *  Wed Jan 23 14:16:59 MET 2002, v 1.4.11: Preliminary 2.5.x support, patch for 2.5.2.
- *  Wed Nov 28 11:08:29 MET 2001, v 1.4.10: potential bug fix for SDRAM-based board, patch for 2.4.16.
- *  Thu Sep 20 10:24:42 MET DST 2001, v 1.4.9: sync bug fix, preliminary flatpanel support, better timings.
- *  Tue Aug 28 10:13:01 MET DST 2001, v 1.4.8: memory timings check, minor bug fixes.
- *  Wed Jul 18 19:06:14 CEST 2001, v 1.4.7: Mode fix (800x600-100, 1024x768-100 changed), using HW panning + accel bug fix.
- *  Mon Jun 25 10:33:56 MET DST 2001, v 1.4.6: Depth 12 fix, chip reset ioctl, moved memory erase ioctl to DEBUG.
- *  Wed Jun 20 11:13:08 MET DST 2001, v 1.4.5: Fixed missing blinking cursor in 8bpp, code cleaning, memory erase IOCTL.
- *  Mon Jun 18 16:00:27 CEST 2001, v 1.4.4: Depth 12 (RGBA 4444) support, code cleaning.
- *  Fri Jun 15 13:53:01 CEST 2001, v 1.4.3: Removed warnings, depth 15 support, add 'depth' option.
- *  Thu Jun 14 10:13:52 MET DST 2001, v 1.4.2: Fixed depth switching bug, preliminary 15bpp (RGB5551) support.
- *  Thu Apr 12 11:16:45 MET DST 2001, v 1.4.1B: Doc updates.
- *  Fri Apr  6 11:12:53 MET DST 2001, v 1.4.1: Configure.help, minor cleanup
- *  Thu Mar 29 10:56:50 MET DST 2001, v 1.4.0: Module & module options support (note: linux patch changed, 2.2.19 added).
- *  Thu Mar 15 15:30:31 MET 2001, v 1.3.2: Fixed mirroring bug on little-endian.
- *  Wed Mar 14 21:25:54 CET 2001, v 1.3.1: Fixed bug in BlockMove (_bmov).
- *  Tue Mar 13 10:53:19 MET 2001, v 1.3.0: Character drawing hardware support (in all width between 1 and 16), fixes.
- *  Thu Mar  8 10:20:16 MET 2001, v 1.2.2: Better J2000 support, "font:" option.
- *  Tue Mar  6 21:25:04 CET 2001, v 1.2.1: Better acceleration support.
- *  Mon Mar  5 21:54:17 CET 2001, v 1.2.0: Partial acceleration support (clear & bmove)
- *  Mon Mar  5 12:52:15 CET 2001, v 1.1.3: Big pan_display fix.
- *  Sun Mar  4 22:21:50 CET 2001, v 1.1.2: (numerous) bug fixes.
- *  Fri Mar  2 15:54:07 CET 2001, v 1.1.1: Might have Appian J2000 support, resource mangement in 2.4
- *  Wed Feb 28 18:21:35 CET 2001, v 1.1.0: Might have multiple boards support (added, but not yest tested)
- *  Tue Feb 27 17:31:12 CET 2001, v 1.0.6: fixes boot-time mode select, add more default mode
- *  Tue Feb 27 14:01:36 CET 2001, v 1.0.5: fixes (1.0.4 was broken for 2.2), cleaning up
- *  Mon Feb 26 23:17:36 CET 2001, v 1.0.4: preliminary 2.4.x support, dropped (useless on pm3) partial product, more OF fix
- *  Mon Feb 26 20:59:05 CET 2001, v 1.0.3: No more shadow register (and wasted memory), endianess fix, use OF-preset resolution by default
- *  Wed Feb 21 22:09:30 CET 2001, v 1.0.2: Code cleaning for future multiboard support, better OF support, bugs fix
- *  Wed Feb 21 19:58:56 CET 2001, v 1.0.1: OpenFirmware support, fixed memory detection, better debug support, code cleaning
- *  Wed Feb 21 14:47:06 CET 2001, v 1.0.0: First working version
  */
 
 #include <linux/module.h>
@@ -58,856 +28,155 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/vmalloc.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/ioport.h>
-#include <linux/ctype.h>
-
-#include <video/fbcon.h>
-#include <video/fbcon-mfb.h>
-#include <video/fbcon-cfb2.h>
-#include <video/fbcon-cfb4.h>
-#include <video/fbcon-cfb8.h>
-#include <video/fbcon-cfb16.h>
-#include <video/fbcon-cfb24.h>
-#include <video/fbcon-cfb32.h>
-#include <video/pm3fb.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <video/pm3fb.h>
 
-#ifdef CONFIG_FB_OF
-#include <asm/prom.h>
+#if !defined(CONFIG_PCI)
+#error "Only generic PCI cards supported."
 #endif
 
-/* ************************************* */
-/* ***** The various "global" data ***** */
-/* ************************************* */
-
-/* those will need a rework for multiple board support */
-/* Driver name */
-static const char permedia3_name[16] = "Permedia3";
-
-/* the fb_par struct, mandatory */
-struct pm3fb_par {
-        u32 pixclock;           /* pixclock in KHz */
-
-        u32 width;              /* width of virtual screen */
-        u32 height;             /* height of virtual screen */
-
-        u32 hsstart;            /* horiz. sync start */
-        u32 hsend;              /* horiz. sync end */
-        u32 hbend;              /* horiz. blank end (also gate end) */
-        u32 htotal;             /* total width (w/ sync & blank) */
-
-        u32 vsstart;            /* vert. sync start */
-        u32 vsend;              /* vert. sync end */
-        u32 vbend;              /* vert. blank end */
-        u32 vtotal;             /* total height (w/ sync & blank) */
-
-        u32 stride;             /* screen stride */
-        u32 base;               /* screen base (xoffset+yoffset) in 128 bits unit */
-        /* NOTE : unlike other pm3 stuff above, stored *after* shiftbpp. don't ask */
-        u32 depth;              /* screen depth (8, 12, 15, 16 or 32) */
-        u32 video;              /* video control (hsync,vsync) */
-};
-
-/* memory timings */
-struct pm3fb_timings
-{
-        unsigned long caps;
-        unsigned long timings;
-        unsigned long control;
-        unsigned long refresh;
-        unsigned long powerdown;
-};
-typedef enum pm3fb_timing_result { pm3fb_timing_ok, pm3fb_timing_problem, pm3fb_timing_retry } pm3fb_timing_result;
-#define PM3FB_UNKNOWN_TIMING_VALUE ((unsigned long)-1)
-#define PM3FB_UNKNOWN_TIMINGS { PM3FB_UNKNOWN_TIMING_VALUE, PM3FB_UNKNOWN_TIMING_VALUE, PM3FB_UNKNOWN_TIMING_VALUE, PM3FB_UNKNOWN_TIMING_VALUE, PM3FB_UNKNOWN_TIMING_VALUE }
-
-/* the fb_info struct, mandatory */
-struct pm3fb_info {
-        struct fb_info_gen gen;
-        unsigned long board_num; /* internal board number */
-        unsigned long use_current;
-        struct pm3fb_par *current_par;
-        struct pci_dev *dev;    /* PCI device */
-        unsigned long board_type; /* index in the cardbase */
-        unsigned char *fb_base; /* framebuffer memory base */
-        u32 fb_size;            /* framebuffer memory size */
-        unsigned char *p_fb;    /* physical address of frame buffer */
-        unsigned char *v_fb;    /* virtual address of frame buffer */
-        unsigned char *pIOBase; /* physical address of registers region, must be rg_base or rg_base+PM2_REGS_SIZE depending on the host endianness */
-        unsigned char *vIOBase; /* address of registers after ioremap() */
-        struct {
-                u8 transp;
-                u8 red;
-                u8 green;
-                u8 blue;
-        } palette[256];
-        union {
-#ifdef FBCON_HAS_CFB16
-                u16 cmap12[16]; /* RGBA 4444 */
-                u16 cmap15[16]; /* RGBA 5551 */
-                u16 cmap16[16]; /* RGBA 5650 */
-#endif
-#ifdef FBCON_HAS_CFB32
-                u32 cmap32[16];
+#undef PM3FB_MASTER_DEBUG
+#ifdef PM3FB_MASTER_DEBUG
+#define DPRINTK(a,b...) printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)
+#else
+#define DPRINTK(a,b...)
 #endif
-        } cmap;
-        struct pm3fb_timings memt;
-};
 
-/* regular resolution database*/
-static struct {
-        char name[16];
-        struct pm3fb_par user_mode;
-} mode_base[] __initdata = {
-        {
-                "default-800x600", {
-        49500, 800, 600, 16, 96, 256, 1056, 1, 4, 25, 625,
-                            800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}}, {
-                "1024x768-74", {
-        78752, 1024, 768, 32, 128, 304, 1328, 1, 4, 38,
-                            806, 1024, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}}, {
-                "1024x768-74-32", {
-                        78752, 1024, 768, 32, 128, 304, 1328, 1, 4, 38,
-                        806, 1024, 0, 32,
-                        PM3VideoControl_ENABLE |
-                        PM3VideoControl_HSYNC_ACTIVE_HIGH
-                        |
-                        PM3VideoControl_VSYNC_ACTIVE_HIGH
-                        | PM3VideoControl_PIXELSIZE_32BIT}},
-/* Generated mode : "1600x1024", for the SGI 1600SW flat panel*/
-        {
-                "SGI1600SW", {
-                        108000, 1600, 1024, 16, 56, 104, 1704, 3, 6, 32,
-                        1056, 1600, 0, 8,
-                        PM3VideoControl_ENABLE|
-                        PM3VideoControl_HSYNC_ACTIVE_LOW|PM3VideoControl_VSYNC_ACTIVE_LOW|
-                        PM3VideoControl_PIXELSIZE_32BIT}}, 
-/* ##### auto-generated mode, by fbtimings2pm3 */
-/* Generated mode : "640x480-60" */
-        {
-                "640x480-60", {
-        25174, 640, 480, 16, 112, 160, 800, 10, 12, 45,
-                            525, 640, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "640x480-72" */
-        {
-                "640x480-72", {
-        31199, 640, 480, 24, 64, 192, 832, 9, 12, 40, 520,
-                            640, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "640x480-75" */
-        {
-                "640x480-75", {
-        31499, 640, 480, 16, 80, 200, 840, 1, 4, 20, 500,
-                            640, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "640x480-90" */
-        {
-                "640x480-90", {
-        39909, 640, 480, 32, 72, 192, 832, 25, 39, 53, 533,
-                            640, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "640x480-100" */
-        {
-                "640x480-100", {
-        44899, 640, 480, 32, 160, 208, 848, 22, 34, 51,
-                            531, 640, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-48-lace" */
-/* INTERLACED NOT SUPPORTED
-  {"800x600-48-lace", {35999, 800, 600, 80, 208, 264, 1064, 11, 23, 102, 702, 800, 0, 8, PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_HIGH|PM3VideoControl_VSYNC_ACTIVE_HIGH|PM3VideoControl_PIXELSIZE_8BIT}}, 
-   INTERLACED NOT SUPPORTED */
-/* Generated mode : "800x600-56" */
-        {
-                "800x600-56", {
-        35999, 800, 600, 24, 96, 224, 1024, 1, 3, 25, 625,
-                            800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-60" */
-        {
-                "800x600-60", {
-        40000, 800, 600, 40, 168, 256, 1056, 1, 5, 28, 628,
-                            800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-70" */
-        {
-                "800x600-70", {
-        44899, 800, 600, 24, 168, 208, 1008, 9, 21, 36,
-                            636, 800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-72" */
-        {
-                "800x600-72", {
-        50000, 800, 600, 56, 176, 240, 1040, 37, 43, 66,
-                            666, 800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-75" */
-        {
-                "800x600-75", {
-        49497, 800, 600, 16, 96, 256, 1056, 1, 4, 25, 625,
-                            800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-90" */
-        {
-                "800x600-90", {
-        56637, 800, 600, 8, 72, 192, 992, 8, 19, 35, 635,
-                            800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "800x600-100", from /etc/fb.modes */
-/* DISABLED, hsstart == 0
-        {
-                "800x600-100", {
-        67499, 800, 600, 0, 64, 280, 1080, 7, 11, 25, 625,
-                            800, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-*/
-/* Generated mode : "800x600-100", from ??? */
-        {
-                "800x600-100", {
-                        69650, 800, 600, 64, 128, 288, 1088, 4, 10, 40, 640, 800, 0, 8,
-                        PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_LOW|
-                        PM3VideoControl_VSYNC_ACTIVE_LOW|PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1024x768-43-lace" */
-/* INTERLACED NOT SUPPORTED
-  {"1024x768-43-lace", {44899, 1024, 768, 8, 184, 240, 1264, 1, 9, 49, 817, 1024, 0, 8, PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_HIGH|PM3VideoControl_VSYNC_ACTIVE_HIGH|PM3VideoControl_PIXELSIZE_8BIT}}, 
-   INTERLACED NOT SUPPORTED */
-/* Generated mode : "1024x768-60" */
-        {
-                "1024x768-60", {
-        64998, 1024, 768, 24, 160, 320, 1344, 3, 9, 38,
-                            806, 1024, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1024x768-70" */
-        {
-                "1024x768-70", {
-        74996, 1024, 768, 24, 160, 304, 1328, 3, 9, 38,
-                            806, 1024, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1024x768-72" */
-        {
-                "1024x768-72", {
-        74996, 10224, 768, 24, 160, 264, 10488, 3, 9, 38,
-                            806, 10224, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1024x768-75" */
-        {
-                "1024x768-75", {
-        78746, 1024, 768, 16, 112, 288, 1312, 1, 4, 32,
-                            800, 1024, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1024x768-90" */
-        {
-                "1024x768-90", {
-        100000, 1024, 768, 0, 96, 288, 1312, 21, 36, 77,
-                            845, 1024, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1024x768-100", from /etc/fb.modes */
-/* DISABLED, vsstart == 0
-        {
-                "1024x768-100", {
-        109998, 1024, 768, 0, 88, 368, 1392, 0, 8, 24, 792,
-                            1024, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-*/
-/* Generated mode : "1024x768-100", from ??? */
-        {
-                "1024x768-100", {
-                        115500, 1024, 768, 32, 224, 416, 1440, 3, 13, 34, 802, 1024, 0, 8,
-                        PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_LOW|
-                        PM3VideoControl_VSYNC_ACTIVE_LOW|PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1152x864-43-lace" */
-/* INTERLACED NOT SUPPORTED
-  {"1152x864-43-lace", {64998, 1152, 864, 72, 200, 264, 1416, 78, 87, 191, 1055, 1152, 0, 8, PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_HIGH|PM3VideoControl_VSYNC_ACTIVE_HIGH|PM3VideoControl_PIXELSIZE_8BIT}}, 
-   INTERLACED NOT SUPPORTED */
-/* Generated mode : "1152x864-47-lace" */
-/* INTERLACED NOT SUPPORTED
-  {"1152x864-47-lace", {64998, 1152, 864, 88, 216, 296, 1448, 30, 39, 83, 947, 1152, 0, 8, PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_HIGH|PM3VideoControl_VSYNC_ACTIVE_HIGH|PM3VideoControl_PIXELSIZE_8BIT}}, 
-   INTERLACED NOT SUPPORTED */
-/* Generated mode : "1152x864-60" */
-        {
-                "1152x864-60", {
-        80000, 1152, 864, 64, 176, 304, 1456, 6, 11, 52,
-                            916, 1152, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1152x864-70" */
-        {
-                "1152x864-70", {
-        100000, 1152, 864, 40, 192, 360, 1512, 13, 24, 81,
-                            945, 1152, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1152x864-75" */
-        {
-                "1152x864-75", {
-        109998, 1152, 864, 24, 168, 312, 1464, 45, 53, 138,
-                            1002, 1152, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1152x864-80" */
-        {
-                "1152x864-80", {
-        109998, 1152, 864, 16, 128, 288, 1440, 30, 37, 94,
-                            958, 1152, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1280x1024-43-lace" */
-/* INTERLACED NOT SUPPORTED
-  {"1280x1024-43-lace", {80000, 1024, 1024, 80, 160, 320, 1344, 50, 60, 125, 1149, 1024, 0, 8, PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_HIGH|PM3VideoControl_VSYNC_ACTIVE_HIGH|PM3VideoControl_PIXELSIZE_8BIT}}, 
-   INTERLACED NOT SUPPORTED */
-/* Generated mode : "1280x1024-47-lace" */
-/* INTERLACED NOT SUPPORTED
-  {"1280x1024-47-lace", {80000, 1280, 1024, 80, 160, 320, 1600, 1, 11, 29, 1053, 1280, 0, 8, PM3VideoControl_ENABLE|PM3VideoControl_HSYNC_ACTIVE_HIGH|PM3VideoControl_VSYNC_ACTIVE_HIGH|PM3VideoControl_PIXELSIZE_8BIT}}, 
-   INTERLACED NOT SUPPORTED */
-/* Generated mode : "1280x1024-60" */
-        {
-                "1280x1024-60", {
-        107991, 1280, 1024, 48, 160, 408, 1688, 1, 4, 42,
-                            1066, 1280, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1280x1024-70" */
-        {
-                "1280x1024-70", {
-        125992, 1280, 1024, 80, 192, 408, 1688, 1, 6, 42,
-                            1066, 1280, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1280x1024-74" */
-        {
-                "1280x1024-74", {
-        134989, 1280, 1024, 32, 176, 432, 1712, 0, 30, 40,
-                            1064, 1280, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1280x1024-75" */
-        {
-                "1280x1024-75", {
-        134989, 1280, 1024, 16, 160, 408, 1688, 1, 4, 42,
-                            1066, 1280, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_HIGH
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_HIGH
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1600x1200-60" */
-        {
-                "1600x1200-60", {
-        155981, 1600, 1200, 32, 192, 448, 2048, 10, 18, 70,
-                            1270, 1600, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1600x1200-66" */
-        {
-                "1600x1200-66", {
-        171998, 1600, 1200, 40, 176, 480, 2080, 3, 6, 53,
-                            1253, 1600, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* Generated mode : "1600x1200-76" */
-        {
-                "1600x1200-76", {
-        197980, 1600, 1200, 40, 176, 480, 2080, 3, 8, 50,
-                            1250, 1600, 0, 8,
-                            PM3VideoControl_ENABLE |
-                            PM3VideoControl_HSYNC_ACTIVE_LOW
-                            |
-                            PM3VideoControl_VSYNC_ACTIVE_LOW
-                            | PM3VideoControl_PIXELSIZE_8BIT}},
-/* ##### end of auto-generated mode */
-        {
-        "\0",}
-};
-
-/* more mandatory stuff (see skeletonfb.c + framebuffer driver HOWTO */
-static struct pm3fb_info fb_info[PM3_MAX_BOARD];
-static struct pm3fb_par current_par[PM3_MAX_BOARD];
-static int current_par_valid[PM3_MAX_BOARD];
-/* to allow explicit filtering of board */
-short bus[PM3_MAX_BOARD];
-short slot[PM3_MAX_BOARD];
-short func[PM3_MAX_BOARD];
-short disable[PM3_MAX_BOARD];
-short noaccel[PM3_MAX_BOARD];
-char fontn[PM3_MAX_BOARD][PM3_FONTNAME_SIZE];
-short depth[PM3_MAX_BOARD];
-short flatpanel[PM3_MAX_BOARD];
-static struct display disp[PM3_MAX_BOARD];
-static char g_options[PM3_OPTIONS_SIZE] __initdata = "pm3fb,dummy";
-short printtimings = 0;
-short forcesize[PM3_MAX_BOARD];
-
-/* ********************* */
-/* ***** prototype ***** */
-/* ********************* */
-/* card-specific */
-static void pm3fb_j2000_setup(struct pm3fb_info *l_fb_info);
-/* permedia3-specific */
-static pm3fb_timing_result pm3fb_preserve_memory_timings(struct pm3fb_info *l_fb_info);
-static pm3fb_timing_result pm3fb_try_memory_timings(struct pm3fb_info *l_fb_info);
-static void pm3fb_write_memory_timings(struct pm3fb_info *l_fb_info);
-static unsigned long pm3fb_read_dac_reg(struct pm3fb_info *l_fb_info,
-                                        unsigned long r);
-static unsigned long pm3fb_CalculateClock(struct pm3fb_info *l_fb_info, unsigned long reqclock, /* In kHz units */
-                                          unsigned long refclock,       /* In kHz units */
-                                          unsigned char *prescale,      /* ClkPreScale */
-                                          unsigned char *feedback,      /* ClkFeedBackScale */
-                                          unsigned char *postscale
-                                          /* ClkPostScale */ );
-static void pm3fb_clear_memory(struct pm3fb_info *l_fb_info, u32 cc);
-static void pm3fb_clear_colormap(struct pm3fb_info *l_fb_info, unsigned char r, unsigned char g, unsigned char b);
-static void pm3fb_common_init(struct pm3fb_info *l_fb_info);
-static int pm3fb_Shiftbpp(struct pm3fb_info *l_fb_info,
-                          unsigned long depth, int v);
-static int pm3fb_Unshiftbpp(struct pm3fb_info *l_fb_info,
-                            unsigned long depth, int v);
-static void pm3fb_mapIO(struct pm3fb_info *l_fb_info);
-static void pm3fb_unmapIO(struct pm3fb_info *l_fb_info);
-#if defined(PM3FB_MASTER_DEBUG) && (PM3FB_MASTER_DEBUG >= 2)
-static void pm3fb_show_cur_mode(struct pm3fb_info *l_fb_info);
-#endif
-static void pm3fb_show_cur_timing(struct pm3fb_info *l_fb_info);
-static void pm3fb_write_mode(struct pm3fb_info *l_fb_info);
-static void pm3fb_read_mode(struct pm3fb_info *l_fb_info,
-                            struct pm3fb_par *curpar);
-static unsigned long pm3fb_size_memory(struct pm3fb_info *l_fb_info);
-/* accelerated permedia3-specific */
-#ifdef PM3FB_USE_ACCEL
-static void pm3fb_wait_pm3(struct pm3fb_info *l_fb_info);
-static void pm3fb_init_engine(struct pm3fb_info *l_fb_info);
-#ifdef FBCON_HAS_CFB32
-static void pm3fb_cfb32_clear(struct vc_data *conp,
-                              struct display *p,
-                              int sy, int sx, int height, int width);
-static void pm3fb_cfb32_clear_margins(struct vc_data *conp,
-                                      struct display *p, int bottom_only);
-#endif /* FBCON_HAS_CFB32 */
-#ifdef FBCON_HAS_CFB16
-static void pm3fb_cfb16_clear(struct vc_data *conp,
-                              struct display *p,
-                              int sy, int sx, int height, int width);
-static void pm3fb_cfb16_clear_margins(struct vc_data *conp,
-                                      struct display *p, int bottom_only);
-#endif /* FBCON_HAS_CFB16 */
-#ifdef FBCON_HAS_CFB8
-static void pm3fb_cfb8_clear(struct vc_data *conp,
-                             struct display *p,
-                             int sy, int sx, int height, int width);
-static void pm3fb_cfb8_clear_margins(struct vc_data *conp,
-                                     struct display *p, int bottom_only);
-#endif /* FBCON_HAS_CFB8 */
-#if defined(FBCON_HAS_CFB8) || defined(FBCON_HAS_CFB16) || defined(FBCON_HAS_CFB32)
-static void pm3fb_cfbX_bmove(struct display *p,
-                             int sy, int sx,
-                             int dy, int dx, int height, int width);
-static void pm3fb_cfbX_putc(struct vc_data *conp, struct display *p,
-                            int c, int yy, int xx);
-static void pm3fb_cfbX_putcs(struct vc_data *conp, struct display *p,
-                             const unsigned short *s, int count, int yy,
-                             int xx);
-static void pm3fb_cfbX_revc(struct display *p, int xx, int yy);
-#endif /* FBCON_HAS_CFB8 || FBCON_HAS_CFB16 || FBCON_HAS_CFB32 */
-#endif /* PM3FB_USE_ACCEL */
-/* pre-init */
-static void pm3fb_mode_setup(char *mode, unsigned long board_num);
-static void pm3fb_pciid_setup(char *pciid, unsigned long board_num);
-static char *pm3fb_boardnum_setup(char *options, unsigned long *bn);
-static void pm3fb_real_setup(char *options);
-/* fbdev */
-static int pm3fb_encode_fix(struct fb_fix_screeninfo *fix,
-                            const void *par, struct fb_info_gen *info);
-static int pm3fb_decode_var(const struct fb_var_screeninfo *var,
-                            void *par, struct fb_info_gen *info);
-static void pm3fb_encode_depth(struct fb_var_screeninfo *var, long d);
-static int pm3fb_encode_var(struct fb_var_screeninfo *var,
-                            const void *par, struct fb_info_gen *info);
-static void pm3fb_get_par(void *par, struct fb_info_gen *info);
-static void pm3fb_set_par(const void *par, struct fb_info_gen *info);
-static void pm3fb_set_color(struct pm3fb_info *l_fb_info,
-                            unsigned char regno, unsigned char r,
-                            unsigned char g, unsigned char b);
-static int pm3fb_getcolreg(unsigned regno, unsigned *red, unsigned *green,
-                           unsigned *blue, unsigned *transp,
-                           struct fb_info *info);
-static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                           unsigned blue, unsigned transp,
-                           struct fb_info *info);
-static int pm3fb_blank(int blank_mode, struct fb_info_gen *info);
-static void pm3fb_set_disp(const void *par, struct display *disp,
-                           struct fb_info_gen *info);
-static void pm3fb_detect(void);
-static int pm3fb_pan_display(const struct fb_var_screeninfo *var,
-                             struct fb_info_gen *info);
-static int pm3fb_ioctl(struct fb_info *info, u_int cmd, u_long arg);
-
-
-/* the struct that hold them together */
-struct fbgen_hwswitch pm3fb_switch = {
-        pm3fb_detect, pm3fb_encode_fix, pm3fb_decode_var, pm3fb_encode_var,
-        pm3fb_get_par, pm3fb_set_par, pm3fb_getcolreg, 
-        pm3fb_pan_display, pm3fb_blank, pm3fb_set_disp
-};
+/*
+ * Driver data
+ */
+static char *mode_option __devinitdata;
 
-static struct fb_ops pm3fb_ops = {
-        .owner =        THIS_MODULE,
-        .fb_get_fix =   fbgen_get_fix,
-        .fb_get_var =   fbgen_get_var,
-        .fb_set_var =   fbgen_set_var,
-        .fb_get_cmap =  fbgen_get_cmap,
-        .fb_set_cmap =  fbgen_set_cmap,
-        .fb_setcolreg = pm3fb_setcolreg,
-        .fb_pan_display =fbgen_pan_display,
-        .fb_blank =     fbgen_blank,
-        .fb_ioctl =     pm3fb_ioctl,
-};
+/*
+ *  If your driver supports multiple boards, you should make the
+ *  below data types arrays, or allocate them dynamically (using kmalloc()).
+ */
 
-#ifdef PM3FB_USE_ACCEL
-#ifdef FBCON_HAS_CFB32
-static struct display_switch pm3fb_cfb32 = {
-        fbcon_cfb32_setup, pm3fb_cfbX_bmove, pm3fb_cfb32_clear,
-        pm3fb_cfbX_putc, pm3fb_cfbX_putcs, pm3fb_cfbX_revc,
-        NULL /* cursor() */ , NULL /* set_font() */ ,
-        pm3fb_cfb32_clear_margins,
-        FONTWIDTHRANGE(1, 16)   /* true only if accelerated... */
-};
-#endif /* FBCON_HAS_CFB32 */
-#ifdef FBCON_HAS_CFB16
-static struct display_switch pm3fb_cfb16 = {
-        fbcon_cfb16_setup, pm3fb_cfbX_bmove, pm3fb_cfb16_clear,
-        pm3fb_cfbX_putc, pm3fb_cfbX_putcs, pm3fb_cfbX_revc,
-        NULL /* cursor() */ , NULL /* set_font() */ ,
-        pm3fb_cfb16_clear_margins,
-        FONTWIDTHRANGE(1, 16)   /* true only if accelerated... */
-};
-#endif /* FBCON_HAS_CFB16 */
-#ifdef FBCON_HAS_CFB8
-static struct display_switch pm3fb_cfb8 = {
-        fbcon_cfb8_setup, pm3fb_cfbX_bmove, pm3fb_cfb8_clear,
-        pm3fb_cfbX_putc, pm3fb_cfbX_putcs, pm3fb_cfbX_revc,
-        NULL /* cursor() */ , NULL /* set_font() */ ,
-        pm3fb_cfb8_clear_margins,
-        FONTWIDTHRANGE(1, 16)   /* true only if accelerated... */
-};
-#endif /* FBCON_HAS_CFB8 */
-#endif /* PM3FB_USE_ACCEL */
-
-/* ****************************** */
-/* ***** card-specific data ***** */
-/* ****************************** */
-struct pm3fb_card_timings {
-        unsigned long memsize; /* 0 for last value (i.e. default) */
-        struct pm3fb_timings memt;
+/*
+ * This structure defines the hardware state of the graphics card. Normally
+ * you place this in a header file in linux/include/video. This file usually
+ * also includes register information. That allows other driver subsystems
+ * and userland applications the ability to use the same header file to
+ * avoid duplicate work and easy porting of software.
+ */
+struct pm3_par {
+        unsigned char   __iomem *v_regs;/* virtual address of p_regs */
+        u32             video;          /* video flags before blanking */
+        u32             base;           /* screen base (xoffset+yoffset) in 128 bits unit */
+        u32             palette[16];
 };
 
-static struct pm3fb_card_timings t_FormacProFormance3[] = {
-        { 16, { 0x02e311b8, 0x06100205, 0x08000002, 0x00000079, 0x00000000} },
-        { 0, { 0x02e311b8, 0x06100205, 0x08000002, 0x00000079, 0x00000000} } /* from 16 MB PF3 */
+/*
+ * Here we define the default structs fb_fix_screeninfo and fb_var_screeninfo
+ * if we don't use modedb. If we do use modedb see pm3fb_init how to use it
+ * to get a fb_var_screeninfo. Otherwise define a default var as well.
+ */
+static struct fb_fix_screeninfo pm3fb_fix __devinitdata = {
+        .id =           "Permedia3",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_PSEUDOCOLOR,
+        .xpanstep =     1,
+        .ypanstep =     1,
+        .ywrapstep =    0,
+        .accel =        FB_ACCEL_NONE,
 };
 
-static struct pm3fb_card_timings t_AppianJeronimo2000[] = {
-        { 32, { 0x02e311B8, 0x07424905, 0x0c000003, 0x00000061, 0x00000000} },
-        { 0, { 0x02e311B8, 0x07424905, 0x0c000003, 0x00000061, 0x00000000} } /* from 32MB J2000 */
-};
+/*
+ * Utility functions
+ */
 
-static struct pm3fb_card_timings t_3DLabsOxygenVX1[] = {
-        { 32, { 0x30e311b8, 0x08501204, 0x08000002, 0x0000006b, 0x00000000} },
-        { 0, { 0x30e311b8, 0x08501204, 0x08000002, 0x0000006b, 0x00000000} } /* from 32MB VX1 */
-};
+static inline u32 PM3_READ_REG(struct pm3_par *par, s32 off)
+{
+        return fb_readl(par->v_regs + off);
+}
 
-static struct {
-                char cardname[32]; /* recognized card name */
-                u16 subvendor; /* subvendor of the card */
-                u16 subdevice; /* subdevice of the card */
-                u8  func; /* function of the card to which the extra init apply */
-                void (*specific_setup)(struct pm3fb_info *l_fb_info); /* card/func specific setup, done before _any_ FB access */
-        struct pm3fb_card_timings *c_memt; /* defauls timings for the boards */
-} cardbase[] = {
-        { "Unknown Permedia3 board", 0xFFFF, 0xFFFF, 0xFF, NULL, NULL },
-        { "Appian Jeronimo 2000 head 1", 0x1097, 0x3d32, 1, NULL,
-          t_AppianJeronimo2000
-        },
-        { "Appian Jeronimo 2000 head 2", 0x1097, 0x3d32, 2, pm3fb_j2000_setup,
-          t_AppianJeronimo2000
-        },
-        { "Formac ProFormance 3", PCI_VENDOR_ID_3DLABS, 0x000a, 0, NULL, /* Formac use 3DLabs ID ?!? */
-          t_FormacProFormance3
-        },
-        { "3DLabs Permedia3 Create!", PCI_VENDOR_ID_3DLABS, 0x0127, 0, NULL, NULL },
-        { "3DLabs Oxygen VX1 PCI", PCI_VENDOR_ID_3DLABS, 0x0121, 0, NULL,
-          t_3DLabsOxygenVX1
-        },
-        { "3DLabs Oxygen VX1 AGP", PCI_VENDOR_ID_3DLABS, 0x0125, 0, NULL, NULL },
-        { "3DLabs Oxygen VX1-16 AGP", PCI_VENDOR_ID_3DLABS, 0x0140, 0, NULL, NULL },
-        { "3DLabs Oxygen VX1-1600SW PCI", PCI_VENDOR_ID_3DLABS, 0x0800, 0, NULL, NULL },
-        { "\0", 0x0, 0x0, 0, NULL, NULL }
-};
+static inline void PM3_WRITE_REG(struct pm3_par *par, s32 off, u32 v)
+{
+        fb_writel(v, par->v_regs + off);
+}
 
-/* ********************************** */
-/* ***** card-specific function ***** */
-/* ********************************** */
-static void pm3fb_j2000_setup(struct pm3fb_info *l_fb_info)
-{       /* the appian j2000 require more initialization of the second head */
-        /* l_fb_info must point to the _second_ head of the J2000 */
-        
-        DTRACE;
-
-        l_fb_info->memt = t_AppianJeronimo2000[0].memt; /* 32 MB, first and only j2000 ? */
-        
-        pm3fb_write_memory_timings(l_fb_info);
+static inline void PM3_WAIT(struct pm3_par *par, u32 n)
+{
+        while (PM3_READ_REG(par, PM3InFIFOSpace) < n);
 }
 
-/* *************************************** */
-/* ***** permedia3-specific function ***** */
-/* *************************************** */
-static pm3fb_timing_result pm3fb_preserve_memory_timings(struct pm3fb_info *l_fb_info)
+static inline void PM3_SLOW_WRITE_REG(struct pm3_par *par, s32 off, u32 v)
 {
-        l_fb_info->memt.caps = PM3_READ_REG(PM3LocalMemCaps);
-        l_fb_info->memt.timings = PM3_READ_REG(PM3LocalMemTimings);
-        l_fb_info->memt.control = PM3_READ_REG(PM3LocalMemControl);
-        l_fb_info->memt.refresh = PM3_READ_REG(PM3LocalMemRefresh);
-        l_fb_info->memt.powerdown = PM3_READ_REG(PM3LocalMemPowerDown);
-
-        if ((l_fb_info->memt.caps == PM3FB_UNKNOWN_TIMING_VALUE) ||
-            (l_fb_info->memt.timings == PM3FB_UNKNOWN_TIMING_VALUE) ||
-            (l_fb_info->memt.control == PM3FB_UNKNOWN_TIMING_VALUE) ||
-            (l_fb_info->memt.refresh == PM3FB_UNKNOWN_TIMING_VALUE) ||
-            (l_fb_info->memt.powerdown == PM3FB_UNKNOWN_TIMING_VALUE))
-        {
-                printk(KERN_ERR "pm3fb: invalid memory timings in permedia3 board #%ld\n", l_fb_info->board_num);
-                return(pm3fb_try_memory_timings(l_fb_info));
+        if (par->v_regs) {
+                mb();
+                PM3_WAIT(par, 1);
+                wmb();
+                PM3_WRITE_REG(par, off, v);
         }
-        return(pm3fb_timing_ok);
 }
 
-static pm3fb_timing_result pm3fb_try_memory_timings(struct pm3fb_info *l_fb_info)
+static inline void PM3_SET_INDEX(struct pm3_par *par, unsigned index)
 {
-        if (cardbase[l_fb_info->board_type].c_memt)
-        {
-                int i = 0, done = 0;
-                while (!done)
-                {
-                        if ((cardbase[l_fb_info->board_type].c_memt[i].memsize == l_fb_info->fb_size)
-                            || !(cardbase[l_fb_info->board_type].c_memt[i].memsize))
-                        { /* will use the 0-sized timings by default */
-                                done = 1;
-                                l_fb_info->memt = cardbase[l_fb_info->board_type].c_memt[i].memt;
-                                printk(KERN_WARNING  "pm3fb: trying to use predefined memory timings for permedia3 board #%ld (%s, %ld MB)\n",
-                                       l_fb_info->board_num,
-                                       cardbase[l_fb_info->board_type].cardname,
-                                       cardbase[l_fb_info->board_type].c_memt[i].memsize);
-                                pm3fb_write_memory_timings(l_fb_info);
-                                return(pm3fb_timing_retry);
-                        }
-                        i++;
-                }
-        } else
-                return(pm3fb_timing_problem);
-        return(pm3fb_timing_ok);
+        PM3_SLOW_WRITE_REG(par, PM3RD_IndexHigh, (index >> 8) & 0xff);
+        PM3_SLOW_WRITE_REG(par, PM3RD_IndexLow, index & 0xff);
+}
+
+static inline void PM3_WRITE_DAC_REG(struct pm3_par *par, unsigned r, u8 v)
+{
+        PM3_SET_INDEX(par, r);
+        wmb();
+        PM3_WRITE_REG(par, PM3RD_IndexedData, v);
 }
 
-static void pm3fb_write_memory_timings(struct pm3fb_info *l_fb_info)
+static inline void pm3fb_set_color(struct pm3_par *par, unsigned char regno,
+                        unsigned char r, unsigned char g, unsigned char b)
 {
-        unsigned char m, n, p;
-        unsigned long clockused;
-        
-        PM3_SLOW_WRITE_REG(PM3LocalMemCaps, l_fb_info->memt.caps);
-        PM3_SLOW_WRITE_REG(PM3LocalMemTimings, l_fb_info->memt.timings);
-        PM3_SLOW_WRITE_REG(PM3LocalMemControl, l_fb_info->memt.control);
-        PM3_SLOW_WRITE_REG(PM3LocalMemRefresh, l_fb_info->memt.refresh);
-        PM3_SLOW_WRITE_REG(PM3LocalMemPowerDown, l_fb_info->memt.powerdown);
-
-        clockused =
-            pm3fb_CalculateClock(l_fb_info, 2 * 105000, PM3_REF_CLOCK, &m,
-                                 &n, &p);
-
-        PM3_WRITE_DAC_REG(PM3RD_KClkPreScale, m);
-        PM3_WRITE_DAC_REG(PM3RD_KClkFeedbackScale, n);
-        PM3_WRITE_DAC_REG(PM3RD_KClkPostScale, p);
-        PM3_WRITE_DAC_REG(PM3RD_KClkControl,
-                          PM3RD_KClkControl_STATE_RUN |
-                          PM3RD_KClkControl_SOURCE_PLL |
-                          PM3RD_KClkControl_ENABLE);
-        PM3_WRITE_DAC_REG(PM3RD_MClkControl,
-                          PM3RD_MClkControl_STATE_RUN |
-                          PM3RD_MClkControl_SOURCE_KCLK |
-                          PM3RD_MClkControl_ENABLE);
-        PM3_WRITE_DAC_REG(PM3RD_SClkControl,
-                          PM3RD_SClkControl_STATE_RUN |
-                          PM3RD_SClkControl_SOURCE_PCLK |
-                          PM3RD_SClkControl_ENABLE);
+        PM3_SLOW_WRITE_REG(par, PM3RD_PaletteWriteAddress, regno);
+        PM3_SLOW_WRITE_REG(par, PM3RD_PaletteData, r);
+        PM3_SLOW_WRITE_REG(par, PM3RD_PaletteData, g);
+        PM3_SLOW_WRITE_REG(par, PM3RD_PaletteData, b);
 }
 
-static unsigned long pm3fb_read_dac_reg(struct pm3fb_info *l_fb_info,
-                                        unsigned long r)
+static void pm3fb_clear_colormap(struct pm3_par *par,
+                        unsigned char r, unsigned char g, unsigned char b)
 {
-        DASSERT((l_fb_info->vIOBase != (unsigned char *) (-1)),
-                "l_fb_info->vIOBase mapped in read dac reg\n");
-        PM3_SET_INDEX(r);
-        mb();
-        return (PM3_READ_REG(PM3RD_IndexedData));
+        int i;
+
+        for (i = 0; i < 256 ; i++) /* fill color map with white */
+                pm3fb_set_color(par, i, r, g, b);
+
 }
 
 /* Calculating various clock parameter */
-static unsigned long pm3fb_CalculateClock(struct pm3fb_info *l_fb_info, unsigned long reqclock, /* In kHz units */
-                                          unsigned long refclock,       /* In kHz units */
-                                          unsigned char *prescale,      /* ClkPreScale */
-                                          unsigned char *feedback,      /* ClkFeedBackScale */
-                                          unsigned char *postscale
-                                          /* ClkPostScale */ )
+static void pm3fb_calculate_clock(unsigned long reqclock,
+                                unsigned char *prescale,
+                                unsigned char *feedback,
+                                unsigned char *postscale)
 {
         int f, pre, post;
         unsigned long freq;
         long freqerr = 1000;
-        unsigned long actualclock = 0;
-
-        DTRACE;
+        long currerr;
 
         for (f = 1; f < 256; f++) {
                 for (pre = 1; pre < 256; pre++) {
                         for (post = 0; post < 5; post++) {
-                                freq =
-                                    ((2 * refclock * f) /
-                                     (pre * (1 << post)));
-                                if ((reqclock > freq - freqerr)
-                                    && (reqclock < freq + freqerr)) {
-                                        freqerr =
-                                            (reqclock >
-                                             freq) ? reqclock -
-                                            freq : freq - reqclock;
+                                freq = ((2*PM3_REF_CLOCK * f) >> post) / pre;
+                                currerr = (reqclock > freq)
+                                        ? reqclock - freq
+                                        : freq - reqclock;
+                                if (currerr < freqerr) {
+                                        freqerr = currerr;
                                         *feedback = f;
                                         *prescale = pre;
                                         *postscale = post;
-                                        actualclock = freq;
                                 }
                         }
                 }
         }
-
-        return (actualclock);
 }
 
-static int pm3fb_Shiftbpp(struct pm3fb_info *l_fb_info,
-                          unsigned long depth, int v)
+static inline int pm3fb_shift_bpp(unsigned long depth, int v)
 {
-        DTRACE;
-        
         switch (depth) {
         case 8:
                 return (v >> 4);
@@ -918,181 +187,59 @@ static int pm3fb_Shiftbpp(struct pm3fb_info *l_fb_info,
         case 32:
                 return (v >> 2);
         }
-        DPRINTK(1, "Unsupported depth %ld\n", depth);
-        return (0);
-}
-
-static int pm3fb_Unshiftbpp(struct pm3fb_info *l_fb_info,
-                            unsigned long depth, int v)
-{
-        DTRACE;
-
-        switch (depth) {
-        case 8:
-                return (v << 4);
-        case 12:        
-        case 15:
-        case 16:
-                return (v << 3);
-        case 32:
-                return (v << 2);
-        }
-        DPRINTK(1, "Unsupported depth %ld\n", depth);
-        return (0);
-}
-
-static void pm3fb_mapIO(struct pm3fb_info *l_fb_info)
-{
-        DTRACE;
-
-        l_fb_info->vIOBase =
-            ioremap((unsigned long) l_fb_info->pIOBase, PM3_REGS_SIZE);
-        l_fb_info->v_fb =
-            ioremap((unsigned long) l_fb_info->p_fb, l_fb_info->fb_size);
-        DPRINTK(2, "IO mapping : IOBase %lx / %lx, fb %lx / %lx\n",
-                (unsigned long) l_fb_info->pIOBase,
-                (unsigned long) l_fb_info->vIOBase,
-                (unsigned long) l_fb_info->p_fb,
-                (unsigned long) l_fb_info->v_fb);
-}
-
-static void pm3fb_unmapIO(struct pm3fb_info *l_fb_info)
-{
-        DTRACE;
-
-        iounmap(l_fb_info->vIOBase);
-        iounmap(l_fb_info->v_fb);
-        l_fb_info->vIOBase = (unsigned char *) -1;
-        l_fb_info->v_fb = (unsigned char *) -1;
-}
-
-#if defined(PM3FB_MASTER_DEBUG) && (PM3FB_MASTER_DEBUG >= 2)
-static void pm3fb_show_cur_mode(struct pm3fb_info *l_fb_info)
-{
-        DPRINTK(2, "PM3Aperture0: 0x%08x\n", PM3_READ_REG(PM3Aperture0));
-        DPRINTK(2, "PM3Aperture1: 0x%08x\n", PM3_READ_REG(PM3Aperture1));
-        DPRINTK(2, "PM3ByAperture1Mode: 0x%08x\n",
-                PM3_READ_REG(PM3ByAperture1Mode));
-        DPRINTK(2, "PM3ByAperture2Mode: 0x%08x\n",
-                PM3_READ_REG(PM3ByAperture2Mode));
-        DPRINTK(2, "PM3ChipConfig: 0x%08x\n", PM3_READ_REG(PM3ChipConfig));
-        DPRINTK(2, "PM3FIFODis: 0x%08x\n", PM3_READ_REG(PM3FIFODis));
-        DPRINTK(2, "PM3HTotal: 0x%08x\n", PM3_READ_REG(PM3HTotal));
-        DPRINTK(2, "PM3HbEnd: 0x%08x\n", PM3_READ_REG(PM3HbEnd));
-        DPRINTK(2, "PM3HgEnd: 0x%08x\n", PM3_READ_REG(PM3HgEnd));
-        DPRINTK(2, "PM3HsEnd: 0x%08x\n", PM3_READ_REG(PM3HsEnd));
-        DPRINTK(2, "PM3HsStart: 0x%08x\n", PM3_READ_REG(PM3HsStart));
-        DPRINTK(2, "PM3MemBypassWriteMask: 0x%08x\n",
-                PM3_READ_REG(PM3MemBypassWriteMask));
-        DPRINTK(2, "PM3RD_IndexControl: 0x%08x\n",
-                PM3_READ_REG(PM3RD_IndexControl));
-        DPRINTK(2, "PM3ScreenBase: 0x%08x\n", PM3_READ_REG(PM3ScreenBase));
-        DPRINTK(2, "PM3ScreenStride: 0x%08x\n",
-                PM3_READ_REG(PM3ScreenStride));
-        DPRINTK(2, "PM3VClkCtl: 0x%08x\n", PM3_READ_REG(PM3VClkCtl));
-        DPRINTK(2, "PM3VTotal: 0x%08x\n", PM3_READ_REG(PM3VTotal));
-        DPRINTK(2, "PM3VbEnd: 0x%08x\n", PM3_READ_REG(PM3VbEnd));
-        DPRINTK(2, "PM3VideoControl: 0x%08x\n",
-                PM3_READ_REG(PM3VideoControl));
-        DPRINTK(2, "PM3VsEnd: 0x%08x\n", PM3_READ_REG(PM3VsEnd));
-        DPRINTK(2, "PM3VsStart: 0x%08x\n", PM3_READ_REG(PM3VsStart));
-
-        DPRINTK(2, "PM3RD_ColorFormat: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_ColorFormat));
-        DPRINTK(2, "PM3RD_DACControl: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_DACControl));
-        DPRINTK(2, "PM3RD_DClk0FeedbackScale: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_DClk0FeedbackScale));
-        DPRINTK(2, "PM3RD_DClk0PostScale: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_DClk0PostScale));
-        DPRINTK(2, "PM3RD_DClk0PreScale: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_DClk0PreScale));
-        DPRINTK(2, "[not set] PM3RD_IndexControl: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_IndexControl));
-        DPRINTK(2, "PM3RD_MiscControl: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_MiscControl));
-        DPRINTK(2, "PM3RD_PixelSize: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_PixelSize));
-        DPRINTK(2, "PM3RD_SyncControl: %ld\n",
-                PM3_READ_DAC_REG(PM3RD_SyncControl));
-}
-
-#endif /* defined(PM3FB_MASTER_DEBUG) && (PM3FB_MASTER_DEBUG >= 2) */
-static void pm3fb_show_cur_timing(struct pm3fb_info *l_fb_info)
-{
-        u16 subvendor, subdevice;
-
-        if ((!pci_read_config_word
-             (l_fb_info->dev, PCI_SUBSYSTEM_VENDOR_ID, &subvendor))
-            &&
-            (!pci_read_config_word
-             (l_fb_info->dev, PCI_SUBSYSTEM_ID, &subdevice))) {
-                /* well, nothing... */
-        } else {
-                subvendor = subdevice = (u16)-1;
-        }
-
-        printk(KERN_INFO "pm3fb: memory timings for board #%ld (subvendor: 0x%hx, subdevice: 0x%hx)\n", l_fb_info->board_num, subvendor, subdevice);
-        printk(KERN_INFO " PM3LocalMemCaps: 0x%08x\n",
-               PM3_READ_REG(PM3LocalMemCaps));
-        printk(KERN_INFO " PM3LocalMemTimings: 0x%08x\n",
-               PM3_READ_REG(PM3LocalMemTimings));
-        printk(KERN_INFO " PM3LocalMemControl: 0x%08x\n",
-               PM3_READ_REG(PM3LocalMemControl));
-        printk(KERN_INFO " PM3LocalMemRefresh: 0x%08x\n",
-               PM3_READ_REG(PM3LocalMemRefresh));
-        printk(KERN_INFO " PM3LocalMemPowerDown: 0x%08x\n",
-               PM3_READ_REG(PM3LocalMemPowerDown));
+        DPRINTK("Unsupported depth %ld\n", depth);
+        return 0;
 }
 
 /* write the mode to registers */
-static void pm3fb_write_mode(struct pm3fb_info *l_fb_info)
+static void pm3fb_write_mode(struct fb_info *info)
 {
+        struct pm3_par *par = info->par;
         char tempsync = 0x00, tempmisc = 0x00;
-        DTRACE;
-
-        PM3_SLOW_WRITE_REG(PM3MemBypassWriteMask, 0xffffffff);
-        PM3_SLOW_WRITE_REG(PM3Aperture0, 0x00000000);
-        PM3_SLOW_WRITE_REG(PM3Aperture1, 0x00000000);
-        PM3_SLOW_WRITE_REG(PM3FIFODis, 0x00000007);
-
-        PM3_SLOW_WRITE_REG(PM3HTotal,
-                           pm3fb_Shiftbpp(l_fb_info,
-                                          l_fb_info->current_par->depth,
-                                          l_fb_info->current_par->htotal -
-                                          1));
-        PM3_SLOW_WRITE_REG(PM3HsEnd,
-                           pm3fb_Shiftbpp(l_fb_info,
-                                          l_fb_info->current_par->depth,
-                                          l_fb_info->current_par->hsend));
-        PM3_SLOW_WRITE_REG(PM3HsStart,
-                           pm3fb_Shiftbpp(l_fb_info,
-                                          l_fb_info->current_par->depth,
-                                          l_fb_info->current_par->
+        const u32 hsstart = info->var.right_margin;
+        const u32 hsend = hsstart + info->var.hsync_len;
+        const u32 hbend = hsend + info->var.left_margin;
+        const u32 xres = (info->var.xres + 31) & ~31;
+        const u32 htotal = xres + hbend;
+        const u32 vsstart = info->var.lower_margin;
+        const u32 vsend = vsstart + info->var.vsync_len;
+        const u32 vbend = vsend + info->var.upper_margin;
+        const u32 vtotal = info->var.yres + vbend;
+        const u32 width = (info->var.xres_virtual + 7) & ~7;
+
+        PM3_SLOW_WRITE_REG(par, PM3MemBypassWriteMask, 0xffffffff);
+        PM3_SLOW_WRITE_REG(par, PM3Aperture0, 0x00000000);
+        PM3_SLOW_WRITE_REG(par, PM3Aperture1, 0x00000000);
+        PM3_SLOW_WRITE_REG(par, PM3FIFODis, 0x00000007);
+
+        PM3_SLOW_WRITE_REG(par, PM3HTotal,
+                           pm3fb_shift_bpp(info->var.bits_per_pixel,
+                                          htotal - 1));
+        PM3_SLOW_WRITE_REG(par, PM3HsEnd,
+                           pm3fb_shift_bpp(info->var.bits_per_pixel,
+                                          hsend));
+        PM3_SLOW_WRITE_REG(par, PM3HsStart,
+                           pm3fb_shift_bpp(info->var.bits_per_pixel,
                                           hsstart));
-        PM3_SLOW_WRITE_REG(PM3HbEnd,
-                           pm3fb_Shiftbpp(l_fb_info,
-                                          l_fb_info->current_par->depth,
-                                          l_fb_info->current_par->hbend));
-        PM3_SLOW_WRITE_REG(PM3HgEnd,
-                           pm3fb_Shiftbpp(l_fb_info,
-                                          l_fb_info->current_par->depth,
-                                          l_fb_info->current_par->hbend));
-        PM3_SLOW_WRITE_REG(PM3ScreenStride,
-                           pm3fb_Shiftbpp(l_fb_info,
-                                          l_fb_info->current_par->depth,
-                                          l_fb_info->current_par->stride));
-        PM3_SLOW_WRITE_REG(PM3VTotal, l_fb_info->current_par->vtotal - 1);
-        PM3_SLOW_WRITE_REG(PM3VsEnd, l_fb_info->current_par->vsend - 1);
-        PM3_SLOW_WRITE_REG(PM3VsStart,
-                           l_fb_info->current_par->vsstart - 1);
-        PM3_SLOW_WRITE_REG(PM3VbEnd, l_fb_info->current_par->vbend);
-
-        switch (l_fb_info->current_par->depth) {
+        PM3_SLOW_WRITE_REG(par, PM3HbEnd,
+                           pm3fb_shift_bpp(info->var.bits_per_pixel,
+                                          hbend));
+        PM3_SLOW_WRITE_REG(par, PM3HgEnd,
+                           pm3fb_shift_bpp(info->var.bits_per_pixel,
+                                          hbend));
+        PM3_SLOW_WRITE_REG(par, PM3ScreenStride,
+                           pm3fb_shift_bpp(info->var.bits_per_pixel,
+                                          width));
+        PM3_SLOW_WRITE_REG(par, PM3VTotal, vtotal - 1);
+        PM3_SLOW_WRITE_REG(par, PM3VsEnd, vsend - 1);
+        PM3_SLOW_WRITE_REG(par, PM3VsStart, vsstart - 1);
+        PM3_SLOW_WRITE_REG(par, PM3VbEnd, vbend);
+
+        switch (info->var.bits_per_pixel) {
         case 8:
-                PM3_SLOW_WRITE_REG(PM3ByAperture1Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture1Mode,
                                    PM3ByApertureMode_PIXELSIZE_8BIT);
-                PM3_SLOW_WRITE_REG(PM3ByAperture2Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture2Mode,
                                    PM3ByApertureMode_PIXELSIZE_8BIT);
                 break;
 
@@ -1100,15 +247,15 @@ static void pm3fb_write_mode(struct pm3fb_info *l_fb_info)
         case 15:
         case 16:
 #ifndef __BIG_ENDIAN
-                PM3_SLOW_WRITE_REG(PM3ByAperture1Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture1Mode,
                                    PM3ByApertureMode_PIXELSIZE_16BIT);
-                PM3_SLOW_WRITE_REG(PM3ByAperture2Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture2Mode,
                                    PM3ByApertureMode_PIXELSIZE_16BIT);
 #else
-                PM3_SLOW_WRITE_REG(PM3ByAperture1Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture1Mode,
                                    PM3ByApertureMode_PIXELSIZE_16BIT |
                                    PM3ByApertureMode_BYTESWAP_BADC);
-                PM3_SLOW_WRITE_REG(PM3ByAperture2Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture2Mode,
                                    PM3ByApertureMode_PIXELSIZE_16BIT |
                                    PM3ByApertureMode_BYTESWAP_BADC);
 #endif /* ! __BIG_ENDIAN */
@@ -1116,23 +263,23 @@ static void pm3fb_write_mode(struct pm3fb_info *l_fb_info)
 
         case 32:
 #ifndef __BIG_ENDIAN
-                PM3_SLOW_WRITE_REG(PM3ByAperture1Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture1Mode,
                                    PM3ByApertureMode_PIXELSIZE_32BIT);
-                PM3_SLOW_WRITE_REG(PM3ByAperture2Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture2Mode,
                                    PM3ByApertureMode_PIXELSIZE_32BIT);
 #else
-                PM3_SLOW_WRITE_REG(PM3ByAperture1Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture1Mode,
                                    PM3ByApertureMode_PIXELSIZE_32BIT |
                                    PM3ByApertureMode_BYTESWAP_DCBA);
-                PM3_SLOW_WRITE_REG(PM3ByAperture2Mode,
+                PM3_SLOW_WRITE_REG(par, PM3ByAperture2Mode,
                                    PM3ByApertureMode_PIXELSIZE_32BIT |
                                    PM3ByApertureMode_BYTESWAP_DCBA);
 #endif /* ! __BIG_ENDIAN */
                 break;
 
         default:
-                DPRINTK(1, "Unsupported depth %d\n",
-                        l_fb_info->current_par->depth);
+                DPRINTK("Unsupported depth %d\n",
+                        info->var.bits_per_pixel);
                 break;
         }
 
@@ -1143,95 +290,86 @@ static void pm3fb_write_mode(struct pm3fb_info *l_fb_info)
          * sync options in PM3RD_SyncControl.  --rmk
          */
         {
-                unsigned int video = l_fb_info->current_par->video;
+                unsigned int video = par->video;
 
                 video &= ~(PM3VideoControl_HSYNC_MASK |
                            PM3VideoControl_VSYNC_MASK);
                 video |= PM3VideoControl_HSYNC_ACTIVE_HIGH |
                          PM3VideoControl_VSYNC_ACTIVE_HIGH;
-                PM3_SLOW_WRITE_REG(PM3VideoControl, video);
+                PM3_SLOW_WRITE_REG(par, PM3VideoControl, video);
         }
-        PM3_SLOW_WRITE_REG(PM3VClkCtl,
-                           (PM3_READ_REG(PM3VClkCtl) & 0xFFFFFFFC));
-        PM3_SLOW_WRITE_REG(PM3ScreenBase, l_fb_info->current_par->base);
-        PM3_SLOW_WRITE_REG(PM3ChipConfig,
-                           (PM3_READ_REG(PM3ChipConfig) & 0xFFFFFFFD));
+        PM3_SLOW_WRITE_REG(par, PM3VClkCtl,
+                           (PM3_READ_REG(par, PM3VClkCtl) & 0xFFFFFFFC));
+        PM3_SLOW_WRITE_REG(par, PM3ScreenBase, par->base);
+        PM3_SLOW_WRITE_REG(par, PM3ChipConfig,
+                           (PM3_READ_REG(par, PM3ChipConfig) & 0xFFFFFFFD));
 
         {
-                unsigned char m;        /* ClkPreScale */
-                unsigned char n;        /* ClkFeedBackScale */
-                unsigned char p;        /* ClkPostScale */
-                (void)pm3fb_CalculateClock(l_fb_info, l_fb_info->current_par->pixclock, PM3_REF_CLOCK, &m, &n, &p);
-
-                DPRINTK(2,
-                        "Pixclock: %d, Pre: %d, Feedback: %d, Post: %d\n",
-                        l_fb_info->current_par->pixclock, (int) m, (int) n,
-                        (int) p);
-
-                PM3_WRITE_DAC_REG(PM3RD_DClk0PreScale, m);
-                PM3_WRITE_DAC_REG(PM3RD_DClk0FeedbackScale, n);
-                PM3_WRITE_DAC_REG(PM3RD_DClk0PostScale, p);
+                unsigned char uninitialized_var(m);     /* ClkPreScale */
+                unsigned char uninitialized_var(n);     /* ClkFeedBackScale */
+                unsigned char uninitialized_var(p);     /* ClkPostScale */
+                unsigned long pixclock = PICOS2KHZ(info->var.pixclock);
+
+                (void)pm3fb_calculate_clock(pixclock, &m, &n, &p);
+
+                DPRINTK("Pixclock: %ld, Pre: %d, Feedback: %d, Post: %d\n",
+                        pixclock, (int) m, (int) n, (int) p);
+
+                PM3_WRITE_DAC_REG(par, PM3RD_DClk0PreScale, m);
+                PM3_WRITE_DAC_REG(par, PM3RD_DClk0FeedbackScale, n);
+                PM3_WRITE_DAC_REG(par, PM3RD_DClk0PostScale, p);
         }
         /*
-           PM3_WRITE_DAC_REG(PM3RD_IndexControl, 0x00);
+           PM3_WRITE_DAC_REG(par, PM3RD_IndexControl, 0x00);
          */
         /*
-           PM3_SLOW_WRITE_REG(PM3RD_IndexControl, 0x00);
+           PM3_SLOW_WRITE_REG(par, PM3RD_IndexControl, 0x00);
          */
-        if ((l_fb_info->current_par->video & PM3VideoControl_HSYNC_MASK) ==
+        if ((par->video & PM3VideoControl_HSYNC_MASK) ==
             PM3VideoControl_HSYNC_ACTIVE_HIGH)
                 tempsync |= PM3RD_SyncControl_HSYNC_ACTIVE_HIGH;
-        if ((l_fb_info->current_par->video & PM3VideoControl_VSYNC_MASK) ==
+        if ((par->video & PM3VideoControl_VSYNC_MASK) ==
             PM3VideoControl_VSYNC_ACTIVE_HIGH)
                 tempsync |= PM3RD_SyncControl_VSYNC_ACTIVE_HIGH;
-        
-        PM3_WRITE_DAC_REG(PM3RD_SyncControl, tempsync);
-        DPRINTK(2, "PM3RD_SyncControl: %d\n", tempsync);
-        
-        if (flatpanel[l_fb_info->board_num])
-        {
-                PM3_WRITE_DAC_REG(PM3RD_DACControl, PM3RD_DACControl_BLANK_PEDESTAL_ENABLE);
-                PM3_WAIT(2);
-                PM3_WRITE_REG(PM3VSConfiguration, 0x06);
-                PM3_WRITE_REG(0x5a00, 1 << 14); /* black magic... */
-                tempmisc = PM3RD_MiscControl_VSB_OUTPUT_ENABLE;
-        }
-        else
-                PM3_WRITE_DAC_REG(PM3RD_DACControl, 0x00);
 
-        switch (l_fb_info->current_par->depth) {
+        PM3_WRITE_DAC_REG(par, PM3RD_SyncControl, tempsync);
+        DPRINTK("PM3RD_SyncControl: %d\n", tempsync);
+
+        PM3_WRITE_DAC_REG(par, PM3RD_DACControl, 0x00);
+
+        switch (info->var.bits_per_pixel) {
         case 8:
-                PM3_WRITE_DAC_REG(PM3RD_PixelSize,
+                PM3_WRITE_DAC_REG(par, PM3RD_PixelSize,
                                   PM3RD_PixelSize_8_BIT_PIXELS);
-                PM3_WRITE_DAC_REG(PM3RD_ColorFormat,
+                PM3_WRITE_DAC_REG(par, PM3RD_ColorFormat,
                                   PM3RD_ColorFormat_CI8_COLOR |
                                   PM3RD_ColorFormat_COLOR_ORDER_BLUE_LOW);
                 tempmisc |= PM3RD_MiscControl_HIGHCOLOR_RES_ENABLE;
                 break;
         case 12:
-                PM3_WRITE_DAC_REG(PM3RD_PixelSize,
+                PM3_WRITE_DAC_REG(par, PM3RD_PixelSize,
                                   PM3RD_PixelSize_16_BIT_PIXELS);
-                PM3_WRITE_DAC_REG(PM3RD_ColorFormat,
+                PM3_WRITE_DAC_REG(par, PM3RD_ColorFormat,
                                   PM3RD_ColorFormat_4444_COLOR |
                                   PM3RD_ColorFormat_COLOR_ORDER_BLUE_LOW |
                                   PM3RD_ColorFormat_LINEAR_COLOR_EXT_ENABLE);
                 tempmisc |= PM3RD_MiscControl_DIRECTCOLOR_ENABLE |
                         PM3RD_MiscControl_HIGHCOLOR_RES_ENABLE;
-                break;          
+                break;
         case 15:
-                PM3_WRITE_DAC_REG(PM3RD_PixelSize,
+                PM3_WRITE_DAC_REG(par, PM3RD_PixelSize,
                                   PM3RD_PixelSize_16_BIT_PIXELS);
-                PM3_WRITE_DAC_REG(PM3RD_ColorFormat,
+                PM3_WRITE_DAC_REG(par, PM3RD_ColorFormat,
                                   PM3RD_ColorFormat_5551_FRONT_COLOR |
                                   PM3RD_ColorFormat_COLOR_ORDER_BLUE_LOW |
                                   PM3RD_ColorFormat_LINEAR_COLOR_EXT_ENABLE);
                 tempmisc |= PM3RD_MiscControl_DIRECTCOLOR_ENABLE |
                         PM3RD_MiscControl_HIGHCOLOR_RES_ENABLE;
-                break;          
+                break;
         case 16:
-                PM3_WRITE_DAC_REG(PM3RD_PixelSize,
+                PM3_WRITE_DAC_REG(par, PM3RD_PixelSize,
                                   PM3RD_PixelSize_16_BIT_PIXELS);
-                PM3_WRITE_DAC_REG(PM3RD_ColorFormat,
+                PM3_WRITE_DAC_REG(par, PM3RD_ColorFormat,
                                   PM3RD_ColorFormat_565_FRONT_COLOR |
                                   PM3RD_ColorFormat_COLOR_ORDER_BLUE_LOW |
                                   PM3RD_ColorFormat_LINEAR_COLOR_EXT_ENABLE);
@@ -1239,1936 +377,280 @@ static void pm3fb_write_mode(struct pm3fb_info *l_fb_info)
                         PM3RD_MiscControl_HIGHCOLOR_RES_ENABLE;
                 break;
         case 32:
-                PM3_WRITE_DAC_REG(PM3RD_PixelSize,
+                PM3_WRITE_DAC_REG(par, PM3RD_PixelSize,
                                   PM3RD_PixelSize_32_BIT_PIXELS);
-                PM3_WRITE_DAC_REG(PM3RD_ColorFormat,
+                PM3_WRITE_DAC_REG(par, PM3RD_ColorFormat,
                                   PM3RD_ColorFormat_8888_COLOR |
                                   PM3RD_ColorFormat_COLOR_ORDER_BLUE_LOW);
                 tempmisc |= PM3RD_MiscControl_DIRECTCOLOR_ENABLE |
                         PM3RD_MiscControl_HIGHCOLOR_RES_ENABLE;
                 break;
         }
-        PM3_WRITE_DAC_REG(PM3RD_MiscControl, tempmisc);
-        
-        PM3_SHOW_CUR_MODE;
+        PM3_WRITE_DAC_REG(par, PM3RD_MiscControl, tempmisc);
 }
 
-static void pm3fb_read_mode(struct pm3fb_info *l_fb_info,
-                            struct pm3fb_par *curpar)
-{
-        unsigned long pixsize1, pixsize2, clockused;
-        unsigned long pre, feedback, post;
-
-        DTRACE;
-
-        clockused = PM3_READ_REG(PM3VClkCtl);
+/*
+ * hardware independent functions
+ */
+int pm3fb_init(void);
+int pm3fb_setup(char*);
 
-        switch (clockused) {
-        case 3:
-                pre = PM3_READ_DAC_REG(PM3RD_DClk3PreScale);
-                feedback = PM3_READ_DAC_REG(PM3RD_DClk3FeedbackScale);
-                post = PM3_READ_DAC_REG(PM3RD_DClk3PostScale);
+static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        u32 lpitch;
 
-                DPRINTK(2,
-                        "DClk3 parameter: Pre: %ld, Feedback: %ld, Post: %ld ; giving pixclock: %ld\n",
-                        pre, feedback, post, PM3_SCALE_TO_CLOCK(pre,
-                                                                feedback,
-                                                                post));
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        switch(var->bits_per_pixel) {
+        case 8:
+                var->red.length = var->green.length = var->blue.length = 8;
+                var->red.offset = var->green.offset = var->blue.offset = 0;
                 break;
-        case 2:
-                pre = PM3_READ_DAC_REG(PM3RD_DClk2PreScale);
-                feedback = PM3_READ_DAC_REG(PM3RD_DClk2FeedbackScale);
-                post = PM3_READ_DAC_REG(PM3RD_DClk2PostScale);
-
-                DPRINTK(2,
-                        "DClk2 parameter: Pre: %ld, Feedback: %ld, Post: %ld ; giving pixclock: %ld\n",
-                        pre, feedback, post, PM3_SCALE_TO_CLOCK(pre,
-                                                                feedback,
-                                                                post));
+        case 12:
+                var->red.offset   = 8;
+                var->red.length   = 4;
+                var->green.offset = 4;
+                var->green.length = 4;
+                var->blue.offset  = 0;
+                var->blue.length  = 4;
+                var->transp.offset = 12;
+                var->transp.length = 4;
+        case 15:
+                var->red.offset   = 10;
+                var->red.length   = 5;
+                var->green.offset = 5;
+                var->green.length = 5;
+                var->blue.offset  = 0;
+                var->blue.length  = 5;
+                var->transp.offset = 15;
+                var->transp.length = 1;
                 break;
-        case 1:
-                pre = PM3_READ_DAC_REG(PM3RD_DClk1PreScale);
-                feedback = PM3_READ_DAC_REG(PM3RD_DClk1FeedbackScale);
-                post = PM3_READ_DAC_REG(PM3RD_DClk1PostScale);
-
-                DPRINTK(2,
-                        "DClk1 parameter: Pre: %ld, Feedback: %ld, Post: %ld ; giving pixclock: %ld\n",
-                        pre, feedback, post, PM3_SCALE_TO_CLOCK(pre,
-                                                                feedback,
-                                                                post));
+        case 16:
+                var->red.offset   = 11;
+                var->red.length   = 5;
+                var->green.offset = 5;
+                var->green.length = 6;
+                var->blue.offset  = 0;
+                var->blue.length  = 5;
                 break;
-        case 0:
-                pre = PM3_READ_DAC_REG(PM3RD_DClk0PreScale);
-                feedback = PM3_READ_DAC_REG(PM3RD_DClk0FeedbackScale);
-                post = PM3_READ_DAC_REG(PM3RD_DClk0PostScale);
-
-                DPRINTK(2,
-                        "DClk0 parameter: Pre: %ld, Feedback: %ld, Post: %ld ; giving pixclock: %ld\n",
-                        pre, feedback, post, PM3_SCALE_TO_CLOCK(pre,
-                                                                feedback,
-                                                                post));
+        case 32:
+                var->transp.offset = 24;
+                var->transp.length = 8;
+                var->red.offset   = 16;
+                var->green.offset = 8;
+                var->blue.offset  = 0;
+                var->red.length = var->green.length = var->blue.length = 8;
                 break;
         default:
-                pre = feedback = post = 0;
-                DPRINTK(1, "Unknowk D clock used : %ld\n", clockused);
-                break;
-        }
-
-        curpar->pixclock = PM3_SCALE_TO_CLOCK(pre, feedback, post);
-
-        pixsize1 =
-            PM3ByApertureMode_PIXELSIZE_MASK &
-            (PM3_READ_REG(PM3ByAperture1Mode));
-        pixsize2 =
-            PM3ByApertureMode_PIXELSIZE_MASK &
-            (PM3_READ_REG(PM3ByAperture2Mode));
-
-        DASSERT((pixsize1 == pixsize2),
-                "pixsize the same in both aperture\n");
-
-        if (pixsize1 & PM3ByApertureMode_PIXELSIZE_32BIT)
-                curpar->depth = 32;
-        else if (pixsize1 & PM3ByApertureMode_PIXELSIZE_16BIT)
-        {
-                curpar->depth = 16;
-        }
-        else
-                curpar->depth = 8;
-
-        /* not sure if I need to add one on the next ; it give better result with */
-        curpar->htotal =
-            pm3fb_Unshiftbpp(l_fb_info, curpar->depth,
-                             1 + PM3_READ_REG(PM3HTotal));
-        curpar->hsend =
-            pm3fb_Unshiftbpp(l_fb_info, curpar->depth,
-                             PM3_READ_REG(PM3HsEnd));
-        curpar->hsstart =
-            pm3fb_Unshiftbpp(l_fb_info, curpar->depth,
-                             PM3_READ_REG(PM3HsStart));
-        curpar->hbend =
-            pm3fb_Unshiftbpp(l_fb_info, curpar->depth,
-                             PM3_READ_REG(PM3HbEnd));
-
-        curpar->stride =
-            pm3fb_Unshiftbpp(l_fb_info, curpar->depth,
-                             PM3_READ_REG(PM3ScreenStride));
-
-        curpar->vtotal = 1 + PM3_READ_REG(PM3VTotal);
-        curpar->vsend = 1 + PM3_READ_REG(PM3VsEnd);
-        curpar->vsstart = 1 + PM3_READ_REG(PM3VsStart);
-        curpar->vbend = PM3_READ_REG(PM3VbEnd);
-
-        curpar->video = PM3_READ_REG(PM3VideoControl);
-
-        curpar->base = PM3_READ_REG(PM3ScreenBase);
-        curpar->width = curpar->htotal - curpar->hbend; /* make virtual == displayed resolution */
-        curpar->height = curpar->vtotal - curpar->vbend;
-
-        DPRINTK(2, "Found : %d * %d, %d Khz, stride is %08x\n",
-                curpar->width, curpar->height, curpar->pixclock,
-                curpar->stride);
-}
-
-static unsigned long pm3fb_size_memory(struct pm3fb_info *l_fb_info)
-{
-        unsigned long memsize = 0, tempBypass, i, temp1, temp2;
-        u16 subvendor, subdevice;
-        pm3fb_timing_result ptr;
-
-        DTRACE;
-
-        l_fb_info->fb_size = 64 * 1024 * 1024;  /* pm3 aperture always 64 MB */
-        pm3fb_mapIO(l_fb_info); /* temporary map IO */
-
-        DASSERT((l_fb_info->vIOBase != NULL),
-                "IO successfully mapped before mem detect\n");
-        DASSERT((l_fb_info->v_fb != NULL),
-                "FB successfully mapped before mem detect\n");
-
-        /* card-specific stuff, *before* accessing *any* FB memory */
-        if ((!pci_read_config_word
-             (l_fb_info->dev, PCI_SUBSYSTEM_VENDOR_ID, &subvendor))
-            &&
-            (!pci_read_config_word
-             (l_fb_info->dev, PCI_SUBSYSTEM_ID, &subdevice))) {
-                i = 0; l_fb_info->board_type = 0;
-                while ((cardbase[i].cardname[0]) && !(l_fb_info->board_type)) {
-                        if ((cardbase[i].subvendor == subvendor) &&
-                            (cardbase[i].subdevice == subdevice) &&
-                            (cardbase[i].func == PCI_FUNC(l_fb_info->dev->devfn))) {
-                                DPRINTK(2, "Card #%ld is an %s\n",
-                                        l_fb_info->board_num,
-                                        cardbase[i].cardname);
-                                if (cardbase[i].specific_setup)
-                                        cardbase[i].specific_setup(l_fb_info);
-                                l_fb_info->board_type = i;
-                        }
-                        i++;
-                }
-                if (!l_fb_info->board_type) {
-                        DPRINTK(1, "Card #%ld is an unknown 0x%04x / 0x%04x\n",
-                                l_fb_info->board_num, subvendor, subdevice);
-                }
-        } else {
-                printk(KERN_ERR "pm3fb: Error: pci_read_config_word failed, board #%ld\n",
-                       l_fb_info->board_num);
-        }
-
-        if (printtimings)
-                pm3fb_show_cur_timing(l_fb_info);
-        
-        /* card-specific setup is done, we preserve the final
-           memory timing for future reference */
-        if ((ptr = pm3fb_preserve_memory_timings(l_fb_info)) == pm3fb_timing_problem) { /* memory timings were wrong ! oops.... */
-                return(0);
-        }
-        
-        tempBypass = PM3_READ_REG(PM3MemBypassWriteMask);
-
-        DPRINTK(2, "PM3MemBypassWriteMask was: 0x%08lx\n", tempBypass);
-
-        PM3_SLOW_WRITE_REG(PM3MemBypassWriteMask, 0xFFFFFFFF);
-
-        /* pm3 split up memory, replicates, and do a lot of nasty stuff IMHO ;-) */
-        for (i = 0; i < 32; i++) {
-                fb_writel(i * 0x00345678,
-                          (l_fb_info->v_fb + (i * 1048576)));
-                mb();
-                temp1 = fb_readl((l_fb_info->v_fb + (i * 1048576)));
-
-                /* Let's check for wrapover, write will fail at 16MB boundary */
-                if (temp1 == (i * 0x00345678))
-                        memsize = i;
-                else
-                        break;
-        }
-
-        DPRINTK(2, "First detect pass already got %ld MB\n", memsize + 1);
-
-        if (memsize == i) {
-                for (i = 0; i < 32; i++) {
-                        /* Clear first 32MB ; 0 is 0, no need to byteswap */
-                        writel(0x0000000,
-                               (l_fb_info->v_fb + (i * 1048576)));
-                        mb();
-                }
-
-                for (i = 32; i < 64; i++) {
-                        fb_writel(i * 0x00345678,
-                                  (l_fb_info->v_fb + (i * 1048576)));
-                        mb();
-                        temp1 =
-                            fb_readl((l_fb_info->v_fb + (i * 1048576)));
-                        temp2 =
-                            fb_readl((l_fb_info->v_fb +
-                                      ((i - 32) * 1048576)));
-                        if ((temp1 == (i * 0x00345678)) && (temp2 == 0))        /* different value, different RAM... */
-                                memsize = i;
-                        else
-                                break;
-                }
-        }
-
-        DPRINTK(2, "Second detect pass got %ld MB\n", memsize + 1);
-
-        PM3_SLOW_WRITE_REG(PM3MemBypassWriteMask, tempBypass);
-
-        pm3fb_unmapIO(l_fb_info);
-        memsize = 1048576 * (memsize + 1);
-
-        DPRINTK(2, "Returning 0x%08lx bytes\n", memsize);
-
-        if (forcesize[l_fb_info->board_num] && ((forcesize[l_fb_info->board_num] * 1048576) != memsize))
-        {
-                printk(KERN_WARNING "pm3fb: mismatch between probed (%ld MB) and specified (%hd MB) memory size, using SPECIFIED !\n", memsize, forcesize[l_fb_info->board_num]);
-                memsize = 1048576 * forcesize[l_fb_info->board_num];
-        }
-        
-        l_fb_info->fb_size = memsize;
-        
-        if (ptr == pm3fb_timing_retry)
-        {
-                printk(KERN_WARNING "pm3fb: retrying memory timings check");
-                if (pm3fb_try_memory_timings(l_fb_info) == pm3fb_timing_problem)
-                        return(0);
-        }
-        
-        return (memsize);
-}
-
-static void pm3fb_clear_memory(struct pm3fb_info *l_fb_info, u32 cc)
-{
-        int i;
-
-        DTRACE;
-
-        for (i = 0; i < (l_fb_info->fb_size / sizeof(u32)) ; i++) /* clear entire FB memory to black */
-        {
-                fb_writel(cc, (l_fb_info->v_fb + (i * sizeof(u32))));
+                DPRINTK("depth not supported: %u\n", var->bits_per_pixel);
+                return -EINVAL;
         }
-}
-
-static void pm3fb_clear_colormap(struct pm3fb_info *l_fb_info, unsigned char r, unsigned char g, unsigned char b)
-{
-        int i;
-
-        DTRACE;
-
-        for (i = 0; i < 256 ; i++) /* fill color map with white */
-                pm3fb_set_color(l_fb_info, i, r, g, b);
-
-}
-
-/* common initialisation */
-static void pm3fb_common_init(struct pm3fb_info *l_fb_info)
-{
-        DTRACE;
-
-        DPRINTK(2, "Initializing board #%ld @ %lx\n", l_fb_info->board_num,
-                (unsigned long) l_fb_info);
-
-        strcpy(l_fb_info->gen.info.modename, permedia3_name);
-        disp[l_fb_info->board_num].scrollmode = 0;      /* SCROLL_YNOMOVE; *//* 0 means "let fbcon choose" */
-        l_fb_info->gen.parsize = sizeof(struct pm3fb_par);
-        l_fb_info->gen.info.changevar = NULL;
-        l_fb_info->gen.info.fbops = &pm3fb_ops;
-        l_fb_info->gen.info.disp = &(disp[l_fb_info->board_num]);
-        if (fontn[l_fb_info->board_num][0])
-                strcpy(l_fb_info->gen.info.fontname,
-                       fontn[l_fb_info->board_num]);
-        l_fb_info->gen.info.switch_con = &fbgen_switch;
-        l_fb_info->gen.info.updatevar = &fbgen_update_var;      /* */
-        l_fb_info->gen.info.flags = FBINFO_FLAG_DEFAULT;
-
-        pm3fb_mapIO(l_fb_info);
-
-        pm3fb_clear_memory(l_fb_info, 0);
-        pm3fb_clear_colormap(l_fb_info, 0, 0, 0);
-
-        (void) fbgen_get_var(&(disp[l_fb_info->board_num]).var, -1,
-                             &l_fb_info->gen.info);
+        var->height = var->width = -1;
 
-        if (depth[l_fb_info->board_num]) /* override mode-defined depth */
-        {
-                pm3fb_encode_depth(&(disp[l_fb_info->board_num]).var, depth[l_fb_info->board_num]);
-                (disp[l_fb_info->board_num]).var.bits_per_pixel = depth2bpp(depth[l_fb_info->board_num]);
+        if (var->xres != var->xres_virtual) {
+                DPRINTK("virtual x resolution != physical x resolution not supported\n");
+                return -EINVAL;
         }
 
-        (void) fbgen_do_set_var(&(disp[l_fb_info->board_num]).var, 1,
-                                &l_fb_info->gen);
-
-        fbgen_set_disp(-1, &l_fb_info->gen);
-
-        do_install_cmap(0, &l_fb_info->gen.info);
-
-        if (register_framebuffer(&l_fb_info->gen.info) < 0) {
-                DPRINTK(1, "Couldn't register framebuffer\n");
-                return;
+        if (var->yres > var->yres_virtual) {
+                DPRINTK("virtual y resolution < physical y resolution not possible\n");
+                return -EINVAL;
         }
 
-        PM3_WRITE_DAC_REG(PM3RD_CursorMode,
-                          PM3RD_CursorMode_CURSOR_DISABLE);
-        
-        PM3_SHOW_CUR_MODE;
-        
-        pm3fb_write_mode(l_fb_info);
-        
-        printk("fb%d: %s, using %uK of video memory (%s)\n",
-               l_fb_info->gen.info.node,
-               permedia3_name, (u32) (l_fb_info->fb_size >> 10),
-               cardbase[l_fb_info->board_type].cardname);
-}
-
-/* **************************************************** */
-/* ***** accelerated permedia3-specific functions ***** */
-/* **************************************************** */
-#ifdef PM3FB_USE_ACCEL
-static void pm3fb_wait_pm3(struct pm3fb_info *l_fb_info)
-{
-        DTRACE;
-
-        PM3_SLOW_WRITE_REG(PM3FilterMode, PM3FilterModeSync);
-        PM3_SLOW_WRITE_REG(PM3Sync, 0);
-        mb();
-        do {
-                while ((PM3_READ_REG(PM3OutFIFOWords)) == 0);
-                rmb();
-        } while ((PM3_READ_REG(PM3OutputFifo)) != PM3Sync_Tag);
-}
-
-static void pm3fb_init_engine(struct pm3fb_info *l_fb_info)
-{
-        PM3_SLOW_WRITE_REG(PM3FilterMode, PM3FilterModeSync);
-        PM3_SLOW_WRITE_REG(PM3StatisticMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3DeltaMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3RasterizerMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3ScissorMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3LineStippleMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3AreaStippleMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3GIDMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3DepthMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3StencilMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3StencilData, 0x0);
-        PM3_SLOW_WRITE_REG(PM3ColorDDAMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureCoordMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureIndexMode0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureIndexMode1, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureReadMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3LUTMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureFilterMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureCompositeMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureApplicationMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureCompositeColorMode1, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureCompositeAlphaMode1, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureCompositeColorMode0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3TextureCompositeAlphaMode0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FogMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3ChromaTestMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3AlphaTestMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3AntialiasMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3YUVMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3AlphaBlendColorMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3AlphaBlendAlphaMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3DitherMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3LogicalOpMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3RouterMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3Window, 0x0);
-
-        PM3_SLOW_WRITE_REG(PM3Config2D, 0x0);
-
-        PM3_SLOW_WRITE_REG(PM3SpanColorMask, 0xffffffff);
-
-        PM3_SLOW_WRITE_REG(PM3XBias, 0x0);
-        PM3_SLOW_WRITE_REG(PM3YBias, 0x0);
-        PM3_SLOW_WRITE_REG(PM3DeltaControl, 0x0);
-
-        PM3_SLOW_WRITE_REG(PM3BitMaskPattern, 0xffffffff);
-
-        PM3_SLOW_WRITE_REG(PM3FBDestReadEnables,
-                           PM3FBDestReadEnables_E(0xff) |
-                           PM3FBDestReadEnables_R(0xff) |
-                           PM3FBDestReadEnables_ReferenceAlpha(0xff));
-        PM3_SLOW_WRITE_REG(PM3FBDestReadBufferAddr0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FBDestReadBufferOffset0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FBDestReadBufferWidth0,
-                           PM3FBDestReadBufferWidth_Width(l_fb_info->
-                                                          current_par->
-                                                          width));
-
-        PM3_SLOW_WRITE_REG(PM3FBDestReadMode,
-                           PM3FBDestReadMode_ReadEnable |
-                           PM3FBDestReadMode_Enable0);
-        PM3_SLOW_WRITE_REG(PM3FBSourceReadBufferAddr, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FBSourceReadBufferOffset, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FBSourceReadBufferWidth,
-                           PM3FBSourceReadBufferWidth_Width(l_fb_info->
-                                                            current_par->
-                                                            width));
-        PM3_SLOW_WRITE_REG(PM3FBSourceReadMode,
-                           PM3FBSourceReadMode_Blocking |
-                           PM3FBSourceReadMode_ReadEnable);
-
-        {
-                unsigned long rm = 1;
-                switch (l_fb_info->current_par->depth) {
-                case 8:
-                        PM3_SLOW_WRITE_REG(PM3PixelSize,
-                                           PM3PixelSize_GLOBAL_8BIT);
-                        break;
-                case 12:
-                case 15:
-                case 16:
-                        PM3_SLOW_WRITE_REG(PM3PixelSize,
-                                           PM3PixelSize_GLOBAL_16BIT);
-                        break;
-                case 32:
-                        PM3_SLOW_WRITE_REG(PM3PixelSize,
-                                           PM3PixelSize_GLOBAL_32BIT);
-                        break;
-                default:
-                        DPRINTK(1, "Unsupported depth %d\n",
-                                l_fb_info->current_par->depth);
-                        break;
-                }
-                PM3_SLOW_WRITE_REG(PM3RasterizerMode, rm);
+        if (var->xoffset) {
+                DPRINTK("xoffset not supported\n");
+                return -EINVAL;
         }
 
-        PM3_SLOW_WRITE_REG(PM3FBSoftwareWriteMask, 0xffffffff);
-        PM3_SLOW_WRITE_REG(PM3FBHardwareWriteMask, 0xffffffff);
-        PM3_SLOW_WRITE_REG(PM3FBWriteMode,
-                           PM3FBWriteMode_WriteEnable |
-                           PM3FBWriteMode_OpaqueSpan |
-                           PM3FBWriteMode_Enable0);
-        PM3_SLOW_WRITE_REG(PM3FBWriteBufferAddr0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FBWriteBufferOffset0, 0x0);
-        PM3_SLOW_WRITE_REG(PM3FBWriteBufferWidth0,
-                           PM3FBWriteBufferWidth_Width(l_fb_info->
-                                                       current_par->
-                                                       width));
-
-        PM3_SLOW_WRITE_REG(PM3SizeOfFramebuffer, 0x0);
-        {
-                unsigned long sofb = (8UL * l_fb_info->fb_size) /
-                        ((depth2bpp(l_fb_info->current_par->depth))
-                         * l_fb_info->current_par->width);      /* size in lines of FB */
-                if (sofb > 4095)
-                        PM3_SLOW_WRITE_REG(PM3SizeOfFramebuffer, 4095);
-                else
-                        PM3_SLOW_WRITE_REG(PM3SizeOfFramebuffer, sofb);
-                
-                switch (l_fb_info->current_par->depth) {
-                case 8:
-                        PM3_SLOW_WRITE_REG(PM3DitherMode,
-                                           (1 << 10) | (2 << 3));
-                        break;
-                case 12:
-                case 15:
-                case 16:
-                        PM3_SLOW_WRITE_REG(PM3DitherMode,
-                                           (1 << 10) | (1 << 3));
-                        break;
-                case 32:
-                        PM3_SLOW_WRITE_REG(PM3DitherMode,
-                                           (1 << 10) | (0 << 3));
-                        break;
-                default:
-                        DPRINTK(1, "Unsupported depth %d\n",
-                                l_fb_info->current_par->depth);
-                        break;
-                }
+        if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+                DPRINTK("interlace not supported\n");
+                return -EINVAL;
         }
 
-        PM3_SLOW_WRITE_REG(PM3dXDom, 0x0);
-        PM3_SLOW_WRITE_REG(PM3dXSub, 0x0);
-        PM3_SLOW_WRITE_REG(PM3dY, (1 << 16));
-        PM3_SLOW_WRITE_REG(PM3StartXDom, 0x0);
-        PM3_SLOW_WRITE_REG(PM3StartXSub, 0x0);
-        PM3_SLOW_WRITE_REG(PM3StartY, 0x0);
-        PM3_SLOW_WRITE_REG(PM3Count, 0x0);
-        
-/* Disable LocalBuffer. better safe than sorry */
-        PM3_SLOW_WRITE_REG(PM3LBDestReadMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3LBDestReadEnables, 0x0);
-        PM3_SLOW_WRITE_REG(PM3LBSourceReadMode, 0x0);
-        PM3_SLOW_WRITE_REG(PM3LBWriteMode, 0x0);
-        
-        pm3fb_wait_pm3(l_fb_info);
-}
+        var->xres = (var->xres + 31) & ~31; /* could sometimes be 8 */
+        lpitch = var->xres * ((var->bits_per_pixel + 7)>>3);
 
-#ifdef FBCON_HAS_CFB32
-static void pm3fb_cfb32_clear(struct vc_data *conp,
-                              struct display *p,
-                              int sy, int sx, int height, int width)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        u32 c;
-
-        DTRACE;
-
-        sx = sx * fontwidth(p);
-        width = width * fontwidth(p);
-        sy = sy * fontheight(p);
-        height = height * fontheight(p);
-        c = ((u32 *) p->dispsw_data)[attr_bgcol_ec(p, conp)];
-
-        /* block fills in 32bpp are hard, but in low res (width <= 1600 :-)
-           we can use 16bpp operations, but not if NoWriteMask is on (SDRAM)  */
-        if ((l_fb_info->current_par->width > 1600) ||
-            (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)) {
-                PM3_WAIT(4);
-
-                PM3_WRITE_REG(PM3Config2D,
-                                          PM3Config2D_UseConstantSource |
-                                          PM3Config2D_ForegroundROPEnable |
-                                          (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                          PM3Config2D_FBWriteEnable);
-
-                PM3_WRITE_REG(PM3ForegroundColor, c);
-
-                PM3_WRITE_REG(PM3RectanglePosition,
-                              (PM3RectanglePosition_XOffset(sx)) |
-                              (PM3RectanglePosition_YOffset(sy)));
-
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              PM3Render2D_SpanOperation |
-                              (PM3Render2D_Width(width)) |
-                              (PM3Render2D_Height(height)));
-        } else {
-                PM3_WAIT(8);
-
-                PM3_WRITE_REG(PM3FBBlockColor, c);
-
-                PM3_WRITE_REG(PM3PixelSize, PM3PixelSize_GLOBAL_16BIT);
-
-                PM3_WRITE_REG(PM3FBWriteBufferWidth0,
-                              PM3FBWriteBufferWidth_Width(l_fb_info->
-                                                          current_par->
-                                                          width << 1));
-
-                PM3_WRITE_REG(PM3Config2D,
-                                          PM3Config2D_UseConstantSource |
-                                          PM3Config2D_ForegroundROPEnable |
-                                          (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                          PM3Config2D_FBWriteEnable);
-
-                PM3_WRITE_REG(PM3RectanglePosition,
-                              (PM3RectanglePosition_XOffset(sx << 1)) |
-                              (PM3RectanglePosition_YOffset(sy)));
-
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              (PM3Render2D_Width(width << 1)) |
-                              (PM3Render2D_Height(height)));
-
-                PM3_WRITE_REG(PM3FBWriteBufferWidth0,
-                              PM3FBWriteBufferWidth_Width(l_fb_info->
-                                                          current_par->
-                                                          width));
-
-                PM3_WRITE_REG(PM3PixelSize, PM3PixelSize_GLOBAL_32BIT);
+        if (var->xres < 200 || var->xres > 2048) {
+                DPRINTK("width not supported: %u\n", var->xres);
+                return -EINVAL;
         }
 
-        pm3fb_wait_pm3(l_fb_info);
-}
-
-static void pm3fb_cfb32_clear_margins(struct vc_data *conp,
-                                      struct display *p, int bottom_only)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        int sx, sy;
-        u32 c;
-
-        DTRACE;
-
-        sx = conp->vc_cols * fontwidth(p);      /* right margin */
-        sy = conp->vc_rows * fontheight(p);     /* bottom margin */
-        c = ((u32 *) p->dispsw_data)[attr_bgcol_ec(p, conp)];
-
-        if (!bottom_only) {     /* right margin top->bottom */
-                PM3_WAIT(4);
-
-                PM3_WRITE_REG(PM3Config2D,
-                                          PM3Config2D_UseConstantSource |
-                                          PM3Config2D_ForegroundROPEnable |
-                                          (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                          PM3Config2D_FBWriteEnable);
-
-                PM3_WRITE_REG(PM3ForegroundColor, c);
-
-                PM3_WRITE_REG(PM3RectanglePosition,
-                              (PM3RectanglePosition_XOffset
-                               (p->var.xoffset +
-                                sx)) | (PM3RectanglePosition_YOffset(p->
-                                                                     var.
-                                                                     yoffset)));
-
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              PM3Render2D_SpanOperation |
-                              (PM3Render2D_Width(p->var.xres - sx)) |
-                              (PM3Render2D_Height(p->var.yres)));
+        if (var->yres < 200 || var->yres > 4095) {
+                DPRINTK("height not supported: %u\n", var->yres);
+                return -EINVAL;
         }
 
-        /* bottom margin left -> right */
-        PM3_WAIT(4);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable);
-
-        PM3_WRITE_REG(PM3ForegroundColor, c);
-
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(p->var.xoffset)) |
-                      (PM3RectanglePosition_YOffset(p->var.yoffset + sy)));
-
-        PM3_WRITE_REG(PM3Render2D,
-                      PM3Render2D_XPositive |
-                      PM3Render2D_YPositive |
-                      PM3Render2D_Operation_Normal |
-                      PM3Render2D_SpanOperation |
-                      (PM3Render2D_Width(p->var.xres)) |
-                      (PM3Render2D_Height(p->var.yres - sy)));
-
-        pm3fb_wait_pm3(l_fb_info);
-}
-#endif /* FBCON_HAS_CFB32 */
-#ifdef FBCON_HAS_CFB16
-static void pm3fb_cfb16_clear(struct vc_data *conp,
-                              struct display *p,
-                              int sy, int sx, int height, int width)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        u32 c;
-
-        DTRACE;
-
-        sx = sx * fontwidth(p);
-        width = width * fontwidth(p);
-        sy = sy * fontheight(p);
-        height = height * fontheight(p);
-        c = ((u16 *) p->dispsw_data)[attr_bgcol_ec(p, conp)];
-        c = c | (c << 16);
-
-        PM3_WAIT(4);
-
-        if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                PM3_WRITE_REG(PM3ForegroundColor, c);
-        else
-                PM3_WRITE_REG(PM3FBBlockColor, c);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable);
-
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(sx)) |
-                      (PM3RectanglePosition_YOffset(sy)));
-        
-        if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              PM3Render2D_SpanOperation |
-                              (PM3Render2D_Width(width)) |
-                              (PM3Render2D_Height(height)));
-        else
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              (PM3Render2D_Width(width)) |
-                              (PM3Render2D_Height(height)));
-        
-        pm3fb_wait_pm3(l_fb_info);
-}
-
-static void pm3fb_cfb16_clear_margins(struct vc_data *conp,
-                                      struct display *p, int bottom_only)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        int sx, sy;
-        u32 c;
-
-        DTRACE;
-
-        sx = conp->vc_cols * fontwidth(p);      /* right margin */
-        sy = conp->vc_rows * fontheight(p);     /* bottom margin */
-        c = ((u16 *) p->dispsw_data)[attr_bgcol_ec(p, conp)];
-        c = c | (c << 16);
-
-        if (!bottom_only) {     /* right margin top->bottom */
-                PM3_WAIT(4);
-
-                PM3_WRITE_REG(PM3Config2D,
-                                          PM3Config2D_UseConstantSource |
-                                          PM3Config2D_ForegroundROPEnable |
-                                          (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                          PM3Config2D_FBWriteEnable);
-                
-                if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                        PM3_WRITE_REG(PM3ForegroundColor, c);
-                else
-                        PM3_WRITE_REG(PM3FBBlockColor, c);
-                
-                PM3_WRITE_REG(PM3RectanglePosition,
-                              (PM3RectanglePosition_XOffset
-                               (p->var.xoffset +
-                                sx)) | (PM3RectanglePosition_YOffset(p->
-                                                                     var.
-                                                                     yoffset)));
-                if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                        PM3_WRITE_REG(PM3Render2D,
-                                      PM3Render2D_XPositive |
-                                      PM3Render2D_YPositive |
-                                      PM3Render2D_Operation_Normal |
-                                      PM3Render2D_SpanOperation |
-                                      (PM3Render2D_Width(p->var.xres - sx)) |
-                                      (PM3Render2D_Height(p->var.yres)));
-                else
-                        PM3_WRITE_REG(PM3Render2D,
-                                      PM3Render2D_XPositive |
-                                      PM3Render2D_YPositive |
-                                      PM3Render2D_Operation_Normal |
-                                      (PM3Render2D_Width(p->var.xres - sx)) |
-                                      (PM3Render2D_Height(p->var.yres)));
+        if (lpitch * var->yres_virtual > info->fix.smem_len) {
+                DPRINTK("no memory for screen (%ux%ux%u)\n",
+                        var->xres, var->yres_virtual, var->bits_per_pixel);
+                return -EINVAL;
         }
-        
-        /* bottom margin left -> right */
-        PM3_WAIT(4);
-        
-        PM3_WRITE_REG(PM3Config2D,
-                      PM3Config2D_UseConstantSource |
-                      PM3Config2D_ForegroundROPEnable |
-                      (PM3Config2D_ForegroundROP(0x3)) |        /* Ox3 is GXcopy */
-                      PM3Config2D_FBWriteEnable);
-        
-        if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                PM3_WRITE_REG(PM3ForegroundColor, c);
-        else
-                PM3_WRITE_REG(PM3FBBlockColor, c);
-        
-        
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(p->var.xoffset)) |
-                      (PM3RectanglePosition_YOffset(p->var.yoffset + sy)));
-        
-        if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              PM3Render2D_SpanOperation |
-                              (PM3Render2D_Width(p->var.xres)) |
-                              (PM3Render2D_Height(p->var.yres - sy)));
-        else
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              (PM3Render2D_Width(p->var.xres)) |
-                              (PM3Render2D_Height(p->var.yres - sy)));
-
-        pm3fb_wait_pm3(l_fb_info);
-}
-#endif /* FBCON_HAS_CFB16 */
-#ifdef FBCON_HAS_CFB8
-static void pm3fb_cfb8_clear(struct vc_data *conp,
-                             struct display *p,
-                             int sy, int sx, int height, int width)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        u32 c;
-
-        DTRACE;
-
-        sx = sx * fontwidth(p);
-        width = width * fontwidth(p);
-        sy = sy * fontheight(p);
-        height = height * fontheight(p);
-
-        c = attr_bgcol_ec(p, conp);
-        c |= c << 8;
-        c |= c << 16;
 
-        PM3_WAIT(4);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable);
-
-        PM3_WRITE_REG(PM3ForegroundColor, c);
-
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(sx)) |
-                      (PM3RectanglePosition_YOffset(sy)));
-
-        PM3_WRITE_REG(PM3Render2D,
-                      PM3Render2D_XPositive |
-                      PM3Render2D_YPositive |
-                      PM3Render2D_Operation_Normal |
-                      PM3Render2D_SpanOperation |
-                      (PM3Render2D_Width(width)) |
-                      (PM3Render2D_Height(height)));
-
-        pm3fb_wait_pm3(l_fb_info);
-}
-
-static void pm3fb_cfb8_clear_margins(struct vc_data *conp,
-                                     struct display *p, int bottom_only)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        int sx, sy;
-        u32 c;
-
-        DTRACE;
-
-        sx = conp->vc_cols * fontwidth(p);      /* right margin */
-        sy = conp->vc_rows * fontheight(p);     /* bottom margin */
-        c = attr_bgcol_ec(p, conp);
-        c |= c << 8;
-        c |= c << 16;
-
-        if (!bottom_only) {     /* right margin top->bottom */
-                PM3_WAIT(4);
-
-                PM3_WRITE_REG(PM3Config2D,
-                                          PM3Config2D_UseConstantSource |
-                                          PM3Config2D_ForegroundROPEnable |
-                                          (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                          PM3Config2D_FBWriteEnable);
-
-                PM3_WRITE_REG(PM3ForegroundColor, c);
-
-                PM3_WRITE_REG(PM3RectanglePosition,
-                              (PM3RectanglePosition_XOffset
-                               (p->var.xoffset +
-                                sx)) | (PM3RectanglePosition_YOffset(p->
-                                                                     var.
-                                                                     yoffset)));
-
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              PM3Render2D_SpanOperation |
-                              (PM3Render2D_Width(p->var.xres - sx)) |
-                              (PM3Render2D_Height(p->var.yres)));
+        if (PICOS2KHZ(var->pixclock) > PM3_MAX_PIXCLOCK) {
+                DPRINTK("pixclock too high (%ldKHz)\n", PICOS2KHZ(var->pixclock));
+                return -EINVAL;
         }
 
-        /* bottom margin left -> right */
-        PM3_WAIT(4);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable);
-
-        PM3_WRITE_REG(PM3ForegroundColor, c);
+        var->accel_flags = 0;   /* Can't mmap if this is on */
 
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(p->var.xoffset)) |
-                      (PM3RectanglePosition_YOffset(p->var.yoffset + sy)));
-
-        PM3_WRITE_REG(PM3Render2D,
-                      PM3Render2D_XPositive |
-                      PM3Render2D_YPositive |
-                      PM3Render2D_Operation_Normal |
-                      PM3Render2D_SpanOperation |
-                      (PM3Render2D_Width(p->var.xres)) |
-                      (PM3Render2D_Height(p->var.yres - sy)));
-
-        pm3fb_wait_pm3(l_fb_info);
-}
-#endif /* FBCON_HAS_CFB8 */
-#if defined(FBCON_HAS_CFB8) || defined(FBCON_HAS_CFB16) || defined(FBCON_HAS_CFB32)
-static void pm3fb_cfbX_bmove(struct display *p,
-                             int sy, int sx,
-                             int dy, int dx, int height, int width)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        int x_align, o_x, o_y;
-
-        DTRACE;
-
-        sx = sx * fontwidth(p);
-        dx = dx * fontwidth(p);
-        width = width * fontwidth(p);
-        sy = sy * fontheight(p);
-        dy = dy * fontheight(p);
-        height = height * fontheight(p);
-
-        o_x = sx - dx;          /*(sx > dx ) ? (sx - dx) : (dx - sx); */
-        o_y = sy - dy;          /*(sy > dy ) ? (sy - dy) : (dy - sy); */
-
-        x_align = (sx & 0x1f);
-
-        PM3_WAIT(6);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UserScissorEnable |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  PM3Config2D_Blocking |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable);
-
-        PM3_WRITE_REG(PM3ScissorMinXY,
-                      ((dy & 0x0fff) << 16) | (dx & 0x0fff));
-        PM3_WRITE_REG(PM3ScissorMaxXY,
-                                  (((dy + height) & 0x0fff) << 16) |
-                                  ((dx + width) & 0x0fff));
-
-        PM3_WRITE_REG(PM3FBSourceReadBufferOffset,
-                      PM3FBSourceReadBufferOffset_XOffset(o_x) |
-                      PM3FBSourceReadBufferOffset_YOffset(o_y));
-
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(dx - x_align)) |
-                      (PM3RectanglePosition_YOffset(dy)));
-
-        PM3_WRITE_REG(PM3Render2D,
-                      ((sx > dx) ? PM3Render2D_XPositive : 0) |
-                      ((sy > dy) ? PM3Render2D_YPositive : 0) |
-                      PM3Render2D_Operation_Normal |
-                      PM3Render2D_SpanOperation |
-                      PM3Render2D_FBSourceReadEnable |
-                      (PM3Render2D_Width(width + x_align)) |
-                      (PM3Render2D_Height(height)));
-
-        pm3fb_wait_pm3(l_fb_info);
+        DPRINTK("Checking graphics mode at %dx%d depth %d\n",
+                var->xres, var->yres, var->bits_per_pixel);
+        return 0;
 }
 
-static void pm3fb_cfbX_putc(struct vc_data *conp, struct display *p,
-                            int c, int yy, int xx)
+static int pm3fb_set_par(struct fb_info *info)
 {
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        u8 *cdat, asx = 0, asy = 0, o_x = 0, o_y = 0;
-        u32 fgx, bgx, ldat;
-        int sx, sy, i;
-
-        DTRACE;
-
-        if (l_fb_info->current_par->depth == 8)
-                fgx = attr_fgcol(p, c);
-        else if (depth2bpp(l_fb_info->current_par->depth) == 16)
-                fgx = ((u16 *) p->dispsw_data)[attr_fgcol(p, c)];
-        else
-                fgx = ((u32 *) p->dispsw_data)[attr_fgcol(p, c)];
-
-        PM3_COLOR(fgx);
-
-        if (l_fb_info->current_par->depth == 8)
-                bgx = attr_bgcol(p, c);
-        else if (depth2bpp(l_fb_info->current_par->depth) == 16)
-                bgx = ((u16 *) p->dispsw_data)[attr_bgcol(p, c)];
-        else
-                bgx = ((u32 *) p->dispsw_data)[attr_bgcol(p, c)];
-
-        PM3_COLOR(bgx);
-
-        PM3_WAIT(4);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable | PM3Config2D_OpaqueSpan);
-
-        PM3_WRITE_REG(PM3ForegroundColor, fgx);
-        PM3_WRITE_REG(PM3FillBackgroundColor, bgx);
-
-        /* WARNING : address select X need to specify 8 bits for fontwidth <= 8 */
-        /* and 16 bits for fontwidth <= 16 */
-        /* same in _putcs, same for Y and fontheight */
-        if (fontwidth(p) <= 8)
-                asx = 2;
-        else if (fontwidth(p) <= 16)
-                asx = 3;        /* look OK */
-        if (fontheight(p) <= 8)
-                asy = 2;
-        else if (fontheight(p) <= 16)
-                asy = 3;        /* look OK */
-        else if (fontheight(p) <= 32)
-                asy = 4;        /* look OK */
-
-        sx = xx * fontwidth(p);
-        sy = yy * fontheight(p);
-
-        if (fontwidth(p) <= 8)
-                o_x = (8 - (sx & 0x7)) & 0x7;
-        else if (fontwidth(p) <= 16)
-                o_x = (16 - (sx & 0xF)) & 0xF;
-        if (fontheight(p) <= 8)
-                o_y = (8 - (sy & 0x7)) & 0x7;
-        else if (fontheight(p) <= 16)
-                o_y = (16 - (sy & 0xF)) & 0xF;
-        else if (fontheight(p) <= 32)
-                o_y = (32 - (sy & 0x1F)) & 0x1F;
-
-        PM3_WRITE_REG(PM3AreaStippleMode, (o_x << 7) | (o_y << 12) |    /* x_offset, y_offset in pattern */
-                      (1 << 18) |       /* BE */
-                      1 | (asx << 1) | (asy << 4) |     /* address select x/y */
-                      (1 << 20));       /* OpaqueSpan */
-
-        if (fontwidth(p) <= 8) {
-                cdat = p->fontdata + (c & p->charmask) * fontheight(p);
-        } else {
-                cdat =
-                    p->fontdata +
-                    ((c & p->charmask) * (fontheight(p) << 1));
-        }
-
-        PM3_WAIT(2 + fontheight(p));
-
-        for (i = 0; i < fontheight(p); i++) {   /* assume fontheight <= 32 */
-                if (fontwidth(p) <= 8) {
-                        ldat = *cdat++;
-                } else {        /* assume fontwidth <= 16 ATM */
-
-                        ldat = ((*cdat++) << 8);
-                        ldat |= *cdat++;
-                }
-                PM3_WRITE_REG(AreaStipplePattern_indexed(i), ldat);
-        }
+        struct pm3_par *par = info->par;
+        const u32 xres = (info->var.xres + 31) & ~31;
+        const int depth = (info->var.bits_per_pixel + 7) & ~7;
 
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(sx)) |
-                      (PM3RectanglePosition_YOffset(sy)));
+        par->base = pm3fb_shift_bpp(info->var.bits_per_pixel,
+                                        (info->var.yoffset * xres)
+                                        + info->var.xoffset);
+        par->video = 0;
 
-        PM3_WRITE_REG(PM3Render2D,
-                      PM3Render2D_AreaStippleEnable |
-                      PM3Render2D_XPositive |
-                      PM3Render2D_YPositive |
-                      PM3Render2D_Operation_Normal |
-                      PM3Render2D_SpanOperation |
-                      (PM3Render2D_Width(fontwidth(p))) |
-                      (PM3Render2D_Height(fontheight(p))));
-
-        pm3fb_wait_pm3(l_fb_info);
-}
-
-static void pm3fb_cfbX_putcs(struct vc_data *conp, struct display *p,
-                             const unsigned short *s, int count, int yy,
-                             int xx)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-        u8 *cdat, asx = 0, asy = 0, o_x = 0, o_y = 0;
-        u32 fgx, bgx, ldat;
-        int sx, sy, i, j;
-        u16 sc;
-
-        DTRACE;
-
-        sc = scr_readw(s);
-        if (l_fb_info->current_par->depth == 8)
-                fgx = attr_fgcol(p, sc);
-        else if (depth2bpp(l_fb_info->current_par->depth) == 16)
-                fgx = ((u16 *) p->dispsw_data)[attr_fgcol(p, sc)];
-        else
-                fgx = ((u32 *) p->dispsw_data)[attr_fgcol(p, sc)];
-        
-        PM3_COLOR(fgx);
-        
-        if (l_fb_info->current_par->depth == 8)
-                bgx = attr_bgcol(p, sc);
-        else if (depth2bpp(l_fb_info->current_par->depth) == 16)
-                bgx = ((u16 *) p->dispsw_data)[attr_bgcol(p, sc)];
+        if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                par->video |= PM3VideoControl_HSYNC_ACTIVE_HIGH;
         else
-                bgx = ((u32 *) p->dispsw_data)[attr_bgcol(p, sc)];
-        
-        PM3_COLOR(bgx);
-
-        PM3_WAIT(4);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0x3)) |    /* Ox3 is GXcopy */
-                                  PM3Config2D_FBWriteEnable |
-                                  PM3Config2D_OpaqueSpan);
-
-        PM3_WRITE_REG(PM3ForegroundColor, fgx);
-        PM3_WRITE_REG(PM3FillBackgroundColor, bgx);
-
-        /* WARNING : address select X need to specify 8 bits for fontwidth <= 8 */
-        /* and 16 bits for fontwidth <= 16 */
-        /* same in _putc, same for Y and fontheight */
-        if (fontwidth(p) <= 8)
-                asx = 2;
-        else if (fontwidth(p) <= 16)
-                asx = 3;        /* look OK */
-        if (fontheight(p) <= 8)
-                asy = 2;
-        else if (fontheight(p) <= 16)
-                asy = 3;        /* look OK */
-        else if (fontheight(p) <= 32)
-                asy = 4;        /* look OK */
-
-        sy = yy * fontheight(p);
-
-        if (fontheight(p) <= 8)
-                o_y = (8 - (sy & 0x7)) & 0x7;
-        else if (fontheight(p) <= 16)
-                o_y = (16 - (sy & 0xF)) & 0xF;
-        else if (fontheight(p) <= 32)
-                o_y = (32 - (sy & 0x1F)) & 0x1F;
-
-        for (j = 0; j < count; j++) {
-                sc = scr_readw(s + j);
-                if (fontwidth(p) <= 8)
-                        cdat = p->fontdata +
-                                (sc & p->charmask) * fontheight(p);
-                else
-                        cdat = p->fontdata +
-                                ((sc & p->charmask) * fontheight(p) << 1);
-                
-                sx = (xx + j) * fontwidth(p);
-
-                if (fontwidth(p) <= 8)
-                        o_x = (8 - (sx & 0x7)) & 0x7;
-                else if (fontwidth(p) <= 16)
-                        o_x = (16 - (sx & 0xF)) & 0xF;
-
-                PM3_WAIT(3 + fontheight(p));
-
-                PM3_WRITE_REG(PM3AreaStippleMode, (o_x << 7) | (o_y << 12) | /* x_offset, y_offset in pattern */
-                              (1 << 18) | /* BE */
-                              1 | (asx << 1) | (asy << 4) | /* address select x/y */
-                              (1 << 20)); /* OpaqueSpan */
-
-                for (i = 0; i < fontheight(p); i++) { /* assume fontheight <= 32 */
-                        if (fontwidth(p) <= 8) {
-                                ldat = *cdat++;
-                        } else { /* assume fontwidth <= 16 ATM */
-                                ldat = ((*cdat++) << 8);
-                                ldat |= *cdat++;
-                        }
-                        PM3_WRITE_REG(AreaStipplePattern_indexed(i), ldat);
-                }
-
-                PM3_WRITE_REG(PM3RectanglePosition,
-                              (PM3RectanglePosition_XOffset(sx)) |
-                              (PM3RectanglePosition_YOffset(sy)));
-
-                PM3_WRITE_REG(PM3Render2D,
-                              PM3Render2D_AreaStippleEnable |
-                              PM3Render2D_XPositive |
-                              PM3Render2D_YPositive |
-                              PM3Render2D_Operation_Normal |
-                              PM3Render2D_SpanOperation |
-                              (PM3Render2D_Width(fontwidth(p))) |
-                              (PM3Render2D_Height(fontheight(p))));
-        }
-        pm3fb_wait_pm3(l_fb_info);
-}
-
-static void pm3fb_cfbX_revc(struct display *p, int xx, int yy)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) p->fb_info;
-
-        xx = xx * fontwidth(p);
-        yy = yy * fontheight(p);
-
-        if (l_fb_info->current_par->depth == 8)
-        {
-                if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                        PM3_SLOW_WRITE_REG(PM3FBSoftwareWriteMask, 0x0F0F0F0F);
-                else
-                        PM3_SLOW_WRITE_REG(PM3FBHardwareWriteMask, 0x0F0F0F0F);
-        }
-
-        PM3_WAIT(3);
-
-        PM3_WRITE_REG(PM3Config2D,
-                                  PM3Config2D_UseConstantSource |
-                                  PM3Config2D_ForegroundROPEnable |
-                                  (PM3Config2D_ForegroundROP(0xa)) |    /* Oxa is GXinvert */
-                                  PM3Config2D_FBDestReadEnable |
-                                  PM3Config2D_FBWriteEnable);
-
-        PM3_WRITE_REG(PM3RectanglePosition,
-                      (PM3RectanglePosition_XOffset(xx)) |
-                      (PM3RectanglePosition_YOffset(yy)));
-
-        PM3_WRITE_REG(PM3Render2D,
-                      PM3Render2D_XPositive |
-                      PM3Render2D_YPositive |
-                      PM3Render2D_Operation_Normal |
-                      PM3Render2D_SpanOperation |
-                      (PM3Render2D_Width(fontwidth(p))) |
-                      (PM3Render2D_Height(fontheight(p))));
-
-        pm3fb_wait_pm3(l_fb_info);
-
-        if (l_fb_info->current_par->depth == 8)
-        {
-                if (l_fb_info->memt.caps & PM3LocalMemCaps_NoWriteMask)
-                        PM3_SLOW_WRITE_REG(PM3FBSoftwareWriteMask, 0xFFFFFFFF);
-                else
-                        PM3_SLOW_WRITE_REG(PM3FBHardwareWriteMask, 0xFFFFFFFF);
-        }
-}
-
-#endif /* FBCON_HAS_CFB8 || FBCON_HAS_CFB16 || FBCON_HAS_CFB32 */
-#endif /* PM3FB_USE_ACCEL */
-/* *********************************** */
-/* ***** pre-init board(s) setup ***** */
-/* *********************************** */
-
-static void pm3fb_mode_setup(char *mode, unsigned long board_num)
-{
-        struct pm3fb_info *l_fb_info = &(fb_info[board_num]);
-        struct pm3fb_par *l_fb_par = &(current_par[board_num]);
-        unsigned long i = 0;
-
-        current_par_valid[board_num] = 0;
-
-        if (!strncmp(mode, "current", 7)) {
-                l_fb_info->use_current = 1;     /* default w/ OpenFirmware */
-        } else {
-                while ((mode_base[i].name[0])
-                       && (!current_par_valid[board_num])) {
-                        if (!
-                            (strncmp
-                             (mode, mode_base[i].name,
-                              strlen(mode_base[i].name)))) {
-                                memcpy(l_fb_par, &(mode_base[i].user_mode),
-                                       sizeof(struct pm3fb_par));
-                                current_par_valid[board_num] = 1;
-                                DPRINTK(2, "Mode set to %s\n",
-                                        mode_base[i].name);
-                        }
-                        i++;
-                }
-                DASSERT(current_par_valid[board_num],
-                        "Valid mode on command line\n");
-        }
-}
-
-static void pm3fb_pciid_setup(char *pciid, unsigned long board_num)
-{
-        short l_bus = -1, l_slot = -1, l_func = -1;
-        char *next;
-
-        if (pciid) {
-                l_bus = simple_strtoul(pciid, &next, 10);
-                if (next && (next[0] == ':')) {
-                        pciid = next + 1;
-                        l_slot = simple_strtoul(pciid, &next, 10);
-                        if (next && (next[0] == ':')) {
-                                pciid = next + 1;
-                                l_func =
-                                    simple_strtoul(pciid, (char **) NULL,
-                                                   10);
-                        }
-                }
-        } else
-                return;
-
-        if ((l_bus >= 0) && (l_slot >= 0) && (l_func >= 0)) {
-                bus[board_num] = l_bus;
-                slot[board_num] = l_slot;
-                func[board_num] = l_func;
-                DPRINTK(2, "Board #%ld will be PciId: %hd:%hd:%hd\n",
-                        board_num, l_bus, l_slot, l_func);
-        } else {
-                DPRINTK(1, "Invalid PciId: %hd:%hd:%hd for board #%ld\n",
-                        l_bus, l_slot, l_func, board_num);
-        }
-}
-
-static void pm3fb_font_setup(char *lf, unsigned long board_num)
-{
-        unsigned long lfs = strlen(lf);
-
-        if (lfs > (PM3_FONTNAME_SIZE - 1)) {
-                DPRINTK(1, "Fontname %s too long\n", lf);
-                return;
-        }
-        strlcpy(fontn[board_num], lf, lfs + 1);
-}
-
-static void pm3fb_bootdepth_setup(char *bds, unsigned long board_num)
-{
-        unsigned long bd = simple_strtoul(bds, (char **) NULL, 10);
-
-        if (!(depth_supported(bd))) {
-                printk(KERN_WARNING "pm3fb: ignoring invalid depth %s for board #%ld\n",
-                       bds, board_num);
-                return;
-        }
-        depth[board_num] = bd;
-}
-
-static void pm3fb_forcesize_setup(char *bds, unsigned long board_num)
-{
-        unsigned long bd = simple_strtoul(bds, (char **) NULL, 10);
-
-        if (bd > 64) {
-                printk(KERN_WARNING "pm3fb: ignoring invalid memory size %s for board #%ld\n",
-                       bds, board_num);
-                return;
-        }
-        forcesize[board_num] = bd;
-}
-
-static char *pm3fb_boardnum_setup(char *options, unsigned long *bn)
-{
-        char *next;
-
-        if (!(isdigit(options[0]))) {
-                (*bn) = 0;
-                return (options);
-        }
-
-        (*bn) = simple_strtoul(options, &next, 10);
+                par->video |= PM3VideoControl_HSYNC_ACTIVE_LOW;
 
-        if (next && (next[0] == ':') && ((*bn) >= 0)
-            && ((*bn) <= PM3_MAX_BOARD)) {
-                DPRINTK(2, "Board_num seen as %ld\n", (*bn));
-                return (next + 1);
-        } else {
-                (*bn) = 0;
-                DPRINTK(2, "Board_num default to %ld\n", (*bn));
-                return (options);
-        }
-}
-
-static void pm3fb_real_setup(char *options)
-{
-        char *next;
-        unsigned long i, bn;
-        struct pm3fb_info *l_fb_info;
-
-        DTRACE;
-
-        DPRINTK(2, "Options : %s\n", options);
-
-        for (i = 0; i < PM3_MAX_BOARD; i++) {
-                l_fb_info = &(fb_info[i]);
-                memset(l_fb_info, 0, sizeof(struct pm3fb_info));
-                l_fb_info->gen.fbhw = &pm3fb_switch;
-                l_fb_info->board_num = i;
-                current_par_valid[i] = 0;
-                slot[i] = -1;
-                func[i] = -1;
-                bus[i] = -1;
-                disable[i] = 0;
-                noaccel[i] = 0;
-                fontn[i][0] = '\0';
-                depth[i] = 0;
-                l_fb_info->current_par = &(current_par[i]);
-        }
-
-        /* eat up prefix pm3fb and whatever is used as separator i.e. :,= */
-        if (!strncmp(options, "pm3fb", 5)) {
-                options += 5;
-                while (((*options) == ',') || ((*options) == ':')
-                       || ((*options) == '='))
-                        options++;
-        }
-
-        while (options) {
-                bn = 0;
-                if ((next = strchr(options, ','))) {
-                        (*next) = '\0';
-                        next++;
-                }
-
-                if (!strncmp(options, "mode:", 5)) {
-                        options = pm3fb_boardnum_setup(options + 5, &bn);
-                        DPRINTK(2, "Setting mode for board #%ld\n", bn);
-                        pm3fb_mode_setup(options, bn);
-                } else if (!strncmp(options, "off:", 4)) {
-                        options = pm3fb_boardnum_setup(options + 4, &bn);
-                        DPRINTK(2, "Disabling board #%ld\n", bn);
-                        disable[bn] = 1;
-                } else if (!strncmp(options, "off", 3)) {       /* disable everything */
-                        for (i = 0; i < PM3_MAX_BOARD; i++)
-                                disable[i] = 1;
-                } else if (!strncmp(options, "disable:", 8)) {
-                        options = pm3fb_boardnum_setup(options + 8, &bn);
-                        DPRINTK(2, "Disabling board #%ld\n", bn);
-                        disable[bn] = 1;
-                } else if (!strncmp(options, "pciid:", 6)) {
-                        options = pm3fb_boardnum_setup(options + 6, &bn);
-                        DPRINTK(2, "Setting PciID for board #%ld\n", bn);
-                        pm3fb_pciid_setup(options, bn);
-                } else if (!strncmp(options, "noaccel:", 8)) {
-                        options = pm3fb_boardnum_setup(options + 8, &bn);
-                        noaccel[bn] = 1;
-                } else if (!strncmp(options, "font:", 5)) {
-                        options = pm3fb_boardnum_setup(options + 5, &bn);
-                        pm3fb_font_setup(options, bn);
-                } else if (!strncmp(options, "depth:", 6)) {
-                        options = pm3fb_boardnum_setup(options + 6, &bn);
-                        pm3fb_bootdepth_setup(options, bn);
-                } else if (!strncmp(options, "printtimings", 12)) {
-                        printtimings = 1;
-                } else if (!strncmp(options, "flatpanel:", 10)) {
-                        options = pm3fb_boardnum_setup(options + 10, &bn);
-                        flatpanel[bn] = 1;
-                } else if (!strncmp(options, "forcesize:", 10)) {
-                        options = pm3fb_boardnum_setup(options + 10, &bn);
-                        pm3fb_forcesize_setup(options, bn);
-                }
-                options = next;
-        }
-}
-
-/* ********************************************** */
-/* ***** framebuffer API standard functions ***** */
-/* ********************************************** */
-
-static int pm3fb_encode_fix(struct fb_fix_screeninfo *fix,
-                            const void *par, struct fb_info_gen *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-        struct pm3fb_par *p = (struct pm3fb_par *) par;
-
-        DTRACE;
-
-        strcpy(fix->id, permedia3_name);
-        fix->smem_start = (unsigned long)l_fb_info->p_fb;
-        fix->smem_len = l_fb_info->fb_size;
-        fix->mmio_start = (unsigned long)l_fb_info->pIOBase;
-        fix->mmio_len = PM3_REGS_SIZE;
-#ifdef PM3FB_USE_ACCEL
-        if (!(noaccel[l_fb_info->board_num]))
-                fix->accel = FB_ACCEL_3DLABS_PERMEDIA3;
-        else
-#endif /* PM3FB_USE_ACCEL */
-                fix->accel = FB_ACCEL_NONE;
-        fix->type = FB_TYPE_PACKED_PIXELS;
-        fix->visual =
-            (p->depth == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
-        if (current_par_valid[l_fb_info->board_num])
-                fix->line_length =
-                        l_fb_info->current_par->width *
-                        depth2ByPP(l_fb_info->current_par->depth);
+        if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                par->video |= PM3VideoControl_VSYNC_ACTIVE_HIGH;
         else
-                fix->line_length = 0;
-        fix->xpanstep = 64 / depth2bpp(p->depth);
-        fix->ypanstep = 1;
-        fix->ywrapstep = 0;
-        return (0);
-}
-
-static int pm3fb_decode_var(const struct fb_var_screeninfo *var,
-                            void *par, struct fb_info_gen *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-        struct pm3fb_par *p = (struct pm3fb_par *) par;
-        struct pm3fb_par temp_p;
-        u32 xres;
-
-        DTRACE;
-
-        DASSERT((var != NULL), "fb_var_screeninfo* not NULL");
-        DASSERT((p != NULL), "pm3fb_par* not NULL");
-        DASSERT((l_fb_info != NULL), "pm3fb_info* not NULL");
+                par->video |= PM3VideoControl_VSYNC_ACTIVE_LOW;
 
-        memset(&temp_p, 0, sizeof(struct pm3fb_par));
-        temp_p.width = (var->xres_virtual + 7) & ~7;
-        temp_p.height = var->yres_virtual;
-
-        if (!(depth_supported(var->bits_per_pixel))) /* round unsupported up to a multiple of 8 */
-                temp_p.depth = depth2bpp(var->bits_per_pixel);
+        if ((info->var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
+                par->video |= PM3VideoControl_LINE_DOUBLE_ON;
         else
-                temp_p.depth = var->bits_per_pixel;
-
-        temp_p.depth = (temp_p.depth > 32) ? 32 : temp_p.depth; /* max 32 */
-        temp_p.depth = (temp_p.depth == 24) ? 32 : temp_p.depth; /* 24 unsupported, round-up to 32 */
-
-        if ((temp_p.depth == 16) && (var->red.length == 5) && (var->green.length == 5) && (var->blue.length == 5))
-                temp_p.depth = 15; /* RGBA 5551 is stored as depth 15 */
-
-        if ((temp_p.depth == 16) && (var->red.length == 4) && (var->green.length == 4) && (var->blue.length == 4))
-                temp_p.depth = 12; /* RGBA 4444  is stored as depth 12 */
-
-
-        DPRINTK(2,
-                "xres: %d, yres: %d, vxres: %d, vyres: %d ; xoffset:%d, yoffset: %d\n",
-                var->xres, var->yres, var->xres_virtual, var->yres_virtual,
-                var->xoffset, var->yoffset);
-
-        xres = (var->xres + 31) & ~31;
-        if (temp_p.width < xres + var->xoffset)
-                temp_p.width = xres + var->xoffset;
-        if (temp_p.height < var->yres + var->yoffset)
-                temp_p.height = var->yres + var->yoffset;
-
-        if (temp_p.width > 2048) {
-                DPRINTK(1, "virtual width not supported: %u\n",
-                        temp_p.width);
-                return (-EINVAL);
-        }
-        if (var->yres < 200) {
-                DPRINTK(1, "height not supported: %u\n", (u32) var->yres);
-                return (-EINVAL);
-        }
-        if (temp_p.height < 200 || temp_p.height > 4095) {
-                DPRINTK(1, "virtual height not supported: %u\n",
-                        temp_p.height);
-                return (-EINVAL);
-        }
-        if (!(depth_supported(temp_p.depth))) {
-                DPRINTK(1, "depth not supported: %u\n", temp_p.depth);
-                return (-EINVAL);
-        }
-        if ((temp_p.width * temp_p.height * depth2ByPP(temp_p.depth)) >
-            l_fb_info->fb_size) {
-                DPRINTK(1, "no memory for screen (%ux%ux%u)\n",
-                        temp_p.width, temp_p.height, temp_p.depth);
-                return (-EINVAL);
-        }
-
-        if ((!var->pixclock) ||
-            (!var->right_margin) ||
-            (!var->hsync_len) ||
-            (!var->left_margin) ||
-            (!var->lower_margin) ||
-            (!var->vsync_len) || (!var->upper_margin)
-            ) {
-                unsigned long i = 0, done = 0;
-                printk(KERN_WARNING "pm3fb: refusing to use a likely wrong timing\n");
-
-                while ((mode_base[i].user_mode.width) && !done) {
-                        if ((mode_base[i].user_mode.width == temp_p.width)
-                            && (mode_base[i].user_mode.height ==
-                                temp_p.height)) {
-                                printk(KERN_NOTICE "pm3fb: using close match %s\n",
-                                       mode_base[i].name);
-                                temp_p = mode_base[i].user_mode;
-                                done = 1;
-                        }
-                        i++;
-                }
-                if (!done)
-                        return (-EINVAL);
-        } else {
-                temp_p.pixclock = PICOS2KHZ(var->pixclock);
-                if (temp_p.pixclock > PM3_MAX_PIXCLOCK) {
-                        DPRINTK(1, "pixclock too high (%uKHz)\n",
-                                temp_p.pixclock);
-                        return (-EINVAL);
-                }
-
-                temp_p.hsstart = var->right_margin;
-                temp_p.hsend = var->right_margin + var->hsync_len;
-                temp_p.hbend =
-                    var->right_margin + var->hsync_len + var->left_margin;
-                temp_p.htotal = xres + temp_p.hbend;
-
-                temp_p.vsstart = var->lower_margin;
-                temp_p.vsend = var->lower_margin + var->vsync_len;
-                temp_p.vbend =
-                    var->lower_margin + var->vsync_len + var->upper_margin;
-                temp_p.vtotal = var->yres + temp_p.vbend;
-
-                temp_p.stride = temp_p.width;
-
-                DPRINTK(2, "Using %d * %d, %d Khz, stride is %08x\n",
-                        temp_p.width, temp_p.height, temp_p.pixclock,
-                        temp_p.stride);
-
-                temp_p.base =
-                    pm3fb_Shiftbpp(l_fb_info, temp_p.depth,
-                                   (var->yoffset * xres) + var->xoffset);
+                par->video |= PM3VideoControl_LINE_DOUBLE_OFF;
 
-                temp_p.video = 0;
-
-                if (var->sync & FB_SYNC_HOR_HIGH_ACT)
-                        temp_p.video |= PM3VideoControl_HSYNC_ACTIVE_HIGH;
-                else
-                        temp_p.video |= PM3VideoControl_HSYNC_ACTIVE_LOW;
-
-                if (var->sync & FB_SYNC_VERT_HIGH_ACT)
-                        temp_p.video |= PM3VideoControl_VSYNC_ACTIVE_HIGH;
-                else
-                        temp_p.video |= PM3VideoControl_VSYNC_ACTIVE_LOW;
-
-                if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
-                        DPRINTK(1, "Interlaced mode not supported\n\n");
-                        return (-EINVAL);
-                }
-
-                if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
-                        temp_p.video |= PM3VideoControl_LINE_DOUBLE_ON;
-                else
-                        temp_p.video |= PM3VideoControl_LINE_DOUBLE_OFF;
-
-                if (var->activate == FB_ACTIVATE_NOW)
-                        temp_p.video |= PM3VideoControl_ENABLE;
-                else {
-                        temp_p.video |= PM3VideoControl_DISABLE;
-                        DPRINTK(2, "PM3Video disabled\n");
-                }
-
-                switch (temp_p.depth) {
-                case 8:
-                        temp_p.video |= PM3VideoControl_PIXELSIZE_8BIT;
-                        break;
-                case 12:
-                case 15:
-                case 16:
-                        temp_p.video |= PM3VideoControl_PIXELSIZE_16BIT;
-                        break;
-                case 32:
-                        temp_p.video |= PM3VideoControl_PIXELSIZE_32BIT;
-                        break;
-                default:
-                        DPRINTK(1, "Unsupported depth\n");
-                        break;
-                }
+        if (info->var.activate == FB_ACTIVATE_NOW)
+                par->video |= PM3VideoControl_ENABLE;
+        else {
+                par->video |= PM3VideoControl_DISABLE;
+                DPRINTK("PM3Video disabled\n");
         }
-        (*p) = temp_p;
-
-#ifdef PM3FB_USE_ACCEL
-        if (var->accel_flags & FB_ACCELF_TEXT)
-                noaccel[l_fb_info->board_num] = 0;
-        else
-                noaccel[l_fb_info->board_num] = 1;
-#endif /* PM3FB_USE_ACCEL */
-
-        return (0);
-}
-
-static void pm3fb_encode_depth(struct fb_var_screeninfo *var, long d)
-{
-        switch (d) {
+        switch (depth) {
         case 8:
-                var->red.length = var->green.length = var->blue.length = 8;
-                var->red.offset = var->green.offset = var->blue.offset = 0;
-                var->transp.offset = var->transp.length = 0;
+                par->video |= PM3VideoControl_PIXELSIZE_8BIT;
                 break;
-
         case 12:
-                var->red.offset = 8;
-                var->red.length = 4;
-                var->green.offset = 4;
-                var->green.length = 4;
-                var->blue.offset = 0;
-                var->blue.length = 4;
-                var->transp.offset = 12;
-                var->transp.length = 4;
-                break;
-
         case 15:
-                var->red.offset = 10;
-                var->red.length = 5;
-                var->green.offset = 5;
-                var->green.length = 5;
-                var->blue.offset = 0;
-                var->blue.length = 5;
-                var->transp.offset = 15;
-                var->transp.length = 1;
-                break;
-
         case 16:
-                var->red.offset = 11;
-                var->red.length = 5;
-                var->green.offset = 5;
-                var->green.length = 6;
-                var->blue.offset = 0;
-                var->blue.length = 5;
-                var->transp.offset = var->transp.length = 0;
+                par->video |= PM3VideoControl_PIXELSIZE_16BIT;
                 break;
-
         case 32:
-                var->transp.offset = 24;
-                var->red.offset = 16;
-                var->green.offset = 8;
-                var->blue.offset = 0;
-                var->red.length = var->green.length =
-                        var->blue.length = var->transp.length = 8;
+                par->video |= PM3VideoControl_PIXELSIZE_32BIT;
                 break;
-
         default:
-                DPRINTK(1, "Unsupported depth %ld\n", d);
+                DPRINTK("Unsupported depth\n");
                 break;
         }
-}
-
-static int pm3fb_encode_var(struct fb_var_screeninfo *var,
-                            const void *par, struct fb_info_gen *info)
-{
-        struct pm3fb_par *p = (struct pm3fb_par *) par;
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-
-        u32 base;
-
-        DTRACE;
-
-        DASSERT((var != NULL), "fb_var_screeninfo* not NULL");
-        DASSERT((p != NULL), "pm3fb_par* not NULL");
-        DASSERT((info != NULL), "fb_info_gen* not NULL");
-
-        memset(var, 0, sizeof(struct fb_var_screeninfo));
-
-#ifdef PM3FB_USE_ACCEL
-        if (!(noaccel[l_fb_info->board_num]))
-                var->accel_flags |= FB_ACCELF_TEXT;
-#endif /* PM3FB_USE_ACCEL */
-
-        var->xres_virtual = p->width;
-        var->yres_virtual = p->height;
-        var->xres = p->htotal - p->hbend;
-        var->yres = p->vtotal - p->vbend;
-
-        DPRINTK(2, "xres = %d, yres : %d\n", var->xres, var->yres);
-
-        var->right_margin = p->hsstart;
-        var->hsync_len = p->hsend - p->hsstart;
-        var->left_margin = p->hbend - p->hsend;
-        var->lower_margin = p->vsstart;
-        var->vsync_len = p->vsend - p->vsstart;
-        var->upper_margin = p->vbend - p->vsend;
-        var->bits_per_pixel = depth2bpp(p->depth);
-        
-        pm3fb_encode_depth(var, p->depth);
-
-        base = pm3fb_Unshiftbpp(l_fb_info, p->depth, p->base);
-
-        var->xoffset = base % var->xres;
-        var->yoffset = base / var->xres;
-
-        var->height = var->width = -1;
-
-        var->pixclock = KHZ2PICOS(p->pixclock);
-
-        if ((p->video & PM3VideoControl_HSYNC_MASK) ==
-            PM3VideoControl_HSYNC_ACTIVE_HIGH)
-                var->sync |= FB_SYNC_HOR_HIGH_ACT;
-        if ((p->video & PM3VideoControl_VSYNC_MASK) ==
-            PM3VideoControl_VSYNC_ACTIVE_HIGH)
-                var->sync |= FB_SYNC_VERT_HIGH_ACT;
-        if (p->video & PM3VideoControl_LINE_DOUBLE_ON)
-                var->vmode = FB_VMODE_DOUBLE;
-
-        return (0);
-}
-
-static void pm3fb_get_par(void *par, struct fb_info_gen *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-
-        DTRACE;
-
-        if (!current_par_valid[l_fb_info->board_num]) {
-                if (l_fb_info->use_current)
-                        pm3fb_read_mode(l_fb_info, l_fb_info->current_par);
-                else
-                        memcpy(l_fb_info->current_par,
-                               &(mode_base[0].user_mode),
-                               sizeof(struct pm3fb_par));
-                current_par_valid[l_fb_info->board_num] = 1;
-        }
-        *((struct pm3fb_par *) par) = *(l_fb_info->current_par);
-}
-
-static void pm3fb_set_par(const void *par, struct fb_info_gen *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-
-        DTRACE;
 
-        *(l_fb_info->current_par) = *((struct pm3fb_par *) par);
-        current_par_valid[l_fb_info->board_num] = 1;
+        info->fix.visual =
+                (depth == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
+        info->fix.line_length = ((info->var.xres_virtual + 7)  & ~7)
+                                        * depth / 8;
 
-        pm3fb_write_mode(l_fb_info);
-
-#ifdef PM3FB_USE_ACCEL
-        pm3fb_init_engine(l_fb_info);
-#endif /* PM3FB_USE_ACCEL */
-}
-
-static void pm3fb_set_color(struct pm3fb_info *l_fb_info,
-                            unsigned char regno, unsigned char r,
-                            unsigned char g, unsigned char b)
-{
-        DTRACE;
-
-        PM3_SLOW_WRITE_REG(PM3RD_PaletteWriteAddress, regno);
-        PM3_SLOW_WRITE_REG(PM3RD_PaletteData, r);
-        PM3_SLOW_WRITE_REG(PM3RD_PaletteData, g);
-        PM3_SLOW_WRITE_REG(PM3RD_PaletteData, b);
-}
-
-static int pm3fb_getcolreg(unsigned regno, unsigned *red, unsigned *green,
-                           unsigned *blue, unsigned *transp,
-                           struct fb_info *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-
-        DTRACE;
-
-        if (regno < 256) {
-                *red =
-                    l_fb_info->palette[regno].red << 8 | l_fb_info->
-                    palette[regno].red;
-                *green =
-                    l_fb_info->palette[regno].green << 8 | l_fb_info->
-                    palette[regno].green;
-                *blue =
-                    l_fb_info->palette[regno].blue << 8 | l_fb_info->
-                    palette[regno].blue;
-                *transp =
-                    l_fb_info->palette[regno].transp << 8 | l_fb_info->
-                    palette[regno].transp;
-        }
-        return (regno > 255);
+/*      pm3fb_clear_memory(info, 0);*/
+        pm3fb_clear_colormap(par, 0, 0, 0);
+        PM3_WRITE_DAC_REG(par, PM3RD_CursorMode,
+                          PM3RD_CursorMode_CURSOR_DISABLE);
+        pm3fb_write_mode(info);
+        return 0;
 }
 
 static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
                            struct fb_info *info)
 {
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-
-        DTRACE;
+        struct pm3_par *par = info->par;
+
+        if (regno >= 256)  /* no. of hw registers */
+           return -EINVAL;
+
+        /* grayscale works only partially under directcolor */
+        if (info->var.grayscale) {
+           /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+           red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
+        }
+
+        /* Directcolor:
+         *   var->{color}.offset contains start of bitfield
+         *   var->{color}.length contains length of bitfield
+         *   {hardwarespecific} contains width of DAC
+         *   pseudo_palette[X] is programmed to (X << red.offset) |
+         *                                    (X << green.offset) |
+         *                                    (X << blue.offset)
+         *   RAMDAC[X] is programmed to (red, green, blue)
+         *   color depth = SUM(var->{color}.length)
+         *
+         * Pseudocolor:
+         *      var->{color}.offset is 0
+         *      var->{color}.length contains width of DAC or the number of unique
+         *                      colors available (color depth)
+         *      pseudo_palette is not used
+         *      RAMDAC[X] is programmed to (red, green, blue)
+         *      color depth = var->{color}.length
+         */
 
-        if (regno < 16) {
-                switch (l_fb_info->current_par->depth) {
-#ifdef FBCON_HAS_CFB8
+        /*
+         * This is the point where the color is converted to something that
+         * is acceptable by the hardware.
+         */
+#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
+        red = CNVT_TOHW(red, info->var.red.length);
+        green = CNVT_TOHW(green, info->var.green.length);
+        blue = CNVT_TOHW(blue, info->var.blue.length);
+        transp = CNVT_TOHW(transp, info->var.transp.length);
+#undef CNVT_TOHW
+
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+        info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+                u32 v;
+
+                if (regno >= 16)
+                        return -EINVAL;
+
+                v = (red << info->var.red.offset) |
+                        (green << info->var.green.offset) |
+                        (blue << info->var.blue.offset) |
+                        (transp << info->var.transp.offset);
+
+                switch (info->var.bits_per_pixel) {
                 case 8:
                         break;
-#endif
-#ifdef FBCON_HAS_CFB16
-                case 12:
-                        l_fb_info->cmap.cmap12[regno] =
-                                (((u32) red & 0xf000) >> 4) |
-                                (((u32) green & 0xf000) >> 8) |
-                                (((u32) blue & 0xf000) >> 12);
-                        break;
-
-                case 15:
-                        l_fb_info->cmap.cmap15[regno] =
-                                (((u32) red & 0xf800) >> 1) |
-                                (((u32) green & 0xf800) >> 6) |
-                                (((u32) blue & 0xf800) >> 11);
-                        break;
-
                 case 16:
-                        l_fb_info->cmap.cmap16[regno] =
-                            ((u32) red & 0xf800) |
-                            (((u32) green & 0xfc00) >> 5) |
-                            (((u32) blue & 0xf800) >> 11);
-                        break;
-#endif
-#ifdef FBCON_HAS_CFB32
+                case 24:
                 case 32:
-                        l_fb_info->cmap.cmap32[regno] =
-                            (((u32) transp & 0xff00) << 16) |
-                            (((u32) red & 0xff00) << 8) |
-                            (((u32) green & 0xff00)) |
-                            (((u32) blue & 0xff00) >> 8);
-                        break;
-#endif
-                default:
-                        DPRINTK(1, "bad depth %u\n",
-                                l_fb_info->current_par->depth);
+                        ((u32*)(info->pseudo_palette))[regno] = v;
                         break;
                 }
+                return 0;
         }
-        if (regno < 256) {
-                l_fb_info->palette[regno].red = red >> 8;
-                l_fb_info->palette[regno].green = green >> 8;
-                l_fb_info->palette[regno].blue = blue >> 8;
-                l_fb_info->palette[regno].transp = transp >> 8;
-                if (l_fb_info->current_par->depth == 8)
-                        pm3fb_set_color(l_fb_info, regno, red >> 8,
-                                        green >> 8, blue >> 8);
-        }
-        return (regno > 255);
+        else if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
+                pm3fb_set_color(par, regno, red, green, blue);
+
+        return 0;
 }
 
-static int pm3fb_blank(int blank_mode, struct fb_info_gen *info)
+static int pm3fb_pan_display(struct fb_var_screeninfo *var,
+                                 struct fb_info *info)
 {
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-        u32 video;
-
-        DTRACE;
+        struct pm3_par *par = info->par;
+        const u32 xres = (var->xres + 31) & ~31;
 
-        if (!current_par_valid[l_fb_info->board_num])
-                return (1);
+        par->base = pm3fb_shift_bpp(var->bits_per_pixel,
+                                        (var->yoffset * xres)
+                                        + var->xoffset);
+        PM3_SLOW_WRITE_REG(par, PM3ScreenBase, par->base);
+        return 0;
+}
 
-        video = l_fb_info->current_par->video;
+static int pm3fb_blank(int blank_mode, struct fb_info *info)
+{
+        struct pm3_par *par = info->par;
+        u32 video = par->video;
 
         /*
          * Oxygen VX1 - it appears that setting PM3VideoControl and
@@ -3181,454 +663,345 @@ static int pm3fb_blank(int blank_mode, struct fb_info_gen *info)
         video |= PM3VideoControl_HSYNC_ACTIVE_HIGH |
                  PM3VideoControl_VSYNC_ACTIVE_HIGH;
 
-        if (blank_mode > 0) {
-                switch (blank_mode - 1) {
-
-                case VESA_NO_BLANKING:  /* FIXME */
-                        video = video & ~(PM3VideoControl_ENABLE);
-                        break;
-
-                case VESA_HSYNC_SUSPEND:
-                        video = video & ~(PM3VideoControl_HSYNC_MASK |
-                                          PM3VideoControl_BLANK_ACTIVE_LOW);
-                        break;
-                case VESA_VSYNC_SUSPEND:
-                        video = video & ~(PM3VideoControl_VSYNC_MASK |
-                                          PM3VideoControl_BLANK_ACTIVE_LOW);
-                        break;
-                case VESA_POWERDOWN:
-                        video = video & ~(PM3VideoControl_HSYNC_MASK |
-                                          PM3VideoControl_VSYNC_MASK |
-                                          PM3VideoControl_BLANK_ACTIVE_LOW);
-                        break;
-                default:
-                        DPRINTK(1, "Unsupported blanking %d\n",
-                                blank_mode);
-                        return (1);
-                        break;
-                }
-        }
-
-        PM3_SLOW_WRITE_REG(PM3VideoControl, video);
-
-        return (0);
-}
-
-static void pm3fb_set_disp(const void *par, struct display *disp,
-                           struct fb_info_gen *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-        struct pm3fb_par *p = (struct pm3fb_par *) par;
-        u32 flags;
-
-        DTRACE;
-
-        local_irq_save(flags);
-        info->info.screen_base = l_fb_info->v_fb;
-        switch (p->depth) {
-#ifdef FBCON_HAS_CFB8
-        case 8:
-#ifdef PM3FB_USE_ACCEL
-                if (!(noaccel[l_fb_info->board_num]))
-                        disp->dispsw = &pm3fb_cfb8;
-                else
-#endif /* PM3FB_USE_ACCEL */
-                        disp->dispsw = &fbcon_cfb8;
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                video = video | PM3VideoControl_ENABLE;
                 break;
-#endif
-#ifdef FBCON_HAS_CFB16
-        case 12:
-#ifdef PM3FB_USE_ACCEL
-                if (!(noaccel[l_fb_info->board_num]))
-                        disp->dispsw = &pm3fb_cfb16;
-                else
-#endif /* PM3FB_USE_ACCEL */
-                        disp->dispsw = &fbcon_cfb16;
-                disp->dispsw_data = l_fb_info->cmap.cmap12;
+        case FB_BLANK_NORMAL:   /* FIXME */
+                video = video & ~(PM3VideoControl_ENABLE);
                 break;
-        case 15:
-#ifdef PM3FB_USE_ACCEL
-                if (!(noaccel[l_fb_info->board_num]))
-                        disp->dispsw = &pm3fb_cfb16;
-                else
-#endif /* PM3FB_USE_ACCEL */
-                        disp->dispsw = &fbcon_cfb16;
-                disp->dispsw_data = l_fb_info->cmap.cmap15;
+        case FB_BLANK_HSYNC_SUSPEND:
+                video = video & ~(PM3VideoControl_HSYNC_MASK |
+                                  PM3VideoControl_BLANK_ACTIVE_LOW);
                 break;
-        case 16:
-#ifdef PM3FB_USE_ACCEL
-                if (!(noaccel[l_fb_info->board_num]))
-                        disp->dispsw = &pm3fb_cfb16;
-                else
-#endif /* PM3FB_USE_ACCEL */
-                        disp->dispsw = &fbcon_cfb16;
-                disp->dispsw_data = l_fb_info->cmap.cmap16;
+        case FB_BLANK_VSYNC_SUSPEND:
+                video = video & ~(PM3VideoControl_VSYNC_MASK |
+                                  PM3VideoControl_BLANK_ACTIVE_LOW);
                 break;
-#endif
-#ifdef FBCON_HAS_CFB32
-        case 32:
-#ifdef PM3FB_USE_ACCEL
-                if (!(noaccel[l_fb_info->board_num]))
-                        disp->dispsw = &pm3fb_cfb32;
-                else
-#endif /* PM3FB_USE_ACCEL */
-                        disp->dispsw = &fbcon_cfb32;
-                disp->dispsw_data = l_fb_info->cmap.cmap32;
+        case FB_BLANK_POWERDOWN:
+                video = video & ~(PM3VideoControl_HSYNC_MASK |
+                                  PM3VideoControl_VSYNC_MASK |
+                                  PM3VideoControl_BLANK_ACTIVE_LOW);
                 break;
-#endif /* FBCON_HAS_CFB32 */
         default:
-                disp->dispsw = &fbcon_dummy;
-                DPRINTK(1, "Invalid depth, using fbcon_dummy\n");
-                break;
+                DPRINTK("Unsupported blanking %d\n", blank_mode);
+                return 1;
         }
-        local_irq_restore(flags);
+
+        PM3_SLOW_WRITE_REG(par,PM3VideoControl, video);
+
+        return 0;
 }
 
-/* */
-static void pm3fb_detect(void)
-{
-        struct pci_dev *dev_array[PM3_MAX_BOARD];
-        struct pci_dev *dev = NULL;
-        struct pm3fb_info *l_fb_info = &(fb_info[0]);
-        unsigned long i, j, done;
+        /*
+         *  Frame buffer operations
+         */
 
-        DTRACE;
+static struct fb_ops pm3fb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = pm3fb_check_var,
+        .fb_set_par     = pm3fb_set_par,
+        .fb_setcolreg   = pm3fb_setcolreg,
+        .fb_pan_display = pm3fb_pan_display,
+        .fb_fillrect    = cfb_fillrect,         /* Needed !!! */
+        .fb_copyarea    = cfb_copyarea,         /* Needed !!! */
+        .fb_imageblit   = cfb_imageblit,        /* Needed !!! */
+        .fb_blank       = pm3fb_blank,
+};
 
-        for (i = 0; i < PM3_MAX_BOARD; i++) {
-                dev_array[i] = NULL;
-                fb_info[i].dev = NULL;
-        }
+/* ------------------------------------------------------------------------- */
 
-        dev = pci_get_device(PCI_VENDOR_ID_3DLABS,
-                            PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
+        /*
+         *  Initialization
+         */
 
-        for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) {
-                dev_array[i] = dev;
-                dev = pci_get_device(PCI_VENDOR_ID_3DLABS,
-                                    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
-        }
+/* mmio register are already mapped when this function is called */
+/* the pm3fb_fix.smem_start is also set */
+static unsigned long pm3fb_size_memory(struct pm3_par *par)
+{
+        unsigned long   memsize = 0, tempBypass, i, temp1, temp2;
+        unsigned char   __iomem *screen_mem;
 
-        if (dev) {              /* more than PM3_MAX_BOARD */
-                printk(KERN_WARNING "pm3fb: Warning: more than %d boards found\n",
-                       PM3_MAX_BOARD);
+        pm3fb_fix.smem_len = 64 * 1024 * 1024; /* request full aperture size */
+        /* Linear frame buffer - request region and map it. */
+        if (!request_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len,
+                                 "pm3fb smem")) {
+                printk(KERN_WARNING "pm3fb: Can't reserve smem.\n");
+                return 0;
         }
-
-        if (!dev_array[0]) {    /* not a single board, abort */
-                return;
+        screen_mem =
+                ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+        if (!screen_mem) {
+                printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");
+                release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+                return 0;
         }
 
-        /* allocate user-defined boards */
-        for (i = 0; i < PM3_MAX_BOARD; i++) {
-                if ((bus[i] >= 0) && (slot[i] >= 0) && (func[i] >= 0)) {
-                        for (j = 0; j < PM3_MAX_BOARD; j++) {
-                                if ((dev_array[j] != NULL) &&
-                                    (dev_array[j]->bus->number == bus[i])
-                                    && (PCI_SLOT(dev_array[j]->devfn) ==
-                                        slot[i])
-                                    && (PCI_FUNC(dev_array[j]->devfn) ==
-                                        func[i])) {
-                                        fb_info[i].dev = dev_array[j];
-                                        dev_array[j] = NULL;
-                                }
-                        }
-                }
+        /* TODO: card-specific stuff, *before* accessing *any* FB memory */
+        /* For Appian Jeronimo 2000 board second head */
+
+        tempBypass = PM3_READ_REG(par, PM3MemBypassWriteMask);
+
+        DPRINTK("PM3MemBypassWriteMask was: 0x%08lx\n", tempBypass);
+
+        PM3_SLOW_WRITE_REG(par, PM3MemBypassWriteMask, 0xFFFFFFFF);
+
+        /* pm3 split up memory, replicates, and do a lot of nasty stuff IMHO ;-) */
+        for (i = 0; i < 32; i++) {
+                fb_writel(i * 0x00345678,
+                          (screen_mem + (i * 1048576)));
+                mb();
+                temp1 = fb_readl((screen_mem + (i * 1048576)));
+
+                /* Let's check for wrapover, write will fail at 16MB boundary */
+                if (temp1 == (i * 0x00345678))
+                        memsize = i;
+                else
+                        break;
         }
-        /* allocate remaining boards */
-        for (i = 0; i < PM3_MAX_BOARD; i++) {
-                if (fb_info[i].dev == NULL) {
-                        done = 0;
-                        for (j = 0; ((j < PM3_MAX_BOARD) && (!done)); j++) {
-                                if (dev_array[j] != NULL) {
-                                        fb_info[i].dev = dev_array[j];
-                                        dev_array[j] = NULL;
-                                        done = 1;
-                                }
-                        }
+
+        DPRINTK("First detect pass already got %ld MB\n", memsize + 1);
+
+        if (memsize + 1 == i) {
+                for (i = 0; i < 32; i++) {
+                        /* Clear first 32MB ; 0 is 0, no need to byteswap */
+                        writel(0x0000000,
+                               (screen_mem + (i * 1048576)));
+                        mb();
                 }
-        }
 
-        /* at that point, all PCI Permedia3 are detected and allocated */
-        /* now, initialize... or not */
-        for (i = 0; i < PM3_MAX_BOARD; i++) {
-                l_fb_info = &(fb_info[i]);
-                if (l_fb_info->dev && !disable[i]) {    /* PCI device was found and not disabled by user */
-                        DPRINTK(2,
-                                "found @%lx Vendor %lx Device %lx ; base @ : %lx - %lx - %lx - %lx - %lx - %lx, irq %ld\n",
-                                (unsigned long) l_fb_info->dev,
-                                (unsigned long) l_fb_info->dev->vendor,
-                                (unsigned long) l_fb_info->dev->device,
-                                (unsigned long)
-                                pci_resource_start(l_fb_info->dev, 0),
-                                (unsigned long)
-                                pci_resource_start(l_fb_info->dev, 1),
-                                (unsigned long)
-                                pci_resource_start(l_fb_info->dev, 2),
-                                (unsigned long)
-                                pci_resource_start(l_fb_info->dev, 3),
-                                (unsigned long)
-                                pci_resource_start(l_fb_info->dev, 4),
-                                (unsigned long)
-                                pci_resource_start(l_fb_info->dev, 5),
-                                (unsigned long) l_fb_info->dev->irq);
-
-                        l_fb_info->pIOBase =
-                            (unsigned char *)
-                            pci_resource_start(l_fb_info->dev, 0);
-#ifdef __BIG_ENDIAN
-                        l_fb_info->pIOBase += PM3_REGS_SIZE;
-#endif
-                        l_fb_info->vIOBase = (unsigned char *) -1;
-                        l_fb_info->p_fb =
-                            (unsigned char *)
-                            pci_resource_start(l_fb_info->dev, 1);
-                        l_fb_info->v_fb = (unsigned char *) -1;
-
-                                if (!request_mem_region
-                            ((unsigned long)l_fb_info->p_fb, 64 * 1024 * 1024, /* request full aperture size */
-                             "pm3fb")) {
-                                printk
-                                    (KERN_ERR "pm3fb: Error: couldn't request framebuffer memory, board #%ld\n",
-                                     l_fb_info->board_num);
-                                continue;
-                        }
-                        if (!request_mem_region
-                            ((unsigned long)l_fb_info->pIOBase, PM3_REGS_SIZE,
-                             "pm3fb I/O regs")) {
-                                printk
-                                    (KERN_ERR "pm3fb: Error: couldn't request IObase memory, board #%ld\n",
-                                     l_fb_info->board_num);
-                                continue;
-                        }
-                        if (forcesize[l_fb_info->board_num])
-                                l_fb_info->fb_size = forcesize[l_fb_info->board_num];
-
-                        l_fb_info->fb_size =
-                            pm3fb_size_memory(l_fb_info);
-                                if (l_fb_info->fb_size) {
-                                (void) pci_enable_device(l_fb_info->dev);
-                                pm3fb_common_init(l_fb_info);
-                        } else
-                                printk(KERN_ERR "pm3fb: memory problem, not enabling board #%ld\n", l_fb_info->board_num);
+                for (i = 32; i < 64; i++) {
+                        fb_writel(i * 0x00345678,
+                                  (screen_mem + (i * 1048576)));
+                        mb();
+                        temp1 =
+                            fb_readl((screen_mem + (i * 1048576)));
+                        temp2 =
+                            fb_readl((screen_mem + ((i - 32) * 1048576)));
+                        /* different value, different RAM... */
+                        if ((temp1 == (i * 0x00345678)) && (temp2 == 0))
+                                memsize = i;
+                        else
+                                break;
                 }
         }
-}
+        DPRINTK("Second detect pass got %ld MB\n", memsize + 1);
 
-static int pm3fb_pan_display(const struct fb_var_screeninfo *var,
-                             struct fb_info_gen *info)
-{
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
+        PM3_SLOW_WRITE_REG(par, PM3MemBypassWriteMask, tempBypass);
 
-        DTRACE;
+        iounmap(screen_mem);
+        release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+        memsize = 1048576 * (memsize + 1);
 
-        if (!current_par_valid[l_fb_info->board_num])
-                return -EINVAL;
+        DPRINTK("Returning 0x%08lx bytes\n", memsize);
 
-        l_fb_info->current_par->base =  /* in 128 bits chunk - i.e. AFTER Shiftbpp */
-            pm3fb_Shiftbpp(l_fb_info,
-                           l_fb_info->current_par->depth,
-                           (var->yoffset * l_fb_info->current_par->width) +
-                           var->xoffset);
-        PM3_SLOW_WRITE_REG(PM3ScreenBase, l_fb_info->current_par->base);
-        return 0;
+        return memsize;
 }
 
-static int pm3fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
+static int __devinit pm3fb_probe(struct pci_dev *dev,
+                                  const struct pci_device_id *ent)
 {
-        struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info;
-        u32 cm, i;
-#ifdef PM3FB_MASTER_DEBUG
-        char cc[3];
-#endif /* PM3FB_MASTER_DEBUG */
+        struct fb_info *info;
+        struct pm3_par *par;
+        struct device* device = &dev->dev; /* for pci drivers */
+        int err, retval = -ENXIO;
 
-        switch(cmd)
-        {
-#ifdef PM3FB_MASTER_DEBUG
-        case PM3FBIO_CLEARMEMORY:
-                if (copy_from_user(&cm, (void *)arg, sizeof(u32)))
-                        return(-EFAULT);
-                pm3fb_clear_memory(l_fb_info, cm);
-                return(0);
-                break;
+        err = pci_enable_device(dev);
+        if (err) {
+                printk(KERN_WARNING "pm3fb: Can't enable PCI dev: %d\n", err);
+                return err;
+        }
+        /*
+         * Dynamically allocate info and par
+         */
+        info = framebuffer_alloc(sizeof(struct pm3_par), device);
 
-        case PM3FBIO_CLEARCMAP:
-                if (copy_from_user(cc, (void*)arg, 3 * sizeof(char)))
-                        return(-EFAULT);
-                pm3fb_clear_colormap(l_fb_info, cc[0], cc[1], cc[2]);
-                return(0);
-                break;
-#endif /* PM3FB_MASTER_DEBUG */
-
-        case PM3FBIO_RESETCHIP:
-                cm = 1;
-                PM3_SLOW_WRITE_REG(PM3ResetStatus, 1);
-                for (i = 0 ; (i < 10000) && cm ; i++)
-                {
-                        PM3_DELAY(10);
-                        cm = PM3_READ_REG(PM3ResetStatus);
-                }
-                if (cm)
-                {
-                        printk(KERN_ERR "pm3fb: chip reset failed with status 0x%x\n", cm);
-                        return(-EIO);
-                }
-                /* first thing first, reload memory timings */
-                pm3fb_write_memory_timings(l_fb_info);
-#ifdef PM3FB_USE_ACCEL
-                pm3fb_init_engine(l_fb_info);
-#endif /* PM3FB_USE_ACCEL */
-                pm3fb_write_mode(l_fb_info);
-                return(0);
-                break;
+        if (!info)
+                return -ENOMEM;
+        par = info->par;
 
-        default:
-                DPRINTK(2, "unknown ioctl: %d (%x)\n", cmd, cmd);
-                return(-EINVAL);
+        /*
+         * Here we set the screen_base to the virtual memory address
+         * for the framebuffer.
+         */
+        pm3fb_fix.mmio_start = pci_resource_start(dev, 0);
+        pm3fb_fix.mmio_len = PM3_REGS_SIZE;
+
+        /* Registers - request region and map it. */
+        if (!request_mem_region(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len,
+                                 "pm3fb regbase")) {
+                printk(KERN_WARNING "pm3fb: Can't reserve regbase.\n");
+                goto err_exit_neither;
+        }
+        par->v_regs =
+                ioremap_nocache(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
+        if (!par->v_regs) {
+                printk(KERN_WARNING "pm3fb: Can't remap %s register area.\n",
+                        pm3fb_fix.id);
+                release_mem_region(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
+                goto err_exit_neither;
+        }
+
+#if defined(__BIG_ENDIAN)
+        pm3fb_fix.mmio_start += PM3_REGS_SIZE;
+        DPRINTK("Adjusting register base for big-endian.\n");
+#endif
+        /* Linear frame buffer - request region and map it. */
+        pm3fb_fix.smem_start = pci_resource_start(dev, 1);
+        pm3fb_fix.smem_len = pm3fb_size_memory(par);
+        if (!pm3fb_fix.smem_len)
+        {
+                printk(KERN_WARNING "pm3fb: Can't find memory on board.\n");
+                goto err_exit_mmio;
         }
-}
+        if (!request_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len,
+                                 "pm3fb smem")) {
+                printk(KERN_WARNING "pm3fb: Can't reserve smem.\n");
+                goto err_exit_mmio;
+        }
+        info->screen_base =
+                ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+        if (!info->screen_base) {
+                printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");
+                release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+                goto err_exit_mmio;
+        }
+        info->screen_size = pm3fb_fix.smem_len;
 
-/* ****************************************** */
-/* ***** standard FB API init functions ***** */
-/* ****************************************** */
+        info->fbops = &pm3fb_ops;
 
-int __init pm3fb_setup(char *options)
-{
-        long opsi = strlen(options);
+        par->video = PM3_READ_REG(par, PM3VideoControl);
 
-        DTRACE;
+        info->fix = pm3fb_fix;
+        info->pseudo_palette = par->palette;
+        info->flags = FBINFO_DEFAULT;/* | FBINFO_HWACCEL_YPAN;*/
 
-        memcpy(g_options, options,
-               ((opsi + 1) >
-                PM3_OPTIONS_SIZE) ? PM3_OPTIONS_SIZE : (opsi + 1));
-        g_options[PM3_OPTIONS_SIZE - 1] = 0;
+        /*
+         * This should give a reasonable default video mode. The following is
+         * done when we can set a video mode.
+         */
+        if (!mode_option)
+                mode_option = "640x480@60";
+
+        retval = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
+
+        if (!retval || retval == 4) {
+                retval = -EINVAL;
+                goto err_exit_both;
+        }
+
+        /* This has to been done !!! */
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                retval = -ENOMEM;
+                goto err_exit_both;
+        }
 
-        return (0);
+        /*
+         * For drivers that can...
+         */
+        pm3fb_check_var(&info->var, info);
+
+        if (register_framebuffer(info) < 0) {
+                retval = -EINVAL;
+                goto err_exit_all;
+        }
+        printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
+           info->fix.id);
+        pci_set_drvdata(dev, info); /* or dev_set_drvdata(device, info) */
+        return 0;
+
+ err_exit_all:
+        fb_dealloc_cmap(&info->cmap);
+ err_exit_both:
+        iounmap(info->screen_base);
+        release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+ err_exit_mmio:
+        iounmap(par->v_regs);
+        release_mem_region(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
+ err_exit_neither:
+        framebuffer_release(info);
+        return retval;
 }
 
-int __init pm3fb_init(void)
+        /*
+         *  Cleanup
+         */
+static void __devexit pm3fb_remove(struct pci_dev *dev)
 {
-        DTRACE;
+        struct fb_info *info = pci_get_drvdata(dev);
 
-        DPRINTK(2, "This is pm3fb.c, CVS version: $Header: /cvsroot/linux/drivers/video/pm3fb.c,v 1.1 2002/02/25 19:11:06 marcelo Exp $");
+        if (info) {
+                struct fb_fix_screeninfo *fix = &info->fix;
+                struct pm3_par *par = info->par;
 
-        pm3fb_real_setup(g_options);
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
 
-        pm3fb_detect();
+                iounmap(info->screen_base);
+                release_mem_region(fix->smem_start, fix->smem_len);
+                iounmap(par->v_regs);
+                release_mem_region(fix->mmio_start, fix->mmio_len);
 
-        if (!fb_info[0].dev) {  /* not even one board ??? */
-                DPRINTK(1, "No PCI Permedia3 board detected\n");
+                pci_set_drvdata(dev, NULL);
+                framebuffer_release(info);
         }
-        return (0);
 }
 
-/* ************************* */
-/* **** Module support ***** */
-/* ************************* */
-
-#ifdef MODULE
-MODULE_AUTHOR("Romain Dolbeau");
-MODULE_DESCRIPTION("Permedia3 framebuffer device driver");
-static char *mode[PM3_MAX_BOARD];
-module_param_array(mode, charp, NULL, 0);
-MODULE_PARM_DESC(mode,"video mode");
-module_param_array(disable, short, NULL, 0);
-MODULE_PARM_DESC(disable,"disable board");
-static short off[PM3_MAX_BOARD];
-module_param_array(off, short, NULL, 0);
-MODULE_PARM_DESC(off,"disable board");
-static char *pciid[PM3_MAX_BOARD];
-module_param_array(pciid, charp, NULL, 0);
-MODULE_PARM_DESC(pciid,"board PCI Id");
-module_param_array(noaccel, short, NULL, 0);
-MODULE_PARM_DESC(noaccel,"disable accel");
-static char *font[PM3_MAX_BOARD];
-module_param_array(font, charp, NULL, 0);
-MODULE_PARM_DESC(font,"choose font");
-module_param(depth, short, NULL, 0);
-MODULE_PARM_DESC(depth,"boot-time depth");
-module_param(printtimings, short, NULL, 0);
-MODULE_PARM_DESC(printtimings, "print the memory timings of the card(s)");
-module_param(forcesize, short, NULL, 0);
-MODULE_PARM_DESC(forcesize, "force specified memory size");
-/*
-MODULE_SUPPORTED_DEVICE("Permedia3 PCI boards")
-MODULE_GENERIC_TABLE(gtype,name)
-MODULE_DEVICE_TABLE(type,name)
-*/
+static struct pci_device_id pm3fb_id_table[] = {
+        { PCI_VENDOR_ID_3DLABS, 0x0a,
+          PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
+          0xff0000, 0 },
+        { 0, }
+};
 
-void pm3fb_build_options(void)
-{
-        int i;
-        char ts[128];
+/* For PCI drivers */
+static struct pci_driver pm3fb_driver = {
+        .name =         "pm3fb",
+        .id_table =     pm3fb_id_table,
+        .probe =        pm3fb_probe,
+        .remove =       __devexit_p(pm3fb_remove),
+};
 
-        strcpy(g_options, "pm3fb");
-        for (i = 0; i < PM3_MAX_BOARD ; i++)
-        {
-                if (mode[i])
-                {
-                        sprintf(ts, ",mode:%d:%s", i, mode[i]);
-                        strncat(g_options, ts, PM3_OPTIONS_SIZE - strlen(g_options));
-                }
-                if (disable[i] || off[i])
-                {
-                        sprintf(ts, ",disable:%d:", i);
-                        strncat(g_options, ts, PM3_OPTIONS_SIZE - strlen(g_options));
-                }
-                if (pciid[i])
-                {
-                        sprintf(ts, ",pciid:%d:%s", i, pciid[i]);
-                        strncat(g_options, ts, PM3_OPTIONS_SIZE - strlen(g_options));
-                }
-                if (noaccel[i])
-                {
-                        sprintf(ts, ",noaccel:%d:", i);
-                        strncat(g_options, ts, PM3_OPTIONS_SIZE - strlen(g_options));
-                }
-                if (font[i])
-                {
-                        sprintf(ts, ",font:%d:%s", i, font[i]);
-                        strncat(g_options, ts, PM3_OPTIONS_SIZE - strlen(g_options));
-                }
-                if (depth[i])
-                {
-                        sprintf(ts, ",depth:%d:%d", i, depth[i]);
-                        strncat(g_options, ts, PM3_OPTIONS_SIZE - strlen(g_options));
-                }
-        }
-        g_options[PM3_OPTIONS_SIZE - 1] = '\0';
-        DPRINTK(1, "pm3fb use options: %s\n", g_options);
-}
+MODULE_DEVICE_TABLE(pci, pm3fb_id_table);
 
-int init_module(void)
+int __init pm3fb_init(void)
 {
-        DTRACE;
+        /*
+         *  For kernel boot options (in 'video=pm3fb:<options>' format)
+         */
+#ifndef MODULE
+        char *option = NULL;
 
-        pm3fb_build_options();
+        if (fb_get_options("pm3fb", &option))
+                return -ENODEV;
+        pm3fb_setup(option);
+#endif
 
-        pm3fb_init();
+        return pci_register_driver(&pm3fb_driver);
+}
 
-        return 0;
+static void __exit pm3fb_exit(void)
+{
+        pci_unregister_driver(&pm3fb_driver);
 }
 
-void cleanup_module(void)
+#ifndef MODULE
+        /*
+         *  Setup
+         */
+
+/*
+ * Only necessary if your driver takes special options,
+ * otherwise we fall back on the generic fb_setup().
+ */
+int __init pm3fb_setup(char *options)
 {
-        DTRACE;
-        {
-                unsigned long i;
-                struct pm3fb_info *l_fb_info;
-                for (i = 0; i < PM3_MAX_BOARD; i++) {
-                        l_fb_info = &(fb_info[i]);
-                        pci_dev_put(l_fb_info->dev);
-                        if (l_fb_info->dev != NULL  && !(disable[l_fb_info->board_num])) {
-                                if (l_fb_info->vIOBase != (unsigned char *) -1) {
-                                        pm3fb_unmapIO(l_fb_info);
-                                        release_mem_region(l_fb_info->p_fb,
-                                                   l_fb_info->fb_size);
-                                        release_mem_region(l_fb_info->pIOBase,
-                                                   PM3_REGS_SIZE);
-                                }
-                                unregister_framebuffer(&l_fb_info->gen.info);
-                        }
-                }
-        }
+        /* Parse user speficied options (`video=pm3fb:') */
+        return 0;
 }
 #endif /* MODULE */
+
+module_init(pm3fb_init);
+module_exit(pm3fb_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 07d1979bc23e..9756a728b74f 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -898,8 +898,8 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
         }
 
         ps3fb.dev = dev;
-        error = ps3_alloc_irq(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
-                              &ps3fb.irq_no);
+        error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
+                                   &ps3fb.irq_no);
         if (error) {
                 printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__,
                        error);
@@ -911,7 +911,7 @@ static int ps3fb_vsync_settings(struct gpu_driver_info *dinfo, void *dev)
         if (error) {
                 printk(KERN_ERR "%s: request_irq failed %d\n", __func__,
                        error);
-                ps3_free_irq(ps3fb.irq_no);
+                ps3_irq_plug_destroy(ps3fb.irq_no);
                 return error;
         }
 
@@ -1083,7 +1083,7 @@ err_framebuffer_release:
         framebuffer_release(info);
 err_free_irq:
         free_irq(ps3fb.irq_no, ps3fb.dev);
-        ps3_free_irq(ps3fb.irq_no);
+        ps3_irq_plug_destroy(ps3fb.irq_no);
 err_iounmap_dinfo:
         iounmap((u8 __iomem *)ps3fb.dinfo);
 err_gpu_context_free:
@@ -1099,7 +1099,7 @@ static void ps3fb_shutdown(struct platform_device *dev)
         ps3fb_flip_ctl(0);      /* flip off */
         ps3fb.dinfo->irq.mask = 0;
         free_irq(ps3fb.irq_no, ps3fb.dev);
-        ps3_free_irq(ps3fb.irq_no);
+        ps3_irq_plug_destroy(ps3fb.irq_no);
         iounmap((u8 __iomem *)ps3fb.dinfo);
 }
 
@@ -1114,7 +1114,7 @@ void ps3fb_cleanup(void)
         }
         if (ps3fb.irq_no) {
                 free_irq(ps3fb.irq_no, ps3fb.dev);
-                ps3_free_irq(ps3fb.irq_no);
+                ps3_irq_plug_destroy(ps3fb.irq_no);
         }
         iounmap((u8 __iomem *)ps3fb.dinfo);
 
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index a93618bc9d27..df2909ae704c 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -214,7 +214,7 @@ static int pvr2_init_cable(void);
 static int pvr2_get_param(const struct pvr2_params *p, const char *s,
                             int val, int size);
 #ifdef CONFIG_SH_DMA
-static ssize_t pvr2fb_write(struct file *file, const char *buf,
+static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                             size_t count, loff_t *ppos);
 #endif
 
@@ -674,7 +674,7 @@ static int pvr2_init_cable(void)
 }
 
 #ifdef CONFIG_SH_DMA
-static ssize_t pvr2fb_write(struct file *file, const char *buf,
+static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                             size_t count, loff_t *ppos)
 {
         unsigned long dst, start, end, len;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 0b195f33f84f..81e571d59b50 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1203,7 +1203,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                                         } else
                                                 goto done;
                                         break;
-                                case '0'...'9':
+                                case '0' ... '9':
                                         break;
                                 default:
                                         goto done;
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index d7ece8d17a2c..0fe547842c64 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -317,15 +317,15 @@ static int riva_bl_update_status(struct backlight_device *bd)
         else
                 level = bd->props.brightness;
 
-        tmp_pmc = par->riva.PMC[0x10F0/4] & 0x0000FFFF;
-        tmp_pcrt = par->riva.PCRTC0[0x081C/4] & 0xFFFFFFFC;
+        tmp_pmc = NV_RD32(par->riva.PMC, 0x10F0) & 0x0000FFFF;
+        tmp_pcrt = NV_RD32(par->riva.PCRTC0, 0x081C) & 0xFFFFFFFC;
         if(level > 0) {
                 tmp_pcrt |= 0x1;
                 tmp_pmc |= (1 << 31); /* backlight bit */
                 tmp_pmc |= riva_bl_get_level_brightness(par, level) << 16; /* level */
         }
-        par->riva.PCRTC0[0x081C/4] = tmp_pcrt;
-        par->riva.PMC[0x10F0/4] = tmp_pmc;
+        NV_WR32(par->riva.PCRTC0, 0x081C, tmp_pcrt);
+        NV_WR32(par->riva.PMC, 0x10F0, tmp_pmc);
 
         return 0;
 }
@@ -1760,13 +1760,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
         NVTRACE_ENTER();
         dp = pci_device_to_OF_node(pd);
         for (; dp != NULL; dp = dp->child) {
-                disptype = get_property(dp, "display-type", NULL);
+                disptype = of_get_property(dp, "display-type", NULL);
                 if (disptype == NULL)
                         continue;
                 if (strncmp(disptype, "LCD", 3) != 0)
                         continue;
                 for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = get_property(dp, propnames[i], NULL);
+                        pedid = of_get_property(dp, propnames[i], NULL);
                         if (pedid != NULL) {
                                 par->EDID = (unsigned char *)pedid;
                                 NVTRACE("LCD found.\n");
@@ -1788,8 +1788,10 @@ static int __devinit riva_get_EDID_i2c(struct fb_info *info)
 
         NVTRACE_ENTER();
         riva_create_i2c_busses(par);
-        for (i = 0; i < par->bus; i++) {
-                riva_probe_i2c_connector(par, i+1, &par->EDID);
+        for (i = 0; i < 3; i++) {
+                if (!par->chan[i].par)
+                        continue;
+                riva_probe_i2c_connector(par, i, &par->EDID);
                 if (par->EDID && !fb_parse_edid(par->EDID, &var)) {
                         printk(PFX "Found EDID Block from BUS %i\n", i);
                         break;
@@ -2104,7 +2106,7 @@ err_ret:
         return ret;
 }
 
-static void __exit rivafb_remove(struct pci_dev *pd)
+static void __devexit rivafb_remove(struct pci_dev *pd)
 {
         struct fb_info *info = pci_get_drvdata(pd);
         struct riva_par *par = info->par;
@@ -2185,7 +2187,7 @@ static struct pci_driver rivafb_driver = {
         .name           = "rivafb",
         .id_table       = rivafb_pci_tbl,
         .probe          = rivafb_probe,
-        .remove         = __exit_p(rivafb_remove),
+        .remove         = __devexit_p(rivafb_remove),
 };
 
 
diff --git a/drivers/video/riva/nv4ref.h b/drivers/video/riva/nv4ref.h
deleted file mode 100644
index 3b5f9117c37d..000000000000
--- a/drivers/video/riva/nv4ref.h
+++ /dev/null
@@ -1,2445 +0,0 @@
- /***************************************************************************\
-|*                                                                           *|
-|*       Copyright 1993-1998 NVIDIA, Corporation.  All rights reserved.      *|
-|*                                                                           *|
-|*     NOTICE TO USER:   The source code  is copyrighted under  U.S. and     *|
-|*     international laws.  Users and possessors of this source code are     *|
-|*     hereby granted a nonexclusive,  royalty-free copyright license to     *|
-|*     use this code in individual and commercial software.                  *|
-|*                                                                           *|
-|*     Any use of this source code must include,  in the user documenta-     *|
-|*     tion and  internal comments to the code,  notices to the end user     *|
-|*     as follows:                                                           *|
-|*                                                                           *|
-|*       Copyright 1993-1998 NVIDIA, Corporation.  All rights reserved.      *|
-|*                                                                           *|
-|*     NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY     *|
-|*     OF  THIS SOURCE  CODE  FOR ANY PURPOSE.  IT IS  PROVIDED  "AS IS"     *|
-|*     WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  NVIDIA, CORPOR-     *|
-|*     ATION DISCLAIMS ALL WARRANTIES  WITH REGARD  TO THIS SOURCE CODE,     *|
-|*     INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE-     *|
-|*     MENT,  AND FITNESS  FOR A PARTICULAR PURPOSE.   IN NO EVENT SHALL     *|
-|*     NVIDIA, CORPORATION  BE LIABLE FOR ANY SPECIAL,  INDIRECT,  INCI-     *|
-|*     DENTAL, OR CONSEQUENTIAL DAMAGES,  OR ANY DAMAGES  WHATSOEVER RE-     *|
-|*     SULTING FROM LOSS OF USE,  DATA OR PROFITS,  WHETHER IN AN ACTION     *|
-|*     OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  ARISING OUT OF     *|
-|*     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.     *|
-|*                                                                           *|
-|*     U.S. Government  End  Users.   This source code  is a "commercial     *|
-|*     item,"  as that  term is  defined at  48 C.F.R. 2.101 (OCT 1995),     *|
-|*     consisting  of "commercial  computer  software"  and  "commercial     *|
-|*     computer  software  documentation,"  as such  terms  are  used in     *|
-|*     48 C.F.R. 12.212 (SEPT 1995)  and is provided to the U.S. Govern-     *|
-|*     ment only as  a commercial end item.   Consistent with  48 C.F.R.     *|
-|*     12.212 and  48 C.F.R. 227.7202-1 through  227.7202-4 (JUNE 1995),     *|
-|*     all U.S. Government End Users  acquire the source code  with only     *|
-|*     those rights set forth herein.                                        *|
-|*                                                                           *|
- \***************************************************************************/
-
-/*
- * GPL licensing note -- nVidia is allowing a liberal interpretation of
- * the documentation restriction above, to merely say that this nVidia's
- * copyright and disclaimer should be included with all code derived
- * from this source.  -- Jeff Garzik <jgarzik@pobox.com>, 01/Nov/99 
- */
-
- /***************************************************************************\
-|*            Modified 1999 by Fredrik Reite (fredrik@reite.com)             *|
- \***************************************************************************/
-
-
-#ifndef __NV4REF_H__
-#define __NV4REF_H__
-
-/* Magic values to lock/unlock extended regs */
-#define NV_CIO_SR_LOCK_INDEX                                 0x0000001F /*       */
-#define NV_CIO_SR_UNLOCK_RW_VALUE                            0x00000057 /*       */
-#define NV_CIO_SR_UNLOCK_RO_VALUE                            0x00000075 /*       */
-#define NV_CIO_SR_LOCK_VALUE                                 0x00000099 /*       */
-
-#define UNLOCK_EXT_MAGIC 0x57
-#define LOCK_EXT_MAGIC 0x99 /* Any value other than 0x57 will do */
-
-#define LOCK_EXT_INDEX 0x6
-
-#define NV_PCRTC_HORIZ_TOTAL                                 0x00
-#define NV_PCRTC_HORIZ_DISPLAY_END                           0x01
-#define NV_PCRTC_HORIZ_BLANK_START                           0x02
-
-#define NV_PCRTC_HORIZ_BLANK_END                             0x03
-#define NV_PCRTC_HORIZ_BLANK_END_EVRA                        7:7
-#define NV_PCRTC_HORIZ_BLANK_END_DISPLAY_END_SKEW            6:5
-#define NV_PCRTC_HORIZ_BLANK_END_HORIZ_BLANK_END             4:0
-
-#define NV_PCRTC_HORIZ_RETRACE_START                         0x04
-
-#define NV_PCRTC_HORIZ_RETRACE_END                           0x05
-#define NV_PCRTC_HORIZ_RETRACE_END_HORIZ_BLANK_END_5         7:7
-#define NV_PCRTC_HORIZ_RETRACE_END_HORIZ_RETRACE_SKEW        6:5
-#define NV_PCRTC_HORIZ_RETRACE_END_HORIZ_RETRACE_END         4:0
-
-#define NV_PCRTC_VERT_TOTAL                                  0x06
-
-#define NV_PCRTC_OVERFLOW                                    0x07
-#define NV_PCRTC_OVERFLOW_VERT_RETRACE_START_9               7:7
-#define NV_PCRTC_OVERFLOW_VERT_DISPLAY_END_9                 6:6
-#define NV_PCRTC_OVERFLOW_VERT_TOTAL_9                       5:5
-#define NV_PCRTC_OVERFLOW_LINE_COMPARE_8                     4:4
-#define NV_PCRTC_OVERFLOW_VERT_BLANK_START_8                 3:3
-#define NV_PCRTC_OVERFLOW_VERT_RETRACE_START_8               2:2
-#define NV_PCRTC_OVERFLOW_VERT_DISPLAY_END_8                 1:1
-#define NV_PCRTC_OVERFLOW_VERT_TOTAL_8                       0:0
-
-#define NV_PCRTC_PRESET_ROW_SCAN                             0x08
-
-#define NV_PCRTC_MAX_SCAN_LINE                               0x09
-#define NV_PCRTC_MAX_SCAN_LINE_DOUBLE_SCAN                   7:7
-#define NV_PCRTC_MAX_SCAN_LINE_LINE_COMPARE_9                6:6
-#define NV_PCRTC_MAX_SCAN_LINE_VERT_BLANK_START_9            5:5
-#define NV_PCRTC_MAX_SCAN_LINE_MAX_SCAN_LINE                 4:0
-
-#define NV_PCRTC_CURSOR_START                                0x0A
-#define NV_PCRTC_CURSOR_END                                  0x0B
-#define NV_PCRTC_START_ADDR_HIGH                             0x0C
-#define NV_PCRTC_START_ADDR_LOW                              0x0D
-#define NV_PCRTC_CURSOR_LOCATION_HIGH                        0x0E
-#define NV_PCRTC_CURSOR_LOCATION_LOW                         0x0F
-
-#define NV_PCRTC_VERT_RETRACE_START                          0x10
-#define NV_PCRTC_VERT_RETRACE_END                            0x11
-#define NV_PCRTC_VERT_DISPLAY_END                            0x12
-#define NV_PCRTC_OFFSET                                      0x13
-#define NV_PCRTC_UNDERLINE_LOCATION                          0x14
-#define NV_PCRTC_VERT_BLANK_START                            0x15
-#define NV_PCRTC_VERT_BLANK_END                              0x16
-#define NV_PCRTC_MODE_CONTROL                                0x17
-#define NV_PCRTC_LINE_COMPARE                                0x18
-
-/* Extended offset and start address */
-#define NV_PCRTC_REPAINT0                                    0x19
-#define NV_PCRTC_REPAINT0_OFFSET_10_8                        7:5 
-#define NV_PCRTC_REPAINT0_START_ADDR_20_16                   4:0
-
-/* Horizonal extended bits */
-#define NV_PCRTC_HORIZ_EXTRA                                 0x2d
-#define NV_PCRTC_HORIZ_EXTRA_INTER_HALF_START_8              4:4
-#define NV_PCRTC_HORIZ_EXTRA_HORIZ_RETRACE_START_8           3:3
-#define NV_PCRTC_HORIZ_EXTRA_HORIZ_BLANK_START_8             2:2
-#define NV_PCRTC_HORIZ_EXTRA_DISPLAY_END_8                   1:1
-#define NV_PCRTC_HORIZ_EXTRA_DISPLAY_TOTAL_8                 0:0
-
-/* Assorted extra bits */
-#define NV_PCRTC_EXTRA                                       0x25
-#define NV_PCRTC_EXTRA_OFFSET_11                             5:5
-#define NV_PCRTC_EXTRA_HORIZ_BLANK_END_6                     4:4
-#define NV_PCRTC_EXTRA_VERT_BLANK_START_10                   3:3
-#define NV_PCRTC_EXTRA_VERT_RETRACE_START_10                 2:2
-#define NV_PCRTC_EXTRA_VERT_DISPLAY_END_10                   1:1
-#define NV_PCRTC_EXTRA_VERT_TOTAL_10                         0:0
-
-/* Controls how much data the refresh fifo requests */
-#define NV_PCRTC_FIFO_CONTROL                                0x1b
-#define NV_PCRTC_FIFO_CONTROL_UNDERFLOW_WARN                 7:7
-#define NV_PCRTC_FIFO_CONTROL_BURST_LENGTH                   2:0
-#define NV_PCRTC_FIFO_CONTROL_BURST_LENGTH_8                 0x0
-#define NV_PCRTC_FIFO_CONTROL_BURST_LENGTH_32                0x1
-#define NV_PCRTC_FIFO_CONTROL_BURST_LENGTH_64                0x2
-#define NV_PCRTC_FIFO_CONTROL_BURST_LENGTH_128               0x3
-#define NV_PCRTC_FIFO_CONTROL_BURST_LENGTH_256               0x4
-
-/* When the fifo occupancy falls below *twice* the watermark,
- * the refresh fifo will start to be refilled. If this value is 
- * too low, you will get junk on the screen. Too high, and performance
- * will suffer. Watermark in units of 8 bytes
- */
-#define NV_PCRTC_FIFO                                        0x20
-#define NV_PCRTC_FIFO_RESET                                  7:7
-#define NV_PCRTC_FIFO_WATERMARK                              5:0
-
-/* Various flags */
-#define NV_PCRTC_REPAINT1                                    0x1a
-#define NV_PCRTC_REPAINT1_HSYNC                              7:7
-#define NV_PCRTC_REPAINT1_HYSNC_DISABLE                      0x01
-#define NV_PCRTC_REPAINT1_HYSNC_ENABLE                       0x00
-#define NV_PCRTC_REPAINT1_VSYNC                              6:6
-#define NV_PCRTC_REPAINT1_VYSNC_DISABLE                      0x01
-#define NV_PCRTC_REPAINT1_VYSNC_ENABLE                       0x00
-#define NV_PCRTC_REPAINT1_COMPATIBLE_TEXT                    4:4
-#define NV_PCRTC_REPAINT1_COMPATIBLE_TEXT_ENABLE             0x01
-#define NV_PCRTC_REPAINT1_COMPATIBLE_TEXT_DISABLE            0x00
-#define NV_PCRTC_REPAINT1_LARGE_SCREEN                       2:2 
-#define NV_PCRTC_REPAINT1_LARGE_SCREEN_DISABLE               0x01
-#define NV_PCRTC_REPAINT1_LARGE_SCREEN_ENABLE                0x00 /* >=1280 */
-#define NV_PCRTC_REPAINT1_PALETTE_WIDTH                      1:1
-#define NV_PCRTC_REPAINT1_PALETTE_WIDTH_8BITS                0x00
-#define NV_PCRTC_REPAINT1_PALETTE_WIDTH_6BITS                0x01
-
-#define NV_PCRTC_GRCURSOR0                                   0x30
-#define NV_PCRTC_GRCURSOR0_START_ADDR_21_16                  5:0
-
-#define NV_PCRTC_GRCURSOR1                                   0x31
-#define NV_PCRTC_GRCURSOR1_START_ADDR_15_11                  7:3
-#define NV_PCRTC_GRCURSOR1_SCAN_DBL                          1:1
-#define NV_PCRTC_GRCURSOR1_SCAN_DBL_DISABLE                  0
-#define NV_PCRTC_GRCURSOR1_SCAN_DBL_ENABLE                   1
-#define NV_PCRTC_GRCURSOR1_CURSOR                            0:0
-#define NV_PCRTC_GRCURSOR1_CURSOR_DISABLE                    0 
-#define NV_PCRTC_GRCURSOR1_CURSOR_ENABLE                     1
-
-/* Controls what the format of the framebuffer is */
-#define NV_PCRTC_PIXEL                       0x28
-#define NV_PCRTC_PIXEL_MODE                  7:7
-#define NV_PCRTC_PIXEL_MODE_TV               0x01
-#define NV_PCRTC_PIXEL_MODE_VGA              0x00
-#define NV_PCRTC_PIXEL_TV_MODE               6:6
-#define NV_PCRTC_PIXEL_TV_MODE_NTSC          0x00
-#define NV_PCRTC_PIXEL_TV_MODE_PAL           0x01
-#define NV_PCRTC_PIXEL_TV_HORIZ_ADJUST       5:3
-#define NV_PCRTC_PIXEL_FORMAT                1:0
-#define NV_PCRTC_PIXEL_FORMAT_VGA            0x00
-#define NV_PCRTC_PIXEL_FORMAT_8BPP           0x01
-#define NV_PCRTC_PIXEL_FORMAT_16BPP          0x02
-#define NV_PCRTC_PIXEL_FORMAT_32BPP          0x03
-
-/* RAMDAC registers and fields */
-#define NV_PRAMDAC                            0x00680FFF:0x00680000 /* RW--D */
-#define NV_PRAMDAC_GRCURSOR_START_POS                    0x00680300 /* RW-4R */
-#define NV_PRAMDAC_GRCURSOR_START_POS_X                        11:0 /* RWXSF */
-#define NV_PRAMDAC_GRCURSOR_START_POS_Y                       27:16 /* RWXSF */
-#define NV_PRAMDAC_NVPLL_COEFF                           0x00680500 /* RW-4R */
-#define NV_PRAMDAC_NVPLL_COEFF_MDIV                             7:0 /* RWIUF */
-#define NV_PRAMDAC_NVPLL_COEFF_NDIV                            15:8 /* RWIUF */
-#define NV_PRAMDAC_NVPLL_COEFF_PDIV                           18:16 /* RWIVF */
-#define NV_PRAMDAC_MPLL_COEFF                            0x00680504 /* RW-4R */
-#define NV_PRAMDAC_MPLL_COEFF_MDIV                              7:0 /* RWIUF */
-#define NV_PRAMDAC_MPLL_COEFF_NDIV                             15:8 /* RWIUF */
-#define NV_PRAMDAC_MPLL_COEFF_PDIV                            18:16 /* RWIVF */
-#define NV_PRAMDAC_VPLL_COEFF                            0x00680508 /* RW-4R */
-#define NV_PRAMDAC_VPLL_COEFF_MDIV                              7:0 /* RWIUF */
-#define NV_PRAMDAC_VPLL_COEFF_NDIV                             15:8 /* RWIUF */
-#define NV_PRAMDAC_VPLL_COEFF_PDIV                            18:16 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT                      0x0068050C /* RW-4R */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_DLL_BYPASS                  4:4 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_DLL_BYPASS_FALSE     0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_DLL_BYPASS_TRUE      0x00000001 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_MPLL_SOURCE                 8:8 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_MPLL_SOURCE_DEFAULT  0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_MPLL_SOURCE_PROG     0x00000001 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_MPLL_BYPASS               12:12 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_MPLL_BYPASS_FALSE    0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_MPLL_BYPASS_TRUE     0x00000001 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VPLL_SOURCE               16:16 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VPLL_SOURCE_DEFAULT  0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VPLL_SOURCE_PROG     0x00000001 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VPLL_BYPASS               20:20 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VPLL_BYPASS_FALSE    0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VPLL_BYPASS_TRUE     0x00000001 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_PCLK_SOURCE               25:24 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_PCLK_SOURCE_VPLL     0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_PCLK_SOURCE_VIP      0x00000001 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_PCLK_SOURCE_XTALOSC  0x00000002 /* RW--V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO                28:28 /* RWIVF */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB1       0x00000000 /* RWI-V */
-#define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB2       0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL                       0x00680600 /* RW-4R */
-#define NV_PRAMDAC_GENERAL_CONTROL_FF_COEFF                     1:0 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_FF_COEFF_DEF          0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_IDC_MODE                     4:4 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_IDC_MODE_GAMMA        0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_IDC_MODE_INDEX        0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_VGA_STATE                    8:8 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_VGA_STATE_NOTSE       0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_VGA_STATE_SEL         0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_565_MODE                   12:12 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_565_MODE_NOTSEL       0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_565_MODE_SEL          0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_BLK_PEDSTL                 16:16 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_BLK_PEDSTL_OFF        0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_BLK_PEDSTL_ON         0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_TERMINATION                17:17 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_TERMINATION_37OHM     0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_TERMINATION_75OHM     0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_BPC                        20:20 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_BPC_6BITS             0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_BPC_8BITS             0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_DAC_SLEEP                  24:24 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_DAC_SLEEP_DIS         0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_DAC_SLEEP_EN          0x00000001 /* RW--V */
-#define NV_PRAMDAC_GENERAL_CONTROL_PALETTE_CLK                28:28 /* RWIVF */
-#define NV_PRAMDAC_GENERAL_CONTROL_PALETTE_CLK_EN        0x00000000 /* RWI-V */
-#define NV_PRAMDAC_GENERAL_CONTROL_PALETTE_CLK_DIS       0x00000001 /* RW--V */
-
-/* Master Control */
-#define NV_PMC                                0x00000FFF:0x00000000 /* RW--D */
-#define NV_PMC_BOOT_0                                    0x00000000 /* R--4R */
-#define NV_PMC_BOOT_0_MINOR_REVISION                            3:0 /* C--VF */
-#define NV_PMC_BOOT_0_MINOR_REVISION_0                   0x00000000 /* C---V */
-#define NV_PMC_BOOT_0_MAJOR_REVISION                            7:4 /* C--VF */
-#define NV_PMC_BOOT_0_MAJOR_REVISION_A                   0x00000000 /* C---V */
-#define NV_PMC_BOOT_0_MAJOR_REVISION_B                   0x00000001 /* ----V */
-#define NV_PMC_BOOT_0_IMPLEMENTATION                           11:8 /* C--VF */
-#define NV_PMC_BOOT_0_IMPLEMENTATION_NV4_0               0x00000000 /* C---V */
-#define NV_PMC_BOOT_0_ARCHITECTURE                            15:12 /* C--VF */
-#define NV_PMC_BOOT_0_ARCHITECTURE_NV0                   0x00000000 /* ----V */
-#define NV_PMC_BOOT_0_ARCHITECTURE_NV1                   0x00000001 /* ----V */
-#define NV_PMC_BOOT_0_ARCHITECTURE_NV2                   0x00000002 /* ----V */
-#define NV_PMC_BOOT_0_ARCHITECTURE_NV3                   0x00000003 /* ----V */
-#define NV_PMC_BOOT_0_ARCHITECTURE_NV4                   0x00000004 /* C---V */
-#define NV_PMC_BOOT_0_FIB_REVISION                            19:16 /* C--VF */
-#define NV_PMC_BOOT_0_FIB_REVISION_0                     0x00000000 /* C---V */
-#define NV_PMC_BOOT_0_MASK_REVISION                           23:20 /* C--VF */
-#define NV_PMC_BOOT_0_MASK_REVISION_A                    0x00000000 /* C---V */
-#define NV_PMC_BOOT_0_MASK_REVISION_B                    0x00000001 /* ----V */
-#define NV_PMC_BOOT_0_MANUFACTURER                            27:24 /* C--UF */
-#define NV_PMC_BOOT_0_MANUFACTURER_NVIDIA                0x00000000 /* C---V */
-#define NV_PMC_BOOT_0_FOUNDRY                                 31:28 /* C--VF */
-#define NV_PMC_BOOT_0_FOUNDRY_SGS                        0x00000000 /* ----V */
-#define NV_PMC_BOOT_0_FOUNDRY_HELIOS                     0x00000001 /* ----V */
-#define NV_PMC_BOOT_0_FOUNDRY_TSMC                       0x00000002 /* C---V */
-#define NV_PMC_INTR_0                                    0x00000100 /* RW-4R */
-#define NV_PMC_INTR_0_PMEDIA                                    4:4 /* R--VF */
-#define NV_PMC_INTR_0_PMEDIA_NOT_PENDING                 0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PMEDIA_PENDING                     0x00000001 /* R---V */
-#define NV_PMC_INTR_0_PFIFO                                     8:8 /* R--VF */
-#define NV_PMC_INTR_0_PFIFO_NOT_PENDING                  0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PFIFO_PENDING                      0x00000001 /* R---V */
-#define NV_PMC_INTR_0_PGRAPH                                  12:12 /* R--VF */
-#define NV_PMC_INTR_0_PGRAPH_NOT_PENDING                 0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PGRAPH_PENDING                     0x00000001 /* R---V */
-#define NV_PMC_INTR_0_PVIDEO                                  16:16 /* R--VF */
-#define NV_PMC_INTR_0_PVIDEO_NOT_PENDING                 0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PVIDEO_PENDING                     0x00000001 /* R---V */
-#define NV_PMC_INTR_0_PTIMER                                  20:20 /* R--VF */
-#define NV_PMC_INTR_0_PTIMER_NOT_PENDING                 0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PTIMER_PENDING                     0x00000001 /* R---V */
-#define NV_PMC_INTR_0_PCRTC                                   24:24 /* R--VF */
-#define NV_PMC_INTR_0_PCRTC_NOT_PENDING                  0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PCRTC_PENDING                      0x00000001 /* R---V */
-#define NV_PMC_INTR_0_PBUS                                    28:28 /* R--VF */
-#define NV_PMC_INTR_0_PBUS_NOT_PENDING                   0x00000000 /* R---V */
-#define NV_PMC_INTR_0_PBUS_PENDING                       0x00000001 /* R---V */
-#define NV_PMC_INTR_0_SOFTWARE                                31:31 /* RWIVF */
-#define NV_PMC_INTR_0_SOFTWARE_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PMC_INTR_0_SOFTWARE_PENDING                   0x00000001 /* RW--V */
-#define NV_PMC_INTR_EN_0                                 0x00000140 /* RW-4R */
-#define NV_PMC_INTR_EN_0_INTA                                   1:0 /* RWIVF */
-#define NV_PMC_INTR_EN_0_INTA_DISABLED                   0x00000000 /* RWI-V */
-#define NV_PMC_INTR_EN_0_INTA_HARDWARE                   0x00000001 /* RW--V */
-#define NV_PMC_INTR_EN_0_INTA_SOFTWARE                   0x00000002 /* RW--V */
-#define NV_PMC_INTR_READ_0                               0x00000160 /* R--4R */
-#define NV_PMC_INTR_READ_0_INTA                                 0:0 /* R--VF */
-#define NV_PMC_INTR_READ_0_INTA_LOW                      0x00000000 /* R---V */
-#define NV_PMC_INTR_READ_0_INTA_HIGH                     0x00000001 /* R---V */
-#define NV_PMC_ENABLE                                    0x00000200 /* RW-4R */
-#define NV_PMC_ENABLE_PMEDIA                                    4:4 /* RWIVF */
-#define NV_PMC_ENABLE_PMEDIA_DISABLED                    0x00000000 /* RWI-V */
-#define NV_PMC_ENABLE_PMEDIA_ENABLED                     0x00000001 /* RW--V */
-#define NV_PMC_ENABLE_PFIFO                                     8:8 /* RWIVF */
-#define NV_PMC_ENABLE_PFIFO_DISABLED                     0x00000000 /* RWI-V */
-#define NV_PMC_ENABLE_PFIFO_ENABLED                      0x00000001 /* RW--V */
-#define NV_PMC_ENABLE_PGRAPH                                  12:12 /* RWIVF */
-#define NV_PMC_ENABLE_PGRAPH_DISABLED                    0x00000000 /* RWI-V */
-#define NV_PMC_ENABLE_PGRAPH_ENABLED                     0x00000001 /* RW--V */
-#define NV_PMC_ENABLE_PPMI                                    16:16 /* RWIVF */
-#define NV_PMC_ENABLE_PPMI_DISABLED                      0x00000000 /* RWI-V */
-#define NV_PMC_ENABLE_PPMI_ENABLED                       0x00000001 /* RW--V */
-#define NV_PMC_ENABLE_PFB                                     20:20 /* RWIVF */
-#define NV_PMC_ENABLE_PFB_DISABLED                       0x00000000 /* RW--V */
-#define NV_PMC_ENABLE_PFB_ENABLED                        0x00000001 /* RWI-V */
-#define NV_PMC_ENABLE_PCRTC                                   24:24 /* RWIVF */
-#define NV_PMC_ENABLE_PCRTC_DISABLED                     0x00000000 /* RW--V */
-#define NV_PMC_ENABLE_PCRTC_ENABLED                      0x00000001 /* RWI-V */
-#define NV_PMC_ENABLE_PVIDEO                                  28:28 /* RWIVF */
-#define NV_PMC_ENABLE_PVIDEO_DISABLED                    0x00000000 /* RWI-V */
-#define NV_PMC_ENABLE_PVIDEO_ENABLED                     0x00000001 /* RW--V */
-
-/* dev_timer.ref */
-#define NV_PTIMER                             0x00009FFF:0x00009000 /* RW--D */
-#define NV_PTIMER_INTR_0                                 0x00009100 /* RW-4R */
-#define NV_PTIMER_INTR_0_ALARM                                  0:0 /* RWXVF */
-#define NV_PTIMER_INTR_0_ALARM_NOT_PENDING               0x00000000 /* R---V */
-#define NV_PTIMER_INTR_0_ALARM_PENDING                   0x00000001 /* R---V */
-#define NV_PTIMER_INTR_0_ALARM_RESET                     0x00000001 /* -W--V */
-#define NV_PTIMER_INTR_EN_0                              0x00009140 /* RW-4R */
-#define NV_PTIMER_INTR_EN_0_ALARM                               0:0 /* RWIVF */
-#define NV_PTIMER_INTR_EN_0_ALARM_DISABLED               0x00000000 /* RWI-V */
-#define NV_PTIMER_INTR_EN_0_ALARM_ENABLED                0x00000001 /* RW--V */
-#define NV_PTIMER_NUMERATOR                              0x00009200 /* RW-4R */
-#define NV_PTIMER_NUMERATOR_VALUE                              15:0 /* RWIUF */
-#define NV_PTIMER_NUMERATOR_VALUE_0                      0x00000000 /* RWI-V */
-#define NV_PTIMER_DENOMINATOR                            0x00009210 /* RW-4R */
-#define NV_PTIMER_DENOMINATOR_VALUE                            15:0 /* RWIUF */
-#define NV_PTIMER_DENOMINATOR_VALUE_0                    0x00000000 /* RWI-V */
-#define NV_PTIMER_TIME_0                                 0x00009400 /* RW-4R */
-#define NV_PTIMER_TIME_0_NSEC                                  31:5 /* RWXUF */
-#define NV_PTIMER_TIME_1                                 0x00009410 /* RW-4R */
-#define NV_PTIMER_TIME_1_NSEC                                  28:0 /* RWXUF */
-#define NV_PTIMER_ALARM_0                                0x00009420 /* RW-4R */
-#define NV_PTIMER_ALARM_0_NSEC                                 31:5 /* RWXUF */
-
-/* dev_fifo.ref */
-#define NV_PFIFO                              0x00003FFF:0x00002000 /* RW--D */
-#define NV_PFIFO_DELAY_0                                 0x00002040 /* RW-4R */
-#define NV_PFIFO_DELAY_0_WAIT_RETRY                             9:0 /* RWIUF */
-#define NV_PFIFO_DELAY_0_WAIT_RETRY_0                    0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_TIMESLICE                           0x00002044 /* RW-4R */
-#define NV_PFIFO_DMA_TIMESLICE_SELECT                          16:0 /* RWIUF */
-#define NV_PFIFO_DMA_TIMESLICE_SELECT_1                  0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_TIMESLICE_SELECT_16K                0x00003fff /* RW--V */
-#define NV_PFIFO_DMA_TIMESLICE_SELECT_32K                0x00007fff /* RW--V */
-#define NV_PFIFO_DMA_TIMESLICE_SELECT_64K                0x0000ffff /* RW--V */
-#define NV_PFIFO_DMA_TIMESLICE_SELECT_128K               0x0001ffff /* RW--V */
-#define NV_PFIFO_DMA_TIMESLICE_TIMEOUT                        24:24 /* RWIUF */
-#define NV_PFIFO_DMA_TIMESLICE_TIMEOUT_DISABLED          0x00000000 /* RW--V */
-#define NV_PFIFO_DMA_TIMESLICE_TIMEOUT_ENABLED           0x00000001 /* RWI-V */
-#define NV_PFIFO_PIO_TIMESLICE                           0x00002048 /* RW-4R */
-#define NV_PFIFO_PIO_TIMESLICE_SELECT                          16:0 /* RWIUF */
-#define NV_PFIFO_PIO_TIMESLICE_SELECT_1                  0x00000000 /* RWI-V */
-#define NV_PFIFO_PIO_TIMESLICE_SELECT_16K                0x00003fff /* RW--V */
-#define NV_PFIFO_PIO_TIMESLICE_SELECT_32K                0x00007fff /* RW--V */
-#define NV_PFIFO_PIO_TIMESLICE_SELECT_64K                0x0000ffff /* RW--V */
-#define NV_PFIFO_PIO_TIMESLICE_SELECT_128K               0x0001ffff /* RW--V */
-#define NV_PFIFO_PIO_TIMESLICE_TIMEOUT                        24:24 /* RWIUF */
-#define NV_PFIFO_PIO_TIMESLICE_TIMEOUT_DISABLED          0x00000000 /* RW--V */
-#define NV_PFIFO_PIO_TIMESLICE_TIMEOUT_ENABLED           0x00000001 /* RWI-V */
-#define NV_PFIFO_TIMESLICE                               0x0000204C /* RW-4R */
-#define NV_PFIFO_TIMESLICE_TIMER                               17:0 /* RWIUF */
-#define NV_PFIFO_TIMESLICE_TIMER_EXPIRED                 0x0003FFFF /* RWI-V */
-#define NV_PFIFO_NEXT_CHANNEL                            0x00002050 /* RW-4R */
-#define NV_PFIFO_NEXT_CHANNEL_CHID                              3:0 /* RWXUF */
-#define NV_PFIFO_NEXT_CHANNEL_MODE                              8:8 /* RWXVF */
-#define NV_PFIFO_NEXT_CHANNEL_MODE_PIO                   0x00000000 /* RW--V */
-#define NV_PFIFO_NEXT_CHANNEL_MODE_DMA                   0x00000001 /* RW--V */
-#define NV_PFIFO_NEXT_CHANNEL_SWITCH                          12:12 /* RWIVF */
-#define NV_PFIFO_NEXT_CHANNEL_SWITCH_NOT_PENDING         0x00000000 /* RWI-V */
-#define NV_PFIFO_NEXT_CHANNEL_SWITCH_PENDING             0x00000001 /* RW--V */
-#define NV_PFIFO_DEBUG_0                                 0x00002080 /* R--4R */
-#define NV_PFIFO_DEBUG_0_CACHE_ERROR0                           0:0 /* R-XVF */
-#define NV_PFIFO_DEBUG_0_CACHE_ERROR0_NOT_PENDING        0x00000000 /* R---V */
-#define NV_PFIFO_DEBUG_0_CACHE_ERROR0_PENDING            0x00000001 /* R---V */
-#define NV_PFIFO_DEBUG_0_CACHE_ERROR1                           4:4 /* R-XVF */
-#define NV_PFIFO_DEBUG_0_CACHE_ERROR1_NOT_PENDING        0x00000000 /* R---V */
-#define NV_PFIFO_DEBUG_0_CACHE_ERROR1_PENDING            0x00000001 /* R---V */
-#define NV_PFIFO_INTR_0                                  0x00002100 /* RW-4R */
-#define NV_PFIFO_INTR_0_CACHE_ERROR                             0:0 /* RWXVF */
-#define NV_PFIFO_INTR_0_CACHE_ERROR_NOT_PENDING          0x00000000 /* R---V */
-#define NV_PFIFO_INTR_0_CACHE_ERROR_PENDING              0x00000001 /* R---V */
-#define NV_PFIFO_INTR_0_CACHE_ERROR_RESET                0x00000001 /* -W--V */
-#define NV_PFIFO_INTR_0_RUNOUT                                  4:4 /* RWXVF */
-#define NV_PFIFO_INTR_0_RUNOUT_NOT_PENDING               0x00000000 /* R---V */
-#define NV_PFIFO_INTR_0_RUNOUT_PENDING                   0x00000001 /* R---V */
-#define NV_PFIFO_INTR_0_RUNOUT_RESET                     0x00000001 /* -W--V */
-#define NV_PFIFO_INTR_0_RUNOUT_OVERFLOW                         8:8 /* RWXVF */
-#define NV_PFIFO_INTR_0_RUNOUT_OVERFLOW_NOT_PENDING      0x00000000 /* R---V */
-#define NV_PFIFO_INTR_0_RUNOUT_OVERFLOW_PENDING          0x00000001 /* R---V */
-#define NV_PFIFO_INTR_0_RUNOUT_OVERFLOW_RESET            0x00000001 /* -W--V */
-#define NV_PFIFO_INTR_0_DMA_PUSHER                            12:12 /* RWXVF */
-#define NV_PFIFO_INTR_0_DMA_PUSHER_NOT_PENDING           0x00000000 /* R---V */
-#define NV_PFIFO_INTR_0_DMA_PUSHER_PENDING               0x00000001 /* R---V */
-#define NV_PFIFO_INTR_0_DMA_PUSHER_RESET                 0x00000001 /* -W--V */
-#define NV_PFIFO_INTR_0_DMA_PT                                16:16 /* RWXVF */
-#define NV_PFIFO_INTR_0_DMA_PT_NOT_PENDING               0x00000000 /* R---V */
-#define NV_PFIFO_INTR_0_DMA_PT_PENDING                   0x00000001 /* R---V */
-#define NV_PFIFO_INTR_0_DMA_PT_RESET                     0x00000001 /* -W--V */
-#define NV_PFIFO_INTR_EN_0                               0x00002140 /* RW-4R */
-#define NV_PFIFO_INTR_EN_0_CACHE_ERROR                          0:0 /* RWIVF */
-#define NV_PFIFO_INTR_EN_0_CACHE_ERROR_DISABLED          0x00000000 /* RWI-V */
-#define NV_PFIFO_INTR_EN_0_CACHE_ERROR_ENABLED           0x00000001 /* RW--V */
-#define NV_PFIFO_INTR_EN_0_RUNOUT                               4:4 /* RWIVF */
-#define NV_PFIFO_INTR_EN_0_RUNOUT_DISABLED               0x00000000 /* RWI-V */
-#define NV_PFIFO_INTR_EN_0_RUNOUT_ENABLED                0x00000001 /* RW--V */
-#define NV_PFIFO_INTR_EN_0_RUNOUT_OVERFLOW                      8:8 /* RWIVF */
-#define NV_PFIFO_INTR_EN_0_RUNOUT_OVERFLOW_DISABLED      0x00000000 /* RWI-V */
-#define NV_PFIFO_INTR_EN_0_RUNOUT_OVERFLOW_ENABLED       0x00000001 /* RW--V */
-#define NV_PFIFO_INTR_EN_0_DMA_PUSHER                         12:12 /* RWIVF */
-#define NV_PFIFO_INTR_EN_0_DMA_PUSHER_DISABLED           0x00000000 /* RWI-V */
-#define NV_PFIFO_INTR_EN_0_DMA_PUSHER_ENABLED            0x00000001 /* RW--V */
-#define NV_PFIFO_INTR_EN_0_DMA_PT                             16:16 /* RWIVF */
-#define NV_PFIFO_INTR_EN_0_DMA_PT_DISABLED               0x00000000 /* RWI-V */
-#define NV_PFIFO_INTR_EN_0_DMA_PT_ENABLED                0x00000001 /* RW--V */
-#define NV_PFIFO_RAMHT                                   0x00002210 /* RW-4R */
-#define NV_PFIFO_RAMHT_BASE_ADDRESS                             8:4 /* RWIUF */
-#define NV_PFIFO_RAMHT_BASE_ADDRESS_10000                0x00000010 /* RWI-V */
-#define NV_PFIFO_RAMHT_SIZE                                   17:16 /* RWIUF */
-#define NV_PFIFO_RAMHT_SIZE_4K                           0x00000000 /* RWI-V */
-#define NV_PFIFO_RAMHT_SIZE_8K                           0x00000001 /* RW--V */
-#define NV_PFIFO_RAMHT_SIZE_16K                          0x00000002 /* RW--V */
-#define NV_PFIFO_RAMHT_SIZE_32K                          0x00000003 /* RW--V */
-#define NV_PFIFO_RAMHT_SEARCH                                 25:24 /* RWIUF */
-#define NV_PFIFO_RAMHT_SEARCH_16                         0x00000000 /* RWI-V */
-#define NV_PFIFO_RAMHT_SEARCH_32                         0x00000001 /* RW--V */
-#define NV_PFIFO_RAMHT_SEARCH_64                         0x00000002 /* RW--V */
-#define NV_PFIFO_RAMHT_SEARCH_128                        0x00000003 /* RW--V */
-#define NV_PFIFO_RAMFC                                   0x00002214 /* RW-4R */
-#define NV_PFIFO_RAMFC_BASE_ADDRESS                             8:1 /* RWIUF */
-#define NV_PFIFO_RAMFC_BASE_ADDRESS_11000                0x00000088 /* RWI-V */
-#define NV_PFIFO_RAMRO                                   0x00002218 /* RW-4R */
-#define NV_PFIFO_RAMRO_BASE_ADDRESS                             8:1 /* RWIUF */
-#define NV_PFIFO_RAMRO_BASE_ADDRESS_11200                0x00000089 /* RWI-V */
-#define NV_PFIFO_RAMRO_BASE_ADDRESS_12000                0x00000090 /* RW--V */
-#define NV_PFIFO_RAMRO_SIZE                                   16:16 /* RWIVF */
-#define NV_PFIFO_RAMRO_SIZE_512                          0x00000000 /* RWI-V */
-#define NV_PFIFO_RAMRO_SIZE_8K                           0x00000001 /* RW--V */
-#define NV_PFIFO_CACHES                                  0x00002500 /* RW-4R */
-#define NV_PFIFO_CACHES_REASSIGN                                0:0 /* RWIVF */
-#define NV_PFIFO_CACHES_REASSIGN_DISABLED                0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHES_REASSIGN_ENABLED                 0x00000001 /* RW--V */
-#define NV_PFIFO_CACHES_DMA_SUSPEND                             4:4 /* R--VF */
-#define NV_PFIFO_CACHES_DMA_SUSPEND_IDLE                 0x00000000 /* R---V */
-#define NV_PFIFO_CACHES_DMA_SUSPEND_BUSY                 0x00000001 /* R---V */
-#define NV_PFIFO_MODE                                    0x00002504 /* RW-4R */
-#define NV_PFIFO_MODE_CHANNEL_0                                 0:0 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_0_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_0_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_1                                 1:1 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_1_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_1_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_2                                 2:2 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_2_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_2_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_3                                 3:3 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_3_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_3_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_4                                 4:4 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_4_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_4_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_5                                 5:5 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_5_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_5_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_6                                 6:6 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_6_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_6_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_7                                 7:7 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_7_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_7_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_8                                 8:8 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_8_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_8_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_9                                 9:9 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_9_PIO                      0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_9_DMA                      0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_10                              10:10 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_10_PIO                     0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_10_DMA                     0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_11                              11:11 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_11_PIO                     0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_11_DMA                     0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_12                              12:12 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_12_PIO                     0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_12_DMA                     0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_13                              13:13 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_13_PIO                     0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_13_DMA                     0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_14                              14:14 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_14_PIO                     0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_14_DMA                     0x00000001 /* RW--V */
-#define NV_PFIFO_MODE_CHANNEL_15                              15:15 /* RWIVF */
-#define NV_PFIFO_MODE_CHANNEL_15_PIO                     0x00000000 /* RWI-V */
-#define NV_PFIFO_MODE_CHANNEL_15_DMA                     0x00000001 /* RW--V */
-#define NV_PFIFO_DMA                                     0x00002508 /* RW-4R */
-#define NV_PFIFO_DMA_CHANNEL_0                                  0:0 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_0_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_0_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_1                                  1:1 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_1_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_1_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_2                                  2:2 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_2_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_2_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_3                                  3:3 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_3_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_3_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_4                                  4:4 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_4_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_4_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_5                                  5:5 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_5_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_5_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_6                                  6:6 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_6_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_6_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_7                                  7:7 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_7_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_7_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_8                                  8:8 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_8_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_8_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_9                                  9:9 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_9_NOT_PENDING               0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_9_PENDING                   0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_10                               10:10 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_10_NOT_PENDING              0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_10_PENDING                  0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_11                               11:11 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_11_NOT_PENDING              0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_11_PENDING                  0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_12                               12:12 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_12_NOT_PENDING              0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_12_PENDING                  0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_13                               13:13 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_13_NOT_PENDING              0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_13_PENDING                  0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_14                               14:14 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_14_NOT_PENDING              0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_14_PENDING                  0x00000001 /* RW--V */
-#define NV_PFIFO_DMA_CHANNEL_15                               15:15 /* RWIVF */
-#define NV_PFIFO_DMA_CHANNEL_15_NOT_PENDING              0x00000000 /* RWI-V */
-#define NV_PFIFO_DMA_CHANNEL_15_PENDING                  0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE                                    0x0000250C /* RW-4R */
-#define NV_PFIFO_SIZE_CHANNEL_0                                 0:0 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_0_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_0_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_1                                 1:1 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_1_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_1_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_2                                 2:2 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_2_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_2_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_3                                 3:3 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_3_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_3_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_4                                 4:4 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_4_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_4_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_5                                 5:5 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_5_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_5_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_6                                 6:6 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_6_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_6_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_7                                 7:7 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_7_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_7_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_8                                 8:8 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_8_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_8_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_9                                 9:9 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_9_124_BYTES                0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_9_512_BYTES                0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_10                              10:10 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_10_124_BYTES               0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_10_512_BYTES               0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_11                              11:11 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_11_124_BYTES               0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_11_512_BYTES               0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_12                              12:12 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_12_124_BYTES               0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_12_512_BYTES               0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_13                              13:13 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_13_124_BYTES               0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_13_512_BYTES               0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_14                              14:14 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_14_124_BYTES               0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_14_512_BYTES               0x00000001 /* RW--V */
-#define NV_PFIFO_SIZE_CHANNEL_15                              15:15 /* RWIVF */
-#define NV_PFIFO_SIZE_CHANNEL_15_124_BYTES               0x00000000 /* RWI-V */
-#define NV_PFIFO_SIZE_CHANNEL_15_512_BYTES               0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_PUSH0                            0x00003000 /* RW-4R */
-#define NV_PFIFO_CACHE0_PUSH0_ACCESS                            0:0 /* RWIVF */
-#define NV_PFIFO_CACHE0_PUSH0_ACCESS_DISABLED            0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE0_PUSH0_ACCESS_ENABLED             0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_PUSH0                            0x00003200 /* RW-4R */
-#define NV_PFIFO_CACHE1_PUSH0_ACCESS                            0:0 /* RWIVF */
-#define NV_PFIFO_CACHE1_PUSH0_ACCESS_DISABLED            0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_PUSH0_ACCESS_ENABLED             0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_PUSH1                            0x00003004 /* RW-4R */
-#define NV_PFIFO_CACHE0_PUSH1_CHID                              3:0 /* RWXUF */
-#define NV_PFIFO_CACHE1_PUSH1                            0x00003204 /* RW-4R */
-#define NV_PFIFO_CACHE1_PUSH1_CHID                              3:0 /* RWXUF */
-#define NV_PFIFO_CACHE1_PUSH1_MODE                              8:8 /* RWIVF */
-#define NV_PFIFO_CACHE1_PUSH1_MODE_PIO                   0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_PUSH1_MODE_DMA                   0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_PUSH                         0x00003220 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_PUSH_ACCESS                         0:0 /* RWIVF */
-#define NV_PFIFO_CACHE1_DMA_PUSH_ACCESS_DISABLED         0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_ACCESS_ENABLED          0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_STATE                          4:4 /* R--VF */
-#define NV_PFIFO_CACHE1_DMA_PUSH_STATE_IDLE              0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_STATE_BUSY              0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_BUFFER                         8:8 /* R--VF */
-#define NV_PFIFO_CACHE1_DMA_PUSH_BUFFER_NOT_EMPTY        0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_BUFFER_EMPTY            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_STATUS                       12:12 /* RWIVF */
-#define NV_PFIFO_CACHE1_DMA_PUSH_STATUS_RUNNING          0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_PUSH_STATUS_SUSPENDED        0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH                        0x00003224 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG                          7:3 /* RWIUF */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_8_BYTES           0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_16_BYTES          0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_24_BYTES          0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_32_BYTES          0x00000003 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_40_BYTES          0x00000004 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_48_BYTES          0x00000005 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_56_BYTES          0x00000006 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_64_BYTES          0x00000007 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_72_BYTES          0x00000008 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_80_BYTES          0x00000009 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_88_BYTES          0x0000000A /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_96_BYTES          0x0000000B /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_104_BYTES         0x0000000C /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_112_BYTES         0x0000000D /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_120_BYTES         0x0000000E /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES         0x0000000F /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_136_BYTES         0x00000010 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_144_BYTES         0x00000011 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_152_BYTES         0x00000012 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_160_BYTES         0x00000013 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_168_BYTES         0x00000014 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_176_BYTES         0x00000015 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_184_BYTES         0x00000016 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_192_BYTES         0x00000017 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_200_BYTES         0x00000018 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_208_BYTES         0x00000019 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_216_BYTES         0x0000001A /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_224_BYTES         0x0000001B /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_232_BYTES         0x0000001C /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_240_BYTES         0x0000001D /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_248_BYTES         0x0000001E /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_256_BYTES         0x0000001F /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE                        15:13 /* RWIUF */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_32_BYTES          0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_64_BYTES          0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_96_BYTES          0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES         0x00000003 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_160_BYTES         0x00000004 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_192_BYTES         0x00000005 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_224_BYTES         0x00000006 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_256_BYTES         0x00000007 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS                    19:16 /* RWIUF */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_0             0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_1             0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_2             0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_3             0x00000003 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4             0x00000004 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_5             0x00000005 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_6             0x00000006 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_7             0x00000007 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8             0x00000008 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_9             0x00000009 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_10            0x0000000A /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_11            0x0000000B /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_12            0x0000000C /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_13            0x0000000D /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_14            0x0000000E /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_15            0x0000000F /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_PUT                          0x00003240 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_PUT_OFFSET                         28:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_GET                          0x00003244 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_GET_OFFSET                         28:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_STATE                        0x00003228 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_STATE_METHOD                       12:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_STATE_SUBCHANNEL                  15:13 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_STATE_METHOD_COUNT                28:18 /* RWIUF */
-#define NV_PFIFO_CACHE1_DMA_STATE_METHOD_COUNT_0         0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_STATE_ERROR                       31:30 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_STATE_ERROR_NONE             0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_STATE_ERROR_NON_CACHE        0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_STATE_ERROR_RESERVED_CMD     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_STATE_ERROR_PROTECTION       0x00000003 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_INSTANCE                     0x0000322C /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_INSTANCE_ADDRESS                   15:0 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_CTL                          0x00003230 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_CTL_ADJUST                         11:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_CTL_PAGE_TABLE                    12:12 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_CTL_PAGE_TABLE_NOT_PRESENT   0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_PAGE_TABLE_PRESENT       0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_PAGE_ENTRY                    13:13 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_CTL_PAGE_ENTRY_NOT_LINEAR    0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_PAGE_ENTRY_LINEAR        0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_TARGET_NODE                   17:16 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_CTL_TARGET_NODE_PCI          0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_TARGET_NODE_AGP          0x00000003 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_AT_INFO                       31:31 /* RWIUF */
-#define NV_PFIFO_CACHE1_DMA_CTL_AT_INFO_INVALID          0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_CTL_AT_INFO_VALID            0x00000001 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_LIMIT                        0x00003234 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_LIMIT_OFFSET                       28:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_TLB_TAG                      0x00003238 /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_TLB_TAG_ADDRESS                   28:12 /* RWXUF */
-#define NV_PFIFO_CACHE1_DMA_TLB_TAG_STATE                       0:0 /* RWIUF */
-#define NV_PFIFO_CACHE1_DMA_TLB_TAG_STATE_INVALID        0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_DMA_TLB_TAG_STATE_VALID          0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_DMA_TLB_PTE                      0x0000323C /* RW-4R */
-#define NV_PFIFO_CACHE1_DMA_TLB_PTE_FRAME_ADDRESS             31:12 /* RWXUF */
-#define NV_PFIFO_CACHE0_PULL0                            0x00003050 /* RW-4R */
-#define NV_PFIFO_CACHE0_PULL0_ACCESS                            0:0 /* RWIVF */
-#define NV_PFIFO_CACHE0_PULL0_ACCESS_DISABLED            0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE0_PULL0_ACCESS_ENABLED             0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_PULL0_HASH                              4:4 /* R-XVF */
-#define NV_PFIFO_CACHE0_PULL0_HASH_SUCCEEDED             0x00000000 /* R---V */
-#define NV_PFIFO_CACHE0_PULL0_HASH_FAILED                0x00000001 /* R---V */
-#define NV_PFIFO_CACHE0_PULL0_DEVICE                            8:8 /* R-XVF */
-#define NV_PFIFO_CACHE0_PULL0_DEVICE_HARDWARE            0x00000000 /* R---V */
-#define NV_PFIFO_CACHE0_PULL0_DEVICE_SOFTWARE            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE0_PULL0_HASH_STATE                      12:12 /* R-XVF */
-#define NV_PFIFO_CACHE0_PULL0_HASH_STATE_IDLE            0x00000000 /* R---V */
-#define NV_PFIFO_CACHE0_PULL0_HASH_STATE_BUSY            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_PULL0                            0x00003250 /* RW-4R */
-#define NV_PFIFO_CACHE1_PULL0_ACCESS                            0:0 /* RWIVF */
-#define NV_PFIFO_CACHE1_PULL0_ACCESS_DISABLED            0x00000000 /* RWI-V */
-#define NV_PFIFO_CACHE1_PULL0_ACCESS_ENABLED             0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_PULL0_HASH                              4:4 /* R-XVF */
-#define NV_PFIFO_CACHE1_PULL0_HASH_SUCCEEDED             0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_PULL0_HASH_FAILED                0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_PULL0_DEVICE                            8:8 /* R-XVF */
-#define NV_PFIFO_CACHE1_PULL0_DEVICE_HARDWARE            0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_PULL0_DEVICE_SOFTWARE            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_PULL0_HASH_STATE                      12:12 /* R-XVF */
-#define NV_PFIFO_CACHE1_PULL0_HASH_STATE_IDLE            0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_PULL0_HASH_STATE_BUSY            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE0_PULL1                            0x00003054 /* RW-4R */
-#define NV_PFIFO_CACHE0_PULL1_ENGINE                            1:0 /* RWXUF */
-#define NV_PFIFO_CACHE0_PULL1_ENGINE_SW                  0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_PULL1_ENGINE_GRAPHICS            0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_PULL1_ENGINE_DVD                 0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_PULL1                            0x00003254 /* RW-4R */
-#define NV_PFIFO_CACHE1_PULL1_ENGINE                            1:0 /* RWXUF */
-#define NV_PFIFO_CACHE1_PULL1_ENGINE_SW                  0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_PULL1_ENGINE_GRAPHICS            0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_PULL1_ENGINE_DVD                 0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_HASH                             0x00003058 /* RW-4R */
-#define NV_PFIFO_CACHE0_HASH_INSTANCE                          15:0 /* RWXUF */
-#define NV_PFIFO_CACHE0_HASH_VALID                            16:16 /* RWXVF */
-#define NV_PFIFO_CACHE1_HASH                             0x00003258 /* RW-4R */
-#define NV_PFIFO_CACHE1_HASH_INSTANCE                          15:0 /* RWXUF */
-#define NV_PFIFO_CACHE1_HASH_VALID                            16:16 /* RWXVF */
-#define NV_PFIFO_CACHE0_STATUS                           0x00003014 /* R--4R */
-#define NV_PFIFO_CACHE0_STATUS_LOW_MARK                         4:4 /* R--VF */
-#define NV_PFIFO_CACHE0_STATUS_LOW_MARK_NOT_EMPTY        0x00000000 /* R---V */
-#define NV_PFIFO_CACHE0_STATUS_LOW_MARK_EMPTY            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE0_STATUS_HIGH_MARK                        8:8 /* R--VF */
-#define NV_PFIFO_CACHE0_STATUS_HIGH_MARK_NOT_FULL        0x00000000 /* R---V */
-#define NV_PFIFO_CACHE0_STATUS_HIGH_MARK_FULL            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_STATUS                           0x00003214 /* R--4R */
-#define NV_PFIFO_CACHE1_STATUS_LOW_MARK                         4:4 /* R--VF */
-#define NV_PFIFO_CACHE1_STATUS_LOW_MARK_NOT_EMPTY        0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_STATUS_LOW_MARK_EMPTY            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_STATUS_HIGH_MARK                        8:8 /* R--VF */
-#define NV_PFIFO_CACHE1_STATUS_HIGH_MARK_NOT_FULL        0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_STATUS_HIGH_MARK_FULL            0x00000001 /* R---V */
-#define NV_PFIFO_CACHE1_STATUS1                          0x00003218 /* R--4R */
-#define NV_PFIFO_CACHE1_STATUS1_RANOUT                          0:0 /* R-XVF */
-#define NV_PFIFO_CACHE1_STATUS1_RANOUT_FALSE             0x00000000 /* R---V */
-#define NV_PFIFO_CACHE1_STATUS1_RANOUT_TRUE              0x00000001 /* R---V */
-#define NV_PFIFO_CACHE0_PUT                              0x00003010 /* RW-4R */
-#define NV_PFIFO_CACHE0_PUT_ADDRESS                             2:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_PUT                              0x00003210 /* RW-4R */
-#define NV_PFIFO_CACHE1_PUT_ADDRESS                             9:2 /* RWXUF */
-#define NV_PFIFO_CACHE0_GET                              0x00003070 /* RW-4R */
-#define NV_PFIFO_CACHE0_GET_ADDRESS                             2:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_GET                              0x00003270 /* RW-4R */
-#define NV_PFIFO_CACHE1_GET_ADDRESS                             9:2 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE                           0x00003080 /* RW-4R */
-#define NV_PFIFO_CACHE0_ENGINE_0                                1:0 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_0_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_0_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_0_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_1                                5:4 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_1_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_1_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_1_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_2                                9:8 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_2_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_2_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_2_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_3                              13:12 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_3_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_3_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_3_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_4                              17:16 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_4_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_4_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_4_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_5                              21:20 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_5_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_5_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_5_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_6                              25:24 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_6_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_6_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_6_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_7                              29:28 /* RWXUF */
-#define NV_PFIFO_CACHE0_ENGINE_7_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_7_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE0_ENGINE_7_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE                           0x00003280 /* RW-4R */
-#define NV_PFIFO_CACHE1_ENGINE_0                                1:0 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_0_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_0_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_0_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_1                                5:4 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_1_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_1_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_1_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_2                                9:8 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_2_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_2_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_2_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_3                              13:12 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_3_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_3_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_3_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_4                              17:16 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_4_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_4_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_4_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_5                              21:20 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_5_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_5_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_5_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_6                              25:24 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_6_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_6_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_6_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_7                              29:28 /* RWXUF */
-#define NV_PFIFO_CACHE1_ENGINE_7_SW                      0x00000000 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_7_GRAPHICS                0x00000001 /* RW--V */
-#define NV_PFIFO_CACHE1_ENGINE_7_DVD                     0x00000002 /* RW--V */
-#define NV_PFIFO_CACHE0_METHOD(i)                (0x00003100+(i)*8) /* RW-4A */
-#define NV_PFIFO_CACHE0_METHOD__SIZE_1                            1 /*       */
-#define NV_PFIFO_CACHE0_METHOD_ADDRESS                         12:2 /* RWXUF */
-#define NV_PFIFO_CACHE0_METHOD_SUBCHANNEL                     15:13 /* RWXUF */
-#define NV_PFIFO_CACHE1_METHOD(i)                (0x00003800+(i)*8) /* RW-4A */
-#define NV_PFIFO_CACHE1_METHOD__SIZE_1                          128 /*       */
-#define NV_PFIFO_CACHE1_METHOD_ADDRESS                         12:2 /* RWXUF */
-#define NV_PFIFO_CACHE1_METHOD_SUBCHANNEL                     15:13 /* RWXUF */
-#define NV_PFIFO_CACHE1_METHOD_ALIAS(i)          (0x00003C00+(i)*8) /* RW-4A */
-#define NV_PFIFO_CACHE1_METHOD_ALIAS__SIZE_1                    128 /*       */
-#define NV_PFIFO_CACHE0_DATA(i)                  (0x00003104+(i)*8) /* RW-4A */
-#define NV_PFIFO_CACHE0_DATA__SIZE_1                              1 /*       */
-#define NV_PFIFO_CACHE0_DATA_VALUE                             31:0 /* RWXVF */
-#define NV_PFIFO_CACHE1_DATA(i)                  (0x00003804+(i)*8) /* RW-4A */
-#define NV_PFIFO_CACHE1_DATA__SIZE_1                            128 /*       */
-#define NV_PFIFO_CACHE1_DATA_VALUE                             31:0 /* RWXVF */
-#define NV_PFIFO_CACHE1_DATA_ALIAS(i)            (0x00003C04+(i)*8) /* RW-4A */
-#define NV_PFIFO_CACHE1_DATA_ALIAS__SIZE_1                      128 /*       */
-#define NV_PFIFO_DEVICE(i)                       (0x00002800+(i)*4) /* R--4A */
-#define NV_PFIFO_DEVICE__SIZE_1                                 128 /*       */
-#define NV_PFIFO_DEVICE_CHID                                    3:0 /* R--UF */
-#define NV_PFIFO_DEVICE_SWITCH                                24:24 /* R--VF */
-#define NV_PFIFO_DEVICE_SWITCH_UNAVAILABLE               0x00000000 /* R---V */
-#define NV_PFIFO_DEVICE_SWITCH_AVAILABLE                 0x00000001 /* R---V */
-#define NV_PFIFO_RUNOUT_STATUS                           0x00002400 /* R--4R */
-#define NV_PFIFO_RUNOUT_STATUS_RANOUT                           0:0 /* R--VF */
-#define NV_PFIFO_RUNOUT_STATUS_RANOUT_FALSE              0x00000000 /* R---V */
-#define NV_PFIFO_RUNOUT_STATUS_RANOUT_TRUE               0x00000001 /* R---V */
-#define NV_PFIFO_RUNOUT_STATUS_LOW_MARK                         4:4 /* R--VF */
-#define NV_PFIFO_RUNOUT_STATUS_LOW_MARK_NOT_EMPTY        0x00000000 /* R---V */
-#define NV_PFIFO_RUNOUT_STATUS_LOW_MARK_EMPTY            0x00000001 /* R---V */
-#define NV_PFIFO_RUNOUT_STATUS_HIGH_MARK                        8:8 /* R--VF */
-#define NV_PFIFO_RUNOUT_STATUS_HIGH_MARK_NOT_FULL        0x00000000 /* R---V */
-#define NV_PFIFO_RUNOUT_STATUS_HIGH_MARK_FULL            0x00000001 /* R---V */
-#define NV_PFIFO_RUNOUT_PUT                              0x00002410 /* RW-4R */
-#define NV_PFIFO_RUNOUT_PUT_ADDRESS                            12:3 /* RWXUF */
-#define NV_PFIFO_RUNOUT_PUT_ADDRESS__SIZE_0                     8:3 /* RWXUF */
-#define NV_PFIFO_RUNOUT_PUT_ADDRESS__SIZE_1                    12:3 /* RWXUF */
-#define NV_PFIFO_RUNOUT_GET                              0x00002420 /* RW-4R */
-#define NV_PFIFO_RUNOUT_GET_ADDRESS                            13:3 /* RWXUF */
-/* dev_graphics.ref */
-#define NV_PGRAPH                             0x00401FFF:0x00400000 /* RW--D */
-#define NV_PGRAPH_DEBUG_0                                0x00400080 /* RW-4R */
-#define NV_PGRAPH_DEBUG_1                                0x00400084 /* RW-4R */
-#define NV_PGRAPH_DEBUG_2                                0x00400088 /* RW-4R */
-#define NV_PGRAPH_DEBUG_3                                0x0040008C /* RW-4R */
-#define NV_PGRAPH_INTR                                   0x00400100 /* RW-4R */
-#define NV_PGRAPH_INTR_NOTIFY                                   0:0 /* RWIVF */
-#define NV_PGRAPH_INTR_NOTIFY_NOT_PENDING                0x00000000 /* R-I-V */
-#define NV_PGRAPH_INTR_NOTIFY_PENDING                    0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_NOTIFY_RESET                      0x00000001 /* -W--C */
-#define NV_PGRAPH_INTR_MISSING_HW                               4:4 /* RWIVF */
-#define NV_PGRAPH_INTR_MISSING_HW_NOT_PENDING            0x00000000 /* R-I-V */
-#define NV_PGRAPH_INTR_MISSING_HW_PENDING                0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_MISSING_HW_RESET                  0x00000001 /* -W--C */
-#define NV_PGRAPH_INTR_TLB_PRESENT_A                            8:8 /* RWIVF */
-#define NV_PGRAPH_INTR_TLB_PRESENT_A_NOT_PENDING         0x00000000 /* R-I-V */
-#define NV_PGRAPH_INTR_TLB_PRESENT_A_PENDING             0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_TLB_PRESENT_A_RESET               0x00000001 /* -W--C */
-#define NV_PGRAPH_INTR_TLB_PRESENT_B                            9:9 /* RWIVF */
-#define NV_PGRAPH_INTR_TLB_PRESENT_B_NOT_PENDING         0x00000000 /* R-I-V */
-#define NV_PGRAPH_INTR_TLB_PRESENT_B_PENDING             0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_TLB_PRESENT_B_RESET               0x00000001 /* -W--C */
-#define NV_PGRAPH_INTR_CONTEXT_SWITCH                         12:12 /* RWIVF */
-#define NV_PGRAPH_INTR_CONTEXT_SWITCH_NOT_PENDING        0x00000000 /* R-I-V */
-#define NV_PGRAPH_INTR_CONTEXT_SWITCH_PENDING            0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_CONTEXT_SWITCH_RESET              0x00000001 /* -W--C */
-#define NV_PGRAPH_INTR_BUFFER_NOTIFY                          16:16 /* RWIVF */
-#define NV_PGRAPH_INTR_BUFFER_NOTIFY_NOT_PENDING         0x00000000 /* R-I-V */
-#define NV_PGRAPH_INTR_BUFFER_NOTIFY_PENDING             0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_BUFFER_NOTIFY_RESET               0x00000001 /* -W--C */
-#define NV_PGRAPH_NSTATUS                                0x00400104 /* RW-4R */
-#define NV_PGRAPH_NSTATUS_STATE_IN_USE                        11:11 /* RWIVF */
-#define NV_PGRAPH_NSTATUS_STATE_IN_USE_NOT_PENDING       0x00000000 /* RWI-V */
-#define NV_PGRAPH_NSTATUS_STATE_IN_USE_PENDING           0x00000001 /* RW--V */
-#define NV_PGRAPH_NSTATUS_INVALID_STATE                       12:12 /* RWIVF */
-#define NV_PGRAPH_NSTATUS_INVALID_STATE_NOT_PENDING      0x00000000 /* RWI-V */
-#define NV_PGRAPH_NSTATUS_INVALID_STATE_PENDING          0x00000001 /* RW--V */
-#define NV_PGRAPH_NSTATUS_BAD_ARGUMENT                        13:13 /* RWIVF */
-#define NV_PGRAPH_NSTATUS_BAD_ARGUMENT_NOT_PENDING       0x00000000 /* RWI-V */
-#define NV_PGRAPH_NSTATUS_BAD_ARGUMENT_PENDING           0x00000001 /* RW--V */
-#define NV_PGRAPH_NSTATUS_PROTECTION_FAULT                    14:14 /* RWIVF */
-#define NV_PGRAPH_NSTATUS_PROTECTION_FAULT_NOT_PENDING   0x00000000 /* RWI-V */
-#define NV_PGRAPH_NSTATUS_PROTECTION_FAULT_PENDING       0x00000001 /* RW--V */
-#define NV_PGRAPH_NSOURCE                                0x00400108 /* R--4R */
-#define NV_PGRAPH_NSOURCE_NOTIFICATION                          0:0 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_NOTIFICATION_NOT_PENDING       0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_NOTIFICATION_PENDING           0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_DATA_ERROR                            1:1 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_DATA_ERROR_NOT_PENDING         0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_DATA_ERROR_PENDING             0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_PROTECTION_ERROR                      2:2 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_PROTECTION_ERROR_NOT_PENDING   0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_PROTECTION_ERROR_PENDING       0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_RANGE_EXCEPTION                       3:3 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_RANGE_EXCEPTION_NOT_PENDING    0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_RANGE_EXCEPTION_PENDING        0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_LIMIT_COLOR                           4:4 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_LIMIT_COLOR_NOT_PENDING        0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_LIMIT_COLOR_PENDING            0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_LIMIT_ZETA_                           5:5 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_LIMIT_ZETA_NOT_PENDING         0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_LIMIT_ZETA_PENDING             0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_ILLEGAL_MTHD                          6:6 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_ILLEGAL_MTHD_NOT_PENDING       0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_ILLEGAL_MTHD_PENDING           0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_DMA_R_PROTECTION                      7:7 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_DMA_R_PROTECTION_NOT_PENDING   0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_DMA_R_PROTECTION_PENDING       0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_DMA_W_PROTECTION                      8:8 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_DMA_W_PROTECTION_NOT_PENDING   0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_DMA_W_PROTECTION_PENDING       0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_FORMAT_EXCEPTION                      9:9 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_FORMAT_EXCEPTION_NOT_PENDING   0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_FORMAT_EXCEPTION_PENDING       0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_PATCH_EXCEPTION                     10:10 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_PATCH_EXCEPTION_NOT_PENDING    0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_PATCH_EXCEPTION_PENDING        0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_STATE_INVALID                       11:11 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_STATE_INVALID_NOT_PENDING      0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_STATE_INVALID_PENDING          0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_DOUBLE_NOTIFY                       12:12 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_DOUBLE_NOTIFY_NOT_PENDING      0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_DOUBLE_NOTIFY_PENDING          0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_NOTIFY_IN_USE                       13:13 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_NOTIFY_IN_USE_NOT_PENDING      0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_NOTIFY_IN_USE_PENDING          0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_METHOD_CNT                          14:14 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_METHOD_CNT_NOT_PENDING         0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_METHOD_CNT_PENDING             0x00000001 /* R---V */
-#define NV_PGRAPH_NSOURCE_BFR_NOTIFICATION                    15:15 /* R-IVF */
-#define NV_PGRAPH_NSOURCE_BFR_NOTIFICATION_NOT_PENDING   0x00000000 /* R-I-V */
-#define NV_PGRAPH_NSOURCE_BFR_NOTIFICATION_PENDING       0x00000001 /* R---V */
-#define NV_PGRAPH_INTR_EN                                0x00400140 /* RW-4R */
-#define NV_PGRAPH_INTR_EN_NOTIFY                                0:0 /* RWIVF */
-#define NV_PGRAPH_INTR_EN_NOTIFY_DISABLED                0x00000000 /* RWI-V */
-#define NV_PGRAPH_INTR_EN_NOTIFY_ENABLED                 0x00000001 /* RW--V */
-#define NV_PGRAPH_INTR_EN_MISSING_HW                            4:4 /* RWIVF */
-#define NV_PGRAPH_INTR_EN_MISSING_HW_DISABLED            0x00000000 /* RWI-V */
-#define NV_PGRAPH_INTR_EN_MISSING_HW_ENABLED             0x00000001 /* RW--V */
-#define NV_PGRAPH_INTR_EN_TLB_PRESENT_A                         8:8 /* RWIVF */
-#define NV_PGRAPH_INTR_EN_TLB_PRESENT_A_DISABLED         0x00000000 /* RWI-V */
-#define NV_PGRAPH_INTR_EN_TLB_PRESENT_A_ENABLED          0x00000001 /* RW--V */
-#define NV_PGRAPH_INTR_EN_TLB_PRESENT_B                         9:9 /* RWIVF */
-#define NV_PGRAPH_INTR_EN_TLB_PRESENT_B_DISABLED         0x00000000 /* RWI-V */
-#define NV_PGRAPH_INTR_EN_TLB_PRESENT_B_ENABLED          0x00000001 /* RW--V */
-#define NV_PGRAPH_INTR_EN_CONTEXT_SWITCH                      12:12 /* RWIVF */
-#define NV_PGRAPH_INTR_EN_CONTEXT_SWITCH_DISABLED        0x00000000 /* RWI-V */
-#define NV_PGRAPH_INTR_EN_CONTEXT_SWITCH_ENABLED         0x00000001 /* RW--V */
-#define NV_PGRAPH_INTR_EN_BUFFER_NOTIFY                       16:16 /* RWIVF */
-#define NV_PGRAPH_INTR_EN_BUFFER_NOTIFY_DISABLED         0x00000000 /* RWI-V */
-#define NV_PGRAPH_INTR_EN_BUFFER_NOTIFY_ENABLED          0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1                            0x00400160 /* RW-4R */
-#define NV_PGRAPH_CTX_SWITCH1_GRCLASS                           7:0 /* RWXVF */
-#define NV_PGRAPH_CTX_SWITCH1_CHROMA_KEY                      12:12 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH1_CHROMA_KEY_DISABLE         0x00000000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_CHROMA_KEY_ENABLE          0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_USER_CLIP                       13:13 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH1_USER_CLIP_DISABLE          0x00000000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_USER_CLIP_ENABLE           0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_SWIZZLE                         14:14 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH1_SWIZZLE_DISABLE            0x00000000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_SWIZZLE_ENABLE             0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG                    17:15 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG_SRCCOPY_AND   0x00000000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG_ROP_AND       0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG_BLEND_AND     0x00000002 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG_SRCCOPY       0x00000003 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG_SRCCOPY_PRE   0x00000004 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_CONFIG_BLEND_PRE     0x00000005 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_STATUS                    24:24 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_STATUS_INVALID       0x00000000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_PATCH_STATUS_VALID         0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_CONTEXT_SURFACE                 25:25 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH1_CONTEXT_SURFACE_INVALID    0x00000000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_CONTEXT_SURFACE_VALID      0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH1_VOLATILE_RESET                  31:31 /* CWIVF */
-#define NV_PGRAPH_CTX_SWITCH1_VOLATILE_RESET_IGNORE      0x00000000 /* CWI-V */
-#define NV_PGRAPH_CTX_SWITCH1_VOLATILE_RESET_ENABLED     0x00000001 /* -W--T */
-#define NV_PGRAPH_CTX_SWITCH2                            0x00400164 /* RW-4R */
-#define NV_PGRAPH_CTX_SWITCH2_MONO_FORMAT                       1:0 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH2_MONO_FORMAT_INVALID              0x00 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_MONO_FORMAT_CGA6_M1              0x01 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_MONO_FORMAT_LE_M1                0x02 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT                     13:8 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_INVALID             0x00 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_Y8               0x01 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X16A8Y8          0x02 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X24Y8            0x03 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_A1R5G5B5         0x06 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X1R5G5B5         0x07 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X16A1R5G5B5      0x08 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X17R5G5B5        0x09 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_R5G6B5           0x0A /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_A16R5G6B5        0x0B /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X16R5G6B5        0x0C /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_A8R8G8B8         0x0D /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X8R8G8B8         0x0E /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_Y16              0x0F /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_A16Y16           0x10 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_X16Y16           0x11 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_V8YB8U8YA8       0x12 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_YB8V8YA8U8       0x13 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_COLOR_FORMAT_LE_Y32              0x14 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH2_NOTIFY_INSTANCE                 31:16 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH2_NOTIFY_INSTANCE_INVALID        0x0000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH3                            0x00400168 /* RW-4R */
-#define NV_PGRAPH_CTX_SWITCH3_DMA_INSTANCE_0                   15:0 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH3_DMA_INSTANCE_0_INVALID         0x0000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH3_DMA_INSTANCE_1                  31:16 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH3_DMA_INSTANCE_1_INVALID         0x0000 /* RW--V */
-#define NV_PGRAPH_CTX_SWITCH4                            0x0040016C /* RW-4R */
-#define NV_PGRAPH_CTX_SWITCH4_USER_INSTANCE                    15:0 /* RWXUF */
-#define NV_PGRAPH_CTX_SWITCH4_USER_INSTANCE_INVALID          0x0000 /* RW--V */
-#define NV_PGRAPH_CTX_CACHE1(i)                  (0x00400180+(i)*4) /* RW-4A */
-#define NV_PGRAPH_CTX_CACHE1__SIZE_1                              8 /*       */
-#define NV_PGRAPH_CTX_CACHE1_GRCLASS                            7:0 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_CHROMA_KEY                       12:12 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_USER_CLIP                        13:13 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_SWIZZLE                          14:14 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_PATCH_CONFIG                     19:15 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_SPARE1                           20:20 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_PATCH_STATUS                     24:24 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE1_CONTEXT_SURFACE                  25:25 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE2(i)                  (0x004001a0+(i)*4) /* RW-4A */
-#define NV_PGRAPH_CTX_CACHE2__SIZE_1                              8 /*       */
-#define NV_PGRAPH_CTX_CACHE2_MONO_FORMAT                        1:0 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE2_COLOR_FORMAT                      13:8 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE2_NOTIFY_INSTANCE                  31:16 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE3(i)                  (0x004001c0+(i)*4) /* RW-4A */
-#define NV_PGRAPH_CTX_CACHE3__SIZE_1                              8 /*       */
-#define NV_PGRAPH_CTX_CACHE3_DMA_INSTANCE_0                    15:0 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE3_DMA_INSTANCE_1                   31:16 /* RWXVF */
-#define NV_PGRAPH_CTX_CACHE4(i)                  (0x004001e0+(i)*4) /* RW-4A */
-#define NV_PGRAPH_CTX_CACHE4__SIZE_1                              8 /*       */
-#define NV_PGRAPH_CTX_CACHE4_USER_INSTANCE                     15:0 /* RWXVF */
-#define NV_PGRAPH_CTX_CONTROL                            0x00400170 /* RW-4R */
-#define NV_PGRAPH_CTX_CONTROL_MINIMUM_TIME                      1:0 /* RWIVF */
-#define NV_PGRAPH_CTX_CONTROL_MINIMUM_TIME_33US          0x00000000 /* RWI-V */
-#define NV_PGRAPH_CTX_CONTROL_MINIMUM_TIME_262US         0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_CONTROL_MINIMUM_TIME_2MS           0x00000002 /* RW--V */
-#define NV_PGRAPH_CTX_CONTROL_MINIMUM_TIME_17MS          0x00000003 /* RW--V */
-#define NV_PGRAPH_CTX_CONTROL_TIME                              8:8 /* RWIVF */
-#define NV_PGRAPH_CTX_CONTROL_TIME_EXPIRED               0x00000000 /* RWI-V */
-#define NV_PGRAPH_CTX_CONTROL_TIME_NOT_EXPIRED           0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_CONTROL_CHID                            16:16 /* RWIVF */
-#define NV_PGRAPH_CTX_CONTROL_CHID_INVALID               0x00000000 /* RWI-V */
-#define NV_PGRAPH_CTX_CONTROL_CHID_VALID                 0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_CONTROL_CHANGE                          20:20 /* R--VF */
-#define NV_PGRAPH_CTX_CONTROL_CHANGE_UNAVAILABLE         0x00000000 /* R---V */
-#define NV_PGRAPH_CTX_CONTROL_CHANGE_AVAILABLE           0x00000001 /* R---V */
-#define NV_PGRAPH_CTX_CONTROL_SWITCHING                       24:24 /* RWIVF */
-#define NV_PGRAPH_CTX_CONTROL_SWITCHING_IDLE             0x00000000 /* RWI-V */
-#define NV_PGRAPH_CTX_CONTROL_SWITCHING_BUSY             0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_CONTROL_DEVICE                          28:28 /* RWIVF */
-#define NV_PGRAPH_CTX_CONTROL_DEVICE_DISABLED            0x00000000 /* RWI-V */
-#define NV_PGRAPH_CTX_CONTROL_DEVICE_ENABLED             0x00000001 /* RW--V */
-#define NV_PGRAPH_CTX_USER                               0x00400174 /* RW-4R */
-#define NV_PGRAPH_CTX_USER_SUBCH                              15:13 /* RWIVF */
-#define NV_PGRAPH_CTX_USER_SUBCH_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_CTX_USER_CHID                               27:24 /* RWIVF */
-#define NV_PGRAPH_CTX_USER_CHID_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_FIFO                                   0x00400720 /* RW-4R */
-#define NV_PGRAPH_FIFO_ACCESS                                   0:0 /* RWIVF */
-#define NV_PGRAPH_FIFO_ACCESS_DISABLED                   0x00000000 /* RW--V */
-#define NV_PGRAPH_FIFO_ACCESS_ENABLED                    0x00000001 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_FIFO_0(i)              (0x00400730+(i)*4) /* RW-4A */
-#define NV_PGRAPH_FFINTFC_FIFO_0__SIZE_1                          4 /*       */
-#define NV_PGRAPH_FFINTFC_FIFO_0_TAG                            0:0 /* RWXVF */
-#define NV_PGRAPH_FFINTFC_FIFO_0_TAG_MTHD                0x00000000 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_TAG_CHSW                0x00000001 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH                          3:1 /* RWXVF */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_0                 0x00000000 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_1                 0x00000001 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_2                 0x00000002 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_3                 0x00000003 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_4                 0x00000004 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_5                 0x00000005 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_6                 0x00000006 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_SUBCH_7                 0x00000007 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_0_MTHD                          14:4 /* RWXVF */
-#define NV_PGRAPH_FFINTFC_FIFO_0_MTHD_CTX_SWITCH         0x00000000 /* RW--V */
-#define NV_PGRAPH_FFINTFC_FIFO_1(i)              (0x00400740+(i)*4) /* RW-4A */
-#define NV_PGRAPH_FFINTFC_FIFO_1__SIZE_1                          4 /*       */
-#define NV_PGRAPH_FFINTFC_FIFO_1_ARGUMENT                      31:0 /* RWXVF */
-#define NV_PGRAPH_FFINTFC_FIFO_PTR                       0x00400750 /* RW-4R */
-#define NV_PGRAPH_FFINTFC_FIFO_PTR_WRITE                        2:0 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_FIFO_PTR_WRITE_0               0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_FIFO_PTR_READ                         6:4 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_FIFO_PTR_READ_0                0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_ST2                            0x00400754 /* RW-4R */
-#define NV_PGRAPH_FFINTFC_ST2_STATUS                            0:0 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_ST2_STATUS_INVALID             0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_ST2_STATUS_VALID               0x00000001 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_MTHD                             11:1 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_ST2_MTHD_CTX_SWITCH            0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH                           14:12 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_0                    0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_1                    0x00000001 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_2                    0x00000002 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_3                    0x00000003 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_4                    0x00000004 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_5                    0x00000005 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_6                    0x00000006 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_SUBCH_7                    0x00000007 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID                            18:15 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_1                     0x00000001 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_2                     0x00000002 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_3                     0x00000003 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_4                     0x00000004 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_5                     0x00000005 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_6                     0x00000006 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_7                     0x00000007 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_8                     0x00000008 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_9                     0x00000009 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_10                    0x0000000A /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_11                    0x0000000B /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_12                    0x0000000C /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_13                    0x0000000D /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_14                    0x0000000E /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_15                    0x0000000F /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_STATUS                     19:19 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_STATUS_INVALID        0x00000000 /* RWI-V */
-#define NV_PGRAPH_FFINTFC_ST2_CHID_STATUS_VALID          0x00000001 /* RW--V */
-#define NV_PGRAPH_FFINTFC_ST2_D                          0x00400758 /* RW-4R */
-#define NV_PGRAPH_FFINTFC_ST2_D_ARGUMENT                       31:0 /* RWIVF */
-#define NV_PGRAPH_FFINTFC_ST2_D_ARGUMENT_0               0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATUS                                 0x00400700 /* R--4R */
-#define NV_PGRAPH_STATUS_STATE                                  0:0 /* R-IVF */
-#define NV_PGRAPH_STATUS_STATE_IDLE                      0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_STATE_BUSY                      0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_XY_LOGIC                               4:4 /* R-IVF */
-#define NV_PGRAPH_STATUS_XY_LOGIC_IDLE                   0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_XY_LOGIC_BUSY                   0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_FE                                     5:5 /* R-IVF */
-#define NV_PGRAPH_STATUS_FE_IDLE                         0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_FE_BUSY                         0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_RASTERIZER                             6:6 /* R-IVF */
-#define NV_PGRAPH_STATUS_RASTERIZER_IDLE                 0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_RASTERIZER_BUSY                 0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_PORT_NOTIFY                            8:8 /* R-IVF */
-#define NV_PGRAPH_STATUS_PORT_NOTIFY_IDLE                0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_PORT_NOTIFY_BUSY                0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_PORT_REGISTER                        12:12 /* R-IVF */
-#define NV_PGRAPH_STATUS_PORT_REGISTER_IDLE              0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_PORT_REGISTER_BUSY              0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_PORT_DMA                             16:16 /* R-IVF */
-#define NV_PGRAPH_STATUS_PORT_DMA_IDLE                   0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_PORT_DMA_BUSY                   0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_DMA_ENGINE                           17:17 /* R-IVF */
-#define NV_PGRAPH_STATUS_DMA_ENGINE_IDLE                 0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_DMA_ENGINE_BUSY                 0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_DMA_NOTIFY                           20:20 /* R-IVF */
-#define NV_PGRAPH_STATUS_DMA_NOTIFY_IDLE                 0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_DMA_NOTIFY_BUSY                 0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_DMA_BUFFER_NOTIFY                    21:21 /* R-IVF */
-#define NV_PGRAPH_STATUS_DMA_BUFFER_NOTIFY_IDLE          0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_DMA_BUFFER_NOTIFY_BUSY          0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_D3D                                  24:24 /* R-IVF */
-#define NV_PGRAPH_STATUS_D3D_IDLE                        0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_D3D_BUSY                        0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_CACHE                                25:25 /* R-IVF */
-#define NV_PGRAPH_STATUS_CACHE_IDLE                      0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_CACHE_BUSY                      0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_LIGHTING                             26:26 /* R-IVF */
-#define NV_PGRAPH_STATUS_LIGHTING_IDLE                   0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_LIGHTING_BUSY                   0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_PREROP                               27:27 /* R-IVF */
-#define NV_PGRAPH_STATUS_PREROP_IDLE                     0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_PREROP_BUSY                     0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_ROP                                  28:28 /* R-IVF */
-#define NV_PGRAPH_STATUS_ROP_IDLE                        0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_ROP_BUSY                        0x00000001 /* R---V */
-#define NV_PGRAPH_STATUS_PORT_USER                            29:29 /* R-IVF */
-#define NV_PGRAPH_STATUS_PORT_USER_IDLE                  0x00000000 /* R-I-V */
-#define NV_PGRAPH_STATUS_PORT_USER_BUSY                  0x00000001 /* R---V */
-#define NV_PGRAPH_TRAPPED_ADDR                           0x00400704 /* R--4R */
-#define NV_PGRAPH_TRAPPED_ADDR_MTHD                            12:2 /* R-XUF */
-#define NV_PGRAPH_TRAPPED_ADDR_SUBCH                          15:13 /* R-XUF */
-#define NV_PGRAPH_TRAPPED_ADDR_CHID                           27:24 /* R-XUF */
-#define NV_PGRAPH_TRAPPED_DATA                           0x00400708 /* R--4R */
-#define NV_PGRAPH_TRAPPED_DATA_VALUE                           31:0 /* R-XVF */
-#define NV_PGRAPH_SURFACE                                0x0040070C /* RW-4R */
-#define NV_PGRAPH_SURFACE_TYPE                                  1:0 /* RWIVF */
-#define NV_PGRAPH_SURFACE_TYPE_INVALID                   0x00000000 /* RWI-V */
-#define NV_PGRAPH_SURFACE_TYPE_NON_SWIZZLE               0x00000001 /* RW--V */
-#define NV_PGRAPH_SURFACE_TYPE_SWIZZLE                   0x00000002 /* RW--V */
-#define NV_PGRAPH_NOTIFY                                 0x00400714 /* RW-4R */
-#define NV_PGRAPH_NOTIFY_BUFFER_REQ                             0:0 /* RWIVF */
-#define NV_PGRAPH_NOTIFY_BUFFER_REQ_NOT_PENDING          0x00000000 /* RWI-V */
-#define NV_PGRAPH_NOTIFY_BUFFER_REQ_PENDING              0x00000001 /* RW--V */
-#define NV_PGRAPH_NOTIFY_BUFFER_STYLE                           8:8 /* RWIVF */
-#define NV_PGRAPH_NOTIFY_BUFFER_STYLE_WRITE_ONLY         0x00000000 /* RWI-V */
-#define NV_PGRAPH_NOTIFY_BUFFER_STYLE_WRITE_THEN_AWAKEN  0x00000001 /* RW--V */
-#define NV_PGRAPH_NOTIFY_REQ                                  16:16 /* RWIVF */
-#define NV_PGRAPH_NOTIFY_REQ_NOT_PENDING                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_NOTIFY_REQ_PENDING                     0x00000001 /* RW--V */
-#define NV_PGRAPH_NOTIFY_STYLE                                20:20 /* RWIVF */
-#define NV_PGRAPH_NOTIFY_STYLE_WRITE_ONLY                0x00000000 /* RWI-V */
-#define NV_PGRAPH_NOTIFY_STYLE_WRITE_THEN_AWAKEN         0x00000001 /* RW--V */
-#define NV_PGRAPH_BOFFSET(i)                     (0x00400640+(i)*4) /* RW-4A */
-#define NV_PGRAPH_BOFFSET__SIZE_1                                 6 /*       */
-#define NV_PGRAPH_BOFFSET_LINADRS                              23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET_LINADRS_0                      0x00000000 /* RWI-V */
-#define NV_PGRAPH_BOFFSET0                               0x00400640 /* RW-4R */
-#define NV_PGRAPH_BOFFSET0__ALIAS_1            NV_PGRAPH_BOFFSET(0) /*       */
-#define NV_PGRAPH_BOFFSET0_LINADRS                             23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET0_LINADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BOFFSET1                               0x00400644 /* RW-4R */
-#define NV_PGRAPH_BOFFSET1__ALIAS_1            NV_PGRAPH_BOFFSET(1) /*       */
-#define NV_PGRAPH_BOFFSET1_LINADRS                             23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET1_LINADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BOFFSET2                               0x00400648 /* RW-4R */
-#define NV_PGRAPH_BOFFSET2__ALIAS_1            NV_PGRAPH_BOFFSET(2) /*       */
-#define NV_PGRAPH_BOFFSET2_LINADRS                             23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET2_LINADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BOFFSET3                               0x0040064C /* RW-4R */
-#define NV_PGRAPH_BOFFSET3__ALIAS_1            NV_PGRAPH_BOFFSET(3) /*       */
-#define NV_PGRAPH_BOFFSET3_LINADRS                             23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET3_LINADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BOFFSET4                               0x00400650 /* RW-4R */
-#define NV_PGRAPH_BOFFSET4__ALIAS_1            NV_PGRAPH_BOFFSET(4) /*       */
-#define NV_PGRAPH_BOFFSET4_LINADRS                             23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET4_LINADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BOFFSET5                               0x00400654 /* RW-4R */
-#define NV_PGRAPH_BOFFSET5__ALIAS_1            NV_PGRAPH_BOFFSET(5) /*       */
-#define NV_PGRAPH_BOFFSET5_LINADRS                             23:0 /* RWIUF */
-#define NV_PGRAPH_BOFFSET5_LINADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE(i)                       (0x00400658+(i)*4) /* RW-4A */
-#define NV_PGRAPH_BBASE__SIZE_1                                   6 /*       */
-#define NV_PGRAPH_BBASE_LINADRS                                23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE_LINADRS_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE0                                 0x00400658 /* RW-4R */
-#define NV_PGRAPH_BBASE0__ALIAS_1                NV_PGRAPH_BBASE(0) /*       */
-#define NV_PGRAPH_BBASE0_LINADRS                               23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE0_LINADRS_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE1                                 0x0040065c /* RW-4R */
-#define NV_PGRAPH_BBASE1__ALIAS_1                NV_PGRAPH_BBASE(1) /*       */
-#define NV_PGRAPH_BBASE1_LINADRS                               23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE1_LINADRS_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE2                                 0x00400660 /* RW-4R */
-#define NV_PGRAPH_BBASE2__ALIAS_1                NV_PGRAPH_BBASE(2) /*       */
-#define NV_PGRAPH_BBASE2_LINADRS                               23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE2_LINADRS_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE3                                 0x00400664 /* RW-4R */
-#define NV_PGRAPH_BBASE3__ALIAS_1                NV_PGRAPH_BBASE(3) /*       */
-#define NV_PGRAPH_BBASE3_LINADRS                               23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE3_LINADRS_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE4                                 0x00400668 /* RW-4R */
-#define NV_PGRAPH_BBASE4__ALIAS_1                NV_PGRAPH_BBASE(4) /*       */
-#define NV_PGRAPH_BBASE4_LINADRS                               23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE4_LINADRS_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_BBASE5                                 0x0040066C /* RW-4R */
-#define NV_PGRAPH_BBASE5__ALIAS_1                NV_PGRAPH_BBASE(5) /*       */
-#define NV_PGRAPH_BBASE5_LINADRS                               23:0 /* RWIUF */
-#define NV_PGRAPH_BBASE5_LINADRS_0                       0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPITCH(i)                      (0x00400670+(i)*4) /* RW-4A */
-#define NV_PGRAPH_BPITCH__SIZE_1                                  5 /*       */
-#define NV_PGRAPH_BPITCH_VALUE                                 12:0 /* RWIUF */
-#define NV_PGRAPH_BPITCH_VALUE_0                         0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPITCH0                                0x00400670 /* RW-4R */
-#define NV_PGRAPH_BPITCH0__ALIAS_1              NV_PGRAPH_BPITCH(0) /*       */
-#define NV_PGRAPH_BPITCH0_VALUE                                12:0 /* RWIUF */
-#define NV_PGRAPH_BPITCH0_VALUE_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPITCH1                                0x00400674 /* RW-4R */
-#define NV_PGRAPH_BPITCH1__ALIAS_1              NV_PGRAPH_BPITCH(1) /*       */
-#define NV_PGRAPH_BPITCH1_VALUE                                12:0 /* RWIUF */
-#define NV_PGRAPH_BPITCH1_VALUE_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPITCH2                                0x00400678 /* RW-4R */
-#define NV_PGRAPH_BPITCH2__ALIAS_1              NV_PGRAPH_BPITCH(2) /*       */
-#define NV_PGRAPH_BPITCH2_VALUE                                12:0 /* RWIUF */
-#define NV_PGRAPH_BPITCH2_VALUE_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPITCH3                                0x0040067C /* RW-4R */
-#define NV_PGRAPH_BPITCH3__ALIAS_1              NV_PGRAPH_BPITCH(3) /*       */
-#define NV_PGRAPH_BPITCH3_VALUE                                12:0 /* RWIUF */
-#define NV_PGRAPH_BPITCH3_VALUE_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPITCH4                                0x00400680 /* RW-4R */
-#define NV_PGRAPH_BPITCH4__ALIAS_1              NV_PGRAPH_BPITCH(4) /*       */
-#define NV_PGRAPH_BPITCH4_VALUE                                12:0 /* RWIUF */
-#define NV_PGRAPH_BPITCH4_VALUE_0                        0x00000000 /* RWI-V */
-#define NV_PGRAPH_BLIMIT(i)                      (0x00400684+(i)*4) /* RW-4A */
-#define NV_PGRAPH_BLIMIT__SIZE_1                                  6 /*       */
-#define NV_PGRAPH_BLIMIT_VALUE                                 23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT_TYPE                                 31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT_TYPE_IN_MEMORY                  0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT_TYPE_NULL                       0x00000001 /* RWI-V */
-#define NV_PGRAPH_BLIMIT0                                0x00400684 /* RW-4R */
-#define NV_PGRAPH_BLIMIT0__ALIAS_1              NV_PGRAPH_BLIMIT(0) /*       */
-#define NV_PGRAPH_BLIMIT0_VALUE                                23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT0_TYPE                                31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT0_TYPE_IN_MEMORY                 0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT0_TYPE_NULL                      0x00000001 /* RWI-V */
-#define NV_PGRAPH_BLIMIT1                                0x00400688 /* RW-4R */
-#define NV_PGRAPH_BLIMIT1__ALIAS_1              NV_PGRAPH_BLIMIT(1) /*       */
-#define NV_PGRAPH_BLIMIT1_VALUE                                23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT1_TYPE                                31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT1_TYPE_IN_MEMORY                 0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT1_TYPE_NULL                      0x00000001 /* RWI-V */
-#define NV_PGRAPH_BLIMIT2                                0x0040068c /* RW-4R */
-#define NV_PGRAPH_BLIMIT2__ALIAS_1              NV_PGRAPH_BLIMIT(2) /*       */
-#define NV_PGRAPH_BLIMIT2_VALUE                                23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT2_TYPE                                31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT2_TYPE_IN_MEMORY                 0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT2_TYPE_NULL                      0x00000001 /* RWI-V */
-#define NV_PGRAPH_BLIMIT3                                0x00400690 /* RW-4R */
-#define NV_PGRAPH_BLIMIT3__ALIAS_1              NV_PGRAPH_BLIMIT(3) /*       */
-#define NV_PGRAPH_BLIMIT3_VALUE                                23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT3_TYPE                                31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT3_TYPE_IN_MEMORY                 0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT3_TYPE_NULL                      0x00000001 /* RWI-V */
-#define NV_PGRAPH_BLIMIT4                                0x00400694 /* RW-4R */
-#define NV_PGRAPH_BLIMIT4__ALIAS_1              NV_PGRAPH_BLIMIT(4) /*       */
-#define NV_PGRAPH_BLIMIT4_VALUE                                23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT4_TYPE                                31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT4_TYPE_IN_MEMORY                 0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT4_TYPE_NULL                      0x00000001 /* RWI-V */
-#define NV_PGRAPH_BLIMIT5                                0x00400698 /* RW-4R */
-#define NV_PGRAPH_BLIMIT5__ALIAS_1              NV_PGRAPH_BLIMIT(5) /*       */
-#define NV_PGRAPH_BLIMIT5_VALUE                                23:0 /* RWXUF */
-#define NV_PGRAPH_BLIMIT5_TYPE                                31:31 /* RWIVF */
-#define NV_PGRAPH_BLIMIT5_TYPE_IN_MEMORY                 0x00000000 /* RW--V */
-#define NV_PGRAPH_BLIMIT5_TYPE_NULL                      0x00000001 /* RWI-V */
-#define NV_PGRAPH_BSWIZZLE2                              0x0040069c /* RW-4R */
-#define NV_PGRAPH_BSWIZZLE2_WIDTH                             19:16 /* RWIUF */
-#define NV_PGRAPH_BSWIZZLE2_WIDTH_0                      0x00000000 /* RWI-V */
-#define NV_PGRAPH_BSWIZZLE2_HEIGHT                            27:24 /* RWIUF */
-#define NV_PGRAPH_BSWIZZLE2_HEIGHT_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BSWIZZLE5                              0x004006a0 /* RW-4R */
-#define NV_PGRAPH_BSWIZZLE5_WIDTH                             19:16 /* RWIUF */
-#define NV_PGRAPH_BSWIZZLE5_WIDTH_0                      0x00000000 /* RWI-V */
-#define NV_PGRAPH_BSWIZZLE5_HEIGHT                            27:24 /* RWIUF */
-#define NV_PGRAPH_BSWIZZLE5_HEIGHT_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL                                 0x00400724 /* RW-4R */
-#define NV_PGRAPH_BPIXEL_DEPTH0                                 3:0 /* RWIVF */
-#define NV_PGRAPH_BPIXEL_DEPTH0_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_Y8                       0x00000001 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X1R5G5B5_Z1R5G5B5        0x00000002 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X1R5G5B5_O1R5G5B5        0x00000003 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_A1R5G5B5                 0x00000004 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_R5G6B5                   0x00000005 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_Y16                      0x00000006 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X8R8G8B8_Z8R8G8B8        0x00000007 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X8R8G8B8_O1Z7R8G8B8      0x00000008 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X1A7R8G8B8_Z1A7R8G8B8    0x00000009 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X1A7R8G8B8_O1A7R8G8B8    0x0000000a /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_X8R8G8B8_O8R8G8B8        0x0000000b /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_A8R8G8B8                 0x0000000c /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_Y32                      0x0000000d /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_V8YB8U8YA8               0x0000000e /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH0_YB8V8YA8U8               0x0000000f /* RW--V */ 
-#define NV_PGRAPH_BPIXEL_DEPTH1                                 7:4 /* RWIVF */
-#define NV_PGRAPH_BPIXEL_DEPTH1_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_Y8                       0x00000001 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X1R5G5B5_Z1R5G5B5        0x00000002 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X1R5G5B5_O1R5G5B5        0x00000003 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_A1R5G5B5                 0x00000004 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_R5G6B5                   0x00000005 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_Y16                      0x00000006 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X8R8G8B8_Z8R8G8B8        0x00000007 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X8R8G8B8_O1Z7R8G8B8      0x00000008 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X1A7R8G8B8_Z1A7R8G8B8    0x00000009 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X1A7R8G8B8_O1A7R8G8B8    0x0000000a /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_X8R8G8B8_O8R8G8B8        0x0000000b /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_A8R8G8B8                 0x0000000c /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_Y32                      0x0000000d /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_V8YB8U8YA8               0x0000000e /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH1_YB8V8YA8U8               0x0000000f /* RW--V */ 
-#define NV_PGRAPH_BPIXEL_DEPTH2                                11:8 /* RWIVF */
-#define NV_PGRAPH_BPIXEL_DEPTH2_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_Y8                       0x00000001 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X1R5G5B5_Z1R5G5B5        0x00000002 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X1R5G5B5_O1R5G5B5        0x00000003 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_A1R5G5B5                 0x00000004 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_R5G6B5                   0x00000005 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_Y16                      0x00000006 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X8R8G8B8_Z8R8G8B8        0x00000007 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X8R8G8B8_O1Z7R8G8B8      0x00000008 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X1A7R8G8B8_Z1A7R8G8B8    0x00000009 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X1A7R8G8B8_O1A7R8G8B8    0x0000000a /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_X8R8G8B8_O8R8G8B8        0x0000000b /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_A8R8G8B8                 0x0000000c /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_Y32                      0x0000000d /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_V8YB8U8YA8               0x0000000e /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH2_YB8V8YA8U8               0x0000000f /* RW--V */ 
-#define NV_PGRAPH_BPIXEL_DEPTH3                               15:12 /* RWIVF */
-#define NV_PGRAPH_BPIXEL_DEPTH3_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_Y8                       0x00000001 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X1R5G5B5_Z1R5G5B5        0x00000002 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X1R5G5B5_O1R5G5B5        0x00000003 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_A1R5G5B5                 0x00000004 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_R5G6B5                   0x00000005 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_Y16                      0x00000006 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X8R8G8B8_Z8R8G8B8        0x00000007 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X8R8G8B8_O1Z7R8G8B8      0x00000008 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X1A7R8G8B8_Z1A7R8G8B8    0x00000009 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X1A7R8G8B8_O1A7R8G8B8    0x0000000a /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_X8R8G8B8_O8R8G8B8        0x0000000b /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_A8R8G8B8                 0x0000000c /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_Y32                      0x0000000d /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_V8YB8U8YA8               0x0000000e /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH3_YB8V8YA8U8               0x0000000f /* RW--V */ 
-#define NV_PGRAPH_BPIXEL_DEPTH4                               19:16 /* RWIVF */
-#define NV_PGRAPH_BPIXEL_DEPTH4_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_Y8                       0x00000001 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X1R5G5B5_Z1R5G5B5        0x00000002 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X1R5G5B5_O1R5G5B5        0x00000003 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_A1R5G5B5                 0x00000004 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_R5G6B5                   0x00000005 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_Y16                      0x00000006 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X8R8G8B8_Z8R8G8B8        0x00000007 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X8R8G8B8_O1Z7R8G8B8      0x00000008 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X1A7R8G8B8_Z1A7R8G8B8    0x00000009 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X1A7R8G8B8_O1A7R8G8B8    0x0000000a /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_X8R8G8B8_O8R8G8B8        0x0000000b /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_A8R8G8B8                 0x0000000c /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_Y32                      0x0000000d /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_V8YB8U8YA8               0x0000000e /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH4_YB8V8YA8U8               0x0000000f /* RW--V */ 
-#define NV_PGRAPH_BPIXEL_DEPTH5                               23:20 /* RWIVF */
-#define NV_PGRAPH_BPIXEL_DEPTH5_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_Y8                       0x00000001 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X1R5G5B5_Z1R5G5B5        0x00000002 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X1R5G5B5_O1R5G5B5        0x00000003 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_A1R5G5B5                 0x00000004 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_R5G6B5                   0x00000005 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_Y16                      0x00000006 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X8R8G8B8_Z8R8G8B8        0x00000007 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X8R8G8B8_O1Z7R8G8B8      0x00000008 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X1A7R8G8B8_Z1A7R8G8B8    0x00000009 /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X1A7R8G8B8_O1A7R8G8B8    0x0000000a /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_X8R8G8B8_O8R8G8B8        0x0000000b /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_A8R8G8B8                 0x0000000c /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_Y32                      0x0000000d /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_V8YB8U8YA8               0x0000000e /* RW--V */
-#define NV_PGRAPH_BPIXEL_DEPTH5_YB8V8YA8U8               0x0000000f /* RW--V */ 
-#define NV_PGRAPH_LIMIT_VIOL_PIX                         0x00400610 /* RW-4R */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_ADRS                          23:0 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_ADRS_0                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_BLIT                         29:29 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_BLIT_NO_VIOL            0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_BLIT_VIOL               0x00000001 /* RW--V */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_LIMIT                        30:30 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_LIMIT_NO_VIOL           0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_LIMIT_VIOL              0x00000001 /* RW--V */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_OVRFLW                       31:31 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_OVRFLW_NO_VIOL          0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_PIX_OVRFLW_VIOL             0x00000001 /* RW--V */
-#define NV_PGRAPH_LIMIT_VIOL_Z                           0x00400614 /* RW-4R */
-#define NV_PGRAPH_LIMIT_VIOL_Z_ADRS                            23:0 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_Z_ADRS_0                    0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_Z_LIMIT                          30:30 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_Z_LIMIT_NO_VIOL             0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_Z_LIMIT_VIOL                0x00000001 /* RW--V */
-#define NV_PGRAPH_LIMIT_VIOL_Z_OVRFLW                         31:31 /* RWIVF */
-#define NV_PGRAPH_LIMIT_VIOL_Z_OVRFLW_NO_VIOL            0x00000000 /* RWI-V */
-#define NV_PGRAPH_LIMIT_VIOL_Z_OVRFLW_VIOL               0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE                                  0x00400710 /* RW-4R */
-#define NV_PGRAPH_STATE_BUFFER_0                                0:0 /* RWIVF */
-#define NV_PGRAPH_STATE_BUFFER_0_INVALID                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_BUFFER_0_VALID                   0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_BUFFER_1                                1:1 /* RWIVF */
-#define NV_PGRAPH_STATE_BUFFER_1_INVALID                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_BUFFER_1_VALID                   0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_BUFFER_2                                2:2 /* RWIVF */
-#define NV_PGRAPH_STATE_BUFFER_2_INVALID                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_BUFFER_2_VALID                   0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_BUFFER_3                                3:3 /* RWIVF */
-#define NV_PGRAPH_STATE_BUFFER_3_INVALID                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_BUFFER_3_VALID                   0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_BUFFER_4                                4:4 /* RWIVF */
-#define NV_PGRAPH_STATE_BUFFER_4_INVALID                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_BUFFER_4_VALID                   0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_BUFFER_5                                5:5 /* RWIVF */
-#define NV_PGRAPH_STATE_BUFFER_5_INVALID                 0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_BUFFER_5_VALID                   0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PITCH_0                                 8:8 /* RWIVF */
-#define NV_PGRAPH_STATE_PITCH_0_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PITCH_0_VALID                    0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PITCH_1                                 9:9 /* RWIVF */
-#define NV_PGRAPH_STATE_PITCH_1_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PITCH_1_VALID                    0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PITCH_2                               10:10 /* RWIVF */
-#define NV_PGRAPH_STATE_PITCH_2_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PITCH_2_VALID                    0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PITCH_3                               11:11 /* RWIVF */
-#define NV_PGRAPH_STATE_PITCH_3_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PITCH_3_VALID                    0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PITCH_4                               12:12 /* RWIVF */
-#define NV_PGRAPH_STATE_PITCH_4_INVALID                  0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PITCH_4_VALID                    0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_CHROMA_COLOR                          16:16 /* RWIVF */
-#define NV_PGRAPH_STATE_CHROMA_COLOR_INVALID             0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_CHROMA_COLOR_VALID               0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_CHROMA_COLORFMT                       17:17 /* RWIVF */
-#define NV_PGRAPH_STATE_CHROMA_COLORFMT_INVALID          0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_CHROMA_COLORFMT_VALID            0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_CPATTERN_COLORFMT                     20:20 /* RWIVF */
-#define NV_PGRAPH_STATE_CPATTERN_COLORFMT_INVALID        0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_CPATTERN_COLORFMT_VALID          0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_CPATTERN_MONOFMT                      21:21 /* RWIVF */
-#define NV_PGRAPH_STATE_CPATTERN_MONOFMT_INVALID         0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_CPATTERN_MONOFMT_VALID           0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_CPATTERN_SELECT                       22:22 /* RWIVF */
-#define NV_PGRAPH_STATE_CPATTERN_SELECT_INVALID          0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_CPATTERN_SELECT_VALID            0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PATTERN_COLOR0                        24:24 /* RWIVF */
-#define NV_PGRAPH_STATE_PATTERN_COLOR0_INVALID           0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PATTERN_COLOR0_VALID             0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PATTERN_COLOR1                        25:25 /* RWIVF */
-#define NV_PGRAPH_STATE_PATTERN_COLOR1_INVALID           0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PATTERN_COLOR1_VALID             0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PATTERN_PATT0                         26:26 /* RWIVF */
-#define NV_PGRAPH_STATE_PATTERN_PATT0_INVALID            0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PATTERN_PATT0_VALID              0x00000001 /* RW--V */
-#define NV_PGRAPH_STATE_PATTERN_PATT1                         27:27 /* RWIVF */
-#define NV_PGRAPH_STATE_PATTERN_PATT1_INVALID            0x00000000 /* RWI-V */
-#define NV_PGRAPH_STATE_PATTERN_PATT1_VALID              0x00000001 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX                            0x00400728 /* RW-4R */
-#define NV_PGRAPH_CACHE_INDEX_BANK                              2:2 /* RWXVF */
-#define NV_PGRAPH_CACHE_INDEX_BANK_10                    0x00000000 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX_BANK_32                    0x00000001 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX_ADRS                             12:3 /* RWXVF */
-#define NV_PGRAPH_CACHE_INDEX_ADRS_0                     0x00000000 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX_ADRS_1024                  0x00000400 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX_OP                              14:13 /* RWXVF */
-#define NV_PGRAPH_CACHE_INDEX_OP_WR_CACHE                0x00000000 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX_OP_RD_CACHE                0x00000001 /* RW--V */
-#define NV_PGRAPH_CACHE_INDEX_OP_RD_INDEX                0x00000002 /* RW--V */
-#define NV_PGRAPH_CACHE_RAM                              0x0040072c /* RW-4R */
-#define NV_PGRAPH_CACHE_RAM_VALUE                              31:0 /* RWXVF */
-#define NV_PGRAPH_DMA_PITCH                              0x00400760 /* RW-4R */
-#define NV_PGRAPH_DMA_PITCH_S0                                 15:0 /* RWXSF */
-#define NV_PGRAPH_DMA_PITCH_S1                                31:16 /* RWXSF */
-#define NV_PGRAPH_DVD_COLORFMT                           0x00400764 /* RW-4R */
-#define NV_PGRAPH_DVD_COLORFMT_IMAGE                            5:0 /* RWNVF */
-#define NV_PGRAPH_DVD_COLORFMT_IMAGE_FORMAT_INVALID            0x00 /* RWN-V */
-#define NV_PGRAPH_DVD_COLORFMT_IMAGE_FORMAT_LE_V8YB8U8YA8      0x12 /* RW--V */
-#define NV_PGRAPH_DVD_COLORFMT_IMAGE_FORMAT_LE_YB8V8YA8U8      0x13 /* RW--V */
-#define NV_PGRAPH_DVD_COLORFMT_OVLY                             9:8 /* RWNVF */
-#define NV_PGRAPH_DVD_COLORFMT_OVLY_FORMAT_INVALID             0x00 /* RWN-V */
-#define NV_PGRAPH_DVD_COLORFMT_OVLY_FORMAT_LE_A8Y8U8V8         0x01 /* RW--V */
-#define NV_PGRAPH_DVD_COLORFMT_OVLY_FORMAT_LE_A4V6YB6A4U6YA6   0x02 /* RW--V */
-#define NV_PGRAPH_DVD_COLORFMT_OVLY_FORMAT_TRANSPARENT         0x03 /* RW--V */
-#define NV_PGRAPH_SCALED_FORMAT                          0x00400768 /* RW-4R */
-#define NV_PGRAPH_SCALED_FORMAT_ORIGIN                        17:16 /* RWIVF */
-#define NV_PGRAPH_SCALED_FORMAT_ORIGIN_INVALID           0x00000000 /* RWI-V */
-#define NV_PGRAPH_SCALED_FORMAT_ORIGIN_CENTER            0x00000001 /* RW--V */
-#define NV_PGRAPH_SCALED_FORMAT_ORIGIN_CORNER            0x00000002 /* RW--V */
-#define NV_PGRAPH_SCALED_FORMAT_INTERPOLATOR                  24:24 /* RWIVF */
-#define NV_PGRAPH_SCALED_FORMAT_INTERPOLATOR_ZOH         0x00000000 /* RWI-V */
-#define NV_PGRAPH_SCALED_FORMAT_INTERPOLATOR_FOH         0x00000001 /* RW--V */
-#define NV_PGRAPH_PATT_COLOR0                            0x00400800 /* RW-4R */
-#define NV_PGRAPH_PATT_COLOR0_VALUE                            31:0 /* RWXUF */
-#define NV_PGRAPH_PATT_COLOR1                            0x00400804 /* RW-4R */
-#define NV_PGRAPH_PATT_COLOR1_VALUE                            31:0 /* RWXUF */
-#define NV_PGRAPH_PATT_COLORRAM(i)               (0x00400900+(i)*4) /* R--4A */
-#define NV_PGRAPH_PATT_COLORRAM__SIZE_1                          64 /*       */
-#define NV_PGRAPH_PATT_COLORRAM_VALUE                          23:0 /* R--UF */
-#define NV_PGRAPH_PATTERN(i)                     (0x00400808+(i)*4) /* RW-4A */
-#define NV_PGRAPH_PATTERN__SIZE_1                                 2 /*       */
-#define NV_PGRAPH_PATTERN_BITMAP                               31:0 /* RWXVF */
-#define NV_PGRAPH_PATTERN_SHAPE                          0x00400810 /* RW-4R */
-#define NV_PGRAPH_PATTERN_SHAPE_VALUE                           1:0 /* RWXVF */
-#define NV_PGRAPH_PATTERN_SHAPE_VALUE_8X_8Y              0x00000000 /* RW--V */
-#define NV_PGRAPH_PATTERN_SHAPE_VALUE_64X_1Y             0x00000001 /* RW--V */
-#define NV_PGRAPH_PATTERN_SHAPE_VALUE_1X_64Y             0x00000002 /* RW--V */
-#define NV_PGRAPH_PATTERN_SHAPE_SELECT                          4:4 /* RWXVF */
-#define NV_PGRAPH_PATTERN_SHAPE_SELECT_2COLOR            0x00000000 /* RW--V */
-#define NV_PGRAPH_PATTERN_SHAPE_SELECT_FULLCOLOR         0x00000001 /* RW--V */
-#define NV_PGRAPH_MONO_COLOR0                            0x00400600 /* RW-4R */
-#define NV_PGRAPH_MONO_COLOR0_VALUE                            31:0 /* RWXUF */
-#define NV_PGRAPH_ROP3                                   0x00400604 /* RW-4R */
-#define NV_PGRAPH_ROP3_VALUE                                    7:0 /* RWXVF */
-#define NV_PGRAPH_CHROMA                                 0x00400814 /* RW-4R */
-#define NV_PGRAPH_CHROMA_VALUE                                 31:0 /* RWXUF */
-#define NV_PGRAPH_BETA_AND                               0x00400608 /* RW-4R */
-#define NV_PGRAPH_BETA_AND_VALUE_FRACTION                     30:23 /* RWXUF */
-#define NV_PGRAPH_BETA_PREMULT                           0x0040060c /* RW-4R */
-#define NV_PGRAPH_BETA_PREMULT_VALUE                           31:0 /* RWXUF */
-#define NV_PGRAPH_CONTROL0                               0x00400818 /* RW-4R */
-#define NV_PGRAPH_CONTROL1                               0x0040081c /* RW-4R */
-#define NV_PGRAPH_CONTROL2                               0x00400820 /* RW-4R */
-#define NV_PGRAPH_BLEND                                  0x00400824 /* RW-4R */
-#define NV_PGRAPH_DPRAM_INDEX                            0x00400828 /* RW-4R */
-#define NV_PGRAPH_DPRAM_INDEX_ADRS                              6:0 /* RWIVF */
-#define NV_PGRAPH_DPRAM_INDEX_ADRS_0                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT                           10:8 /* RWIVF */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_ADRS_0              0x00000000 /* RWI-V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_ADRS_1              0x00000001 /* RW--V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_DATA_0              0x00000002 /* RW--V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_DATA_1              0x00000003 /* RW--V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_WE_0                0x00000004 /* RW--V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_WE_1                0x00000005 /* RW--V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_ALPHA_0             0x00000006 /* RW--V */
-#define NV_PGRAPH_DPRAM_INDEX_SELECT_ALPHA_1             0x00000007 /* RW--V */
-#define NV_PGRAPH_DPRAM_DATA                             0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_DATA_VALUE                             31:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_ADRS_0                           0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_ADRS_0__ALIAS_1        NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_ADRS_0_VALUE                           19:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_ADRS_1                           0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_ADRS_1__ALIAS_1        NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_ADRS_1_VALUE                           19:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_DATA_0                           0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_DATA_0__ALIAS_1        NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_DATA_0_VALUE                           31:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_DATA_1                           0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_DATA_1__ALIAS_1        NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_DATA_1_VALUE                           31:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_WE_0                             0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_WE_0__ALIAS_1          NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_WE_0_VALUE                             23:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_WE_1                             0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_WE_1__ALIAS_1          NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_WE_1_VALUE                             23:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_ALPHA_0                          0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_ALPHA_0__ALIAS_1       NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_ALPHA_0_VALUE                          31:0 /* RWXVF */
-#define NV_PGRAPH_DPRAM_ALPHA_1                          0x0040082c /* RW-4R */
-#define NV_PGRAPH_DPRAM_ALPHA_1__ALIAS_1       NV_PGRAPH_DPRAM_DATA /*       */
-#define NV_PGRAPH_DPRAM_ALPHA_1_VALUE                          31:0 /* RWXVF */
-#define NV_PGRAPH_STORED_FMT                             0x00400830 /* RW-4R */
-#define NV_PGRAPH_STORED_FMT_MONO0                              5:0 /* RWXVF */
-#define NV_PGRAPH_STORED_FMT_PATT0                             13:8 /* RWXVF */
-#define NV_PGRAPH_STORED_FMT_PATT1                            21:16 /* RWXVF */
-#define NV_PGRAPH_STORED_FMT_CHROMA                           29:24 /* RWXVF */
-#define NV_PGRAPH_FORMATS                                0x00400618 /* RW-4R */
-#define NV_PGRAPH_FORMATS_ROP                                   2:0 /* R-XVF */
-#define NV_PGRAPH_FORMATS_ROP_Y8                         0x00000000 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_RGB15                      0x00000001 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_RGB16                      0x00000002 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_Y16                        0x00000003 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_INVALID                    0x00000004 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_RGB24                      0x00000005 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_RGB30                      0x00000006 /* -W--V */
-#define NV_PGRAPH_FORMATS_ROP_Y32                        0x00000007 /* -W--V */
-#define NV_PGRAPH_FORMATS_SRC                                   9:4 /* R-XVF */
-#define NV_PGRAPH_FORMATS_SRC_INVALID                    0x00000000 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_Y8                      0x00000001 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X16A8Y8                 0x00000002 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X24Y8                   0x00000003 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_A1R5G5B5                0x00000006 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X1R5G5B5                0x00000007 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X16A1R5G5B5             0x00000008 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X17R5G5B5               0x00000009 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_R5G6B5                  0x0000000A /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_A16R5G6B5               0x0000000B /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X16R5G6B5               0x0000000C /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_A8R8G8B8                0x0000000D /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X8R8G8B8                0x0000000E /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_Y16                     0x0000000F /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_A16Y16                  0x00000010 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_X16Y16                  0x00000011 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_V8YB8U8YA8              0x00000012 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_YB8V8YA8U8              0x00000013 /* RW--V */
-#define NV_PGRAPH_FORMATS_SRC_LE_Y32                     0x00000014 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB                                  15:12 /* R-XVF */
-#define NV_PGRAPH_FORMATS_FB_INVALID                     0x00000000 /* RWI-V */
-#define NV_PGRAPH_FORMATS_FB_Y8                          0x00000001 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X1R5G5B5_Z1R5G5B5           0x00000002 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X1R5G5B5_O1R5G5B5           0x00000003 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_A1R5G5B5                    0x00000004 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_R5G6B5                      0x00000005 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_Y16                         0x00000006 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X8R8G8B8_Z8R8G8B8           0x00000007 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X8R8G8B8_O1Z7R8G8B8         0x00000008 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X1A7R8G8B8_Z1A7R8G8B8       0x00000009 /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X1A7R8G8B8_O1A7R8G8B8       0x0000000a /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_X8R8G8B8_O8R8G8B8           0x0000000b /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_A8R8G8B8                    0x0000000c /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_Y32                         0x0000000d /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_V8YB8U8YA8                  0x0000000e /* RW--V */
-#define NV_PGRAPH_FORMATS_FB_YB8V8YA8U8                  0x0000000f /* RW--V */ 
-#define NV_PGRAPH_ABS_X_RAM(i)                   (0x00400400+(i)*4) /* RW-4A */
-#define NV_PGRAPH_ABS_X_RAM__SIZE_1                              32 /*       */
-#define NV_PGRAPH_ABS_X_RAM_VALUE                              31:0 /* RWXUF */
-#define NV_PGRAPH_X_RAM_BPORT(i)                 (0x00400c00+(i)*4) /* R--4A */
-#define NV_PGRAPH_X_RAM_BPORT__SIZE_1                            32 /*       */
-#define NV_PGRAPH_X_RAM_BPORT_VALUE                            31:0 /* R--UF */
-#define NV_PGRAPH_ABS_Y_RAM(i)                   (0x00400480+(i)*4) /* RW-4A */
-#define NV_PGRAPH_ABS_Y_RAM__SIZE_1                              32 /*       */
-#define NV_PGRAPH_ABS_Y_RAM_VALUE                              31:0 /* RWXUF */
-#define NV_PGRAPH_Y_RAM_BPORT(i)                 (0x00400c80+(i)*4) /* R--4A */
-#define NV_PGRAPH_Y_RAM_BPORT__SIZE_1                            32 /*       */
-#define NV_PGRAPH_Y_RAM_BPORT_VALUE                            31:0 /* R--UF */
-#define NV_PGRAPH_XY_LOGIC_MISC0                         0x00400514 /* RW-4R */
-#define NV_PGRAPH_XY_LOGIC_MISC0_COUNTER                       17:0 /* RWBUF */
-#define NV_PGRAPH_XY_LOGIC_MISC0_COUNTER_0               0x00000000 /* RWB-V */
-#define NV_PGRAPH_XY_LOGIC_MISC0_DIMENSION                    20:20 /* RWVVF */
-#define NV_PGRAPH_XY_LOGIC_MISC0_DIMENSION_NONZERO       0x00000000 /* RWV-V */
-#define NV_PGRAPH_XY_LOGIC_MISC0_DIMENSION_ZERO          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC0_INDEX                        31:28 /* RWBUF */
-#define NV_PGRAPH_XY_LOGIC_MISC0_INDEX_0                 0x00000000 /* RWB-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1                         0x00400518 /* RW-4R */
-#define NV_PGRAPH_XY_LOGIC_MISC1_INITIAL                        0:0 /* RWNVF */
-#define NV_PGRAPH_XY_LOGIC_MISC1_INITIAL_NEEDED          0x00000000 /* RWN-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_INITIAL_DONE            0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_XTRACLIPX                      4:4 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC1_XTRACLIPX_NOTNULL       0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_XTRACLIPX_NULL          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_XTRACLIPY                      5:5 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC1_XTRACLIPY_NOTNULL       0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_XTRACLIPY_NULL          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_XIMAX                    12:12 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_XIMAX_UUMAX         0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_XIMAX_IMAGEMAX      0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_YIMAX                    16:16 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_YIMAX_UUMAX         0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_YIMAX_IMAGEMAX      0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_XXTRA                    20:20 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_XXTRA_CLIPMAX       0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC1_SEL_XXTRA_IMAGEMAX      0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC2                         0x0040051C /* RW-4R */
-#define NV_PGRAPH_XY_LOGIC_MISC2_HANDOFF                        0:0 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC2_HANDOFF_DISABLE         0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_HANDOFF_ENABLE          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_XTRACLIPX                      4:4 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC2_XTRACLIPX_NOTNULL       0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_XTRACLIPX_NULL          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_XTRACLIPY                      5:5 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC2_XTRACLIPY_NOTNULL       0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_XTRACLIPY_NULL          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_XIMAX                    12:12 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_XIMAX_UCMAX         0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_XIMAX_IMAGEMAX      0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_YIMAX                    16:16 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_YIMAX_UCMAX         0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_YIMAX_IMAGEMAX      0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_XXTRA                    20:20 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_XXTRA_CLIPMAX       0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC2_SEL_XXTRA_IMAGEMAX      0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3                         0x00400520 /* RW-4R */
-#define NV_PGRAPH_XY_LOGIC_MISC3_WDIMY_EQ_0                     0:0 /* RWXVF */
-#define NV_PGRAPH_XY_LOGIC_MISC3_WDIMY_EQ_0_NULL         0x00000000 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_WDIMY_EQ_0_TRUE         0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_RELOAD_WDIMY                   4:4 /* RWXVF */
-#define NV_PGRAPH_XY_LOGIC_MISC3_RELOAD_WDIMY_NULL       0x00000000 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_RELOAD_WDIMY_TRUE       0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_RELOAD_WX                      8:8 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC3_RELOAD_WX_NULL          0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_RELOAD_WX_TRUE          0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_ALG                     12:12 /* RWIVF */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_ALG_NULL           0x00000000 /* RWI-V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_ALG_TRUE           0x00000001 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_DIMX                    22:16 /* RWXUF */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_DIMX_0             0x00000000 /* RW--V */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_WDIMX                   30:24 /* RWXUF */
-#define NV_PGRAPH_XY_LOGIC_MISC3_TEXT_WDIMX_0            0x00000000 /* RW--V */
-#define NV_PGRAPH_X_MISC                                 0x00400500 /* RW-4R */
-#define NV_PGRAPH_X_MISC_BIT33_0                                0:0 /* RWNVF */
-#define NV_PGRAPH_X_MISC_BIT33_0_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_BIT33_1                                1:1 /* RWNVF */
-#define NV_PGRAPH_X_MISC_BIT33_1_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_BIT33_2                                2:2 /* RWNVF */
-#define NV_PGRAPH_X_MISC_BIT33_2_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_BIT33_3                                3:3 /* RWNVF */
-#define NV_PGRAPH_X_MISC_BIT33_3_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_RANGE_0                                4:4 /* RWNVF */
-#define NV_PGRAPH_X_MISC_RANGE_0_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_RANGE_1                                5:5 /* RWNVF */
-#define NV_PGRAPH_X_MISC_RANGE_1_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_RANGE_2                                6:6 /* RWNVF */
-#define NV_PGRAPH_X_MISC_RANGE_2_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_RANGE_3                                7:7 /* RWNVF */
-#define NV_PGRAPH_X_MISC_RANGE_3_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_X_MISC_ADDER_OUTPUT                         29:28 /* RWXVF */
-#define NV_PGRAPH_X_MISC_ADDER_OUTPUT_EQ_0               0x00000000 /* RW--V */
-#define NV_PGRAPH_X_MISC_ADDER_OUTPUT_LT_0               0x00000001 /* RW--V */
-#define NV_PGRAPH_X_MISC_ADDER_OUTPUT_GT_0               0x00000002 /* RW--V */
-#define NV_PGRAPH_Y_MISC                                 0x00400504 /* RW-4R */
-#define NV_PGRAPH_Y_MISC_BIT33_0                                0:0 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_BIT33_0_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_BIT33_1                                1:1 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_BIT33_1_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_BIT33_2                                2:2 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_BIT33_2_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_BIT33_3                                3:3 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_BIT33_3_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_RANGE_0                                4:4 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_RANGE_0_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_RANGE_1                                5:5 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_RANGE_1_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_RANGE_2                                6:6 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_RANGE_2_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_RANGE_3                                7:7 /* RWNVF */
-#define NV_PGRAPH_Y_MISC_RANGE_3_0                       0x00000000 /* RWN-V */
-#define NV_PGRAPH_Y_MISC_ADDER_OUTPUT                         29:28 /* RWXVF */
-#define NV_PGRAPH_Y_MISC_ADDER_OUTPUT_EQ_0               0x00000000 /* RW--V */
-#define NV_PGRAPH_Y_MISC_ADDER_OUTPUT_LT_0               0x00000001 /* RW--V */
-#define NV_PGRAPH_Y_MISC_ADDER_OUTPUT_GT_0               0x00000002 /* RW--V */
-#define NV_PGRAPH_ABS_UCLIP_XMIN                         0x0040053C /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIP_XMIN_VALUE                         15:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIP_XMAX                         0x00400544 /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIP_XMAX_VALUE                         17:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIP_YMIN                         0x00400540 /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIP_YMIN_VALUE                         15:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIP_YMAX                         0x00400548 /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIP_YMAX_VALUE                         17:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIPA_XMIN                        0x00400560 /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIPA_XMIN_VALUE                        15:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIPA_XMAX                        0x00400568 /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIPA_XMAX_VALUE                        17:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIPA_YMIN                        0x00400564 /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIPA_YMIN_VALUE                        15:0 /* RWXSF */
-#define NV_PGRAPH_ABS_UCLIPA_YMAX                        0x0040056C /* RW-4R */
-#define NV_PGRAPH_ABS_UCLIPA_YMAX_VALUE                        17:0 /* RWXSF */
-#define NV_PGRAPH_SOURCE_COLOR                           0x0040050C /* RW-4R */
-#define NV_PGRAPH_SOURCE_COLOR_VALUE                           31:0 /* RWNVF */
-#define NV_PGRAPH_SOURCE_COLOR_VALUE_0                   0x00000000 /* RWN-V */
-#define NV_PGRAPH_VALID1                                 0x00400508 /* RW-4R */
-#define NV_PGRAPH_VALID1_VLD                                   22:0 /* RWNVF */
-#define NV_PGRAPH_VALID1_VLD_0                           0x00000000 /* RWN-V */
-#define NV_PGRAPH_VALID1_CLIP_MIN                             28:28 /* RWIVF */
-#define NV_PGRAPH_VALID1_CLIP_MIN_NO_ERROR               0x00000000 /* RWI-V */
-#define NV_PGRAPH_VALID1_CLIP_MIN_ONLY                   0x00000001 /* RW--V */
-#define NV_PGRAPH_VALID1_CLIPA_MIN                            29:29 /* RWIVF */
-#define NV_PGRAPH_VALID1_CLIPA_MIN_NO_ERROR              0x00000000 /* RWI-V */
-#define NV_PGRAPH_VALID1_CLIPA_MIN_ONLY                  0x00000001 /* RW--V */
-#define NV_PGRAPH_VALID1_CLIP_MAX                             30:30 /* RWIVF */
-#define NV_PGRAPH_VALID1_CLIP_MAX_NO_ERROR               0x00000000 /* RWI-V */
-#define NV_PGRAPH_VALID1_CLIP_MAX_ONLY                   0x00000001 /* RW--V */
-#define NV_PGRAPH_VALID1_CLIPA_MAX                            31:31 /* RWIVF */
-#define NV_PGRAPH_VALID1_CLIPA_MAX_NO_ERROR              0x00000000 /* RWI-V */
-#define NV_PGRAPH_VALID1_CLIPA_MAX_ONLY                  0x00000001 /* RW--V */
-#define NV_PGRAPH_VALID2                                 0x00400578 /* RW-4R */
-#define NV_PGRAPH_VALID2_VLD2                                  28:0 /* RWNVF */
-#define NV_PGRAPH_VALID2_VLD2_0                          0x00000000 /* RWN-V */
-#define NV_PGRAPH_ABS_ICLIP_XMAX                         0x00400534 /* RW-4R */
-#define NV_PGRAPH_ABS_ICLIP_XMAX_VALUE                         17:0 /* RWXSF */
-#define NV_PGRAPH_ABS_ICLIP_YMAX                         0x00400538 /* RW-4R */
-#define NV_PGRAPH_ABS_ICLIP_YMAX_VALUE                         17:0 /* RWXSF */
-#define NV_PGRAPH_CLIPX_0                                0x00400524 /* RW-4R */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MIN                             1:0 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MAX                             3:2 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP0_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MIN                             5:4 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MAX                             7:6 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP1_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MIN                             9:8 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MAX                           11:10 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP2_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MIN                           13:12 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MAX                           15:14 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP3_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MIN                           17:16 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MAX                           19:18 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP4_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MIN                           21:20 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MAX                           23:22 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP5_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MIN                           25:24 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MAX                           27:26 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP6_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MIN                           29:28 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MAX                           31:30 /* RWNVF */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_0_CLIP7_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1                                0x00400528 /* RW-4R */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MIN                             1:0 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MAX                             3:2 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP8_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MIN                             5:4 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MAX                             7:6 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP9_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MIN                            9:8 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MAX                          11:10 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP10_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MIN                          13:12 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP11MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MAX                          15:14 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP11_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MIN                          17:16 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MAX                          19:18 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP12_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MIN                          21:20 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MAX                          23:22 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP13_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MIN                          25:24 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MAX                          27:26 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP14_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MIN                          29:28 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MAX                          31:30 /* RWNVF */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPX_1_CLIP15_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0                                0x0040052c /* RW-4R */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MIN                             1:0 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MAX                             3:2 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP0_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MIN                             5:4 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MAX                             7:6 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP1_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MIN                             9:8 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MAX                           11:10 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP2_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MIN                           13:12 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MAX                           15:14 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP3_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MIN                           17:16 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MAX                           19:18 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP4_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MIN                           21:20 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MAX                           23:22 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP5_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MIN                           25:24 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MAX                           27:26 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP6_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MIN                           29:28 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MAX                           31:30 /* RWNVF */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_0_CLIP7_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1                                0x00400530 /* RW-4R */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MIN                             1:0 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MAX                             3:2 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP8_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MIN                             5:4 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MIN_GT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MIN_LT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MAX                             7:6 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MAX_LT                   0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MAX_GT                   0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP9_MAX_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MIN                            9:8 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MAX                          11:10 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP10_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MIN                          13:12 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP11MIN_EQ                   0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MAX                          15:14 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP11_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MIN                          17:16 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MAX                          19:18 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP12_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MIN                          21:20 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MAX                          23:22 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP13_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MIN                          25:24 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MAX                          27:26 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP14_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MIN                          29:28 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MIN_GT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MIN_LT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MIN_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MAX                          31:30 /* RWNVF */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MAX_LT                  0x00000000 /* RW--V */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MAX_GT                  0x00000001 /* RWN-V */
-#define NV_PGRAPH_CLIPY_1_CLIP15_MAX_EQ                  0x00000002 /* RW--V */
-#define NV_PGRAPH_MISC24_0                               0x00400510 /* RW-4R */
-#define NV_PGRAPH_MISC24_0_VALUE                               23:0 /* RWXUF */
-#define NV_PGRAPH_MISC24_1                               0x00400570 /* RW-4R */
-#define NV_PGRAPH_MISC24_1_VALUE                               23:0 /* RWXUF */
-#define NV_PGRAPH_MISC24_2                               0x00400574 /* RW-4R */
-#define NV_PGRAPH_MISC24_2_VALUE                               23:0 /* RWXUF */
-#define NV_PGRAPH_PASSTHRU_0                             0x0040057C /* RW-4R */
-#define NV_PGRAPH_PASSTHRU_0_VALUE                             31:0 /* RWXUF */
-#define NV_PGRAPH_PASSTHRU_1                             0x00400580 /* RW-4R */
-#define NV_PGRAPH_PASSTHRU_1_VALUE                             31:0 /* RWXUF */
-#define NV_PGRAPH_PASSTHRU_2                             0x00400584 /* RW-4R */
-#define NV_PGRAPH_PASSTHRU_2_VALUE                             31:0 /* RWXUF */
-#define NV_PGRAPH_U_RAM(i)                       (0x00400d00+(i)*4) /* RW-4A */
-#define NV_PGRAPH_U_RAM__SIZE_1                                  16 /*       */
-#define NV_PGRAPH_U_RAM_VALUE                                  31:6 /* RWXFF */
-#define NV_PGRAPH_V_RAM(i)                       (0x00400d40+(i)*4) /* RW-4A */
-#define NV_PGRAPH_V_RAM__SIZE_1                                  16 /*       */
-#define NV_PGRAPH_V_RAM_VALUE                                  31:6 /* RWXFF */
-#define NV_PGRAPH_M_RAM(i)                       (0x00400d80+(i)*4) /* RW-4A */
-#define NV_PGRAPH_M_RAM__SIZE_1                                  16 /*       */
-#define NV_PGRAPH_M_RAM_VALUE                                  31:6 /* RWXFF */
-#define NV_PGRAPH_DMA_START_0                            0x00401000 /* RW-4R */
-#define NV_PGRAPH_DMA_START_0_VALUE                            31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_START_1                            0x00401004 /* RW-4R */
-#define NV_PGRAPH_DMA_START_1_VALUE                            31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_LENGTH                             0x00401008 /* RW-4R */
-#define NV_PGRAPH_DMA_LENGTH_VALUE                             21:0 /* RWXUF */
-#define NV_PGRAPH_DMA_MISC                               0x0040100C /* RW-4R */
-#define NV_PGRAPH_DMA_MISC_COUNT                               15:0 /* RWXUF */
-#define NV_PGRAPH_DMA_MISC_FMT_SRC                            18:16 /* RWXVF */
-#define NV_PGRAPH_DMA_MISC_FMT_DST                            22:20 /* RWXVF */
-#define NV_PGRAPH_DMA_DATA_0                             0x00401020 /* RW-4R */
-#define NV_PGRAPH_DMA_DATA_0_VALUE                             31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_DATA_1                             0x00401024 /* RW-4R */
-#define NV_PGRAPH_DMA_DATA_1_VALUE                             31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_RM                                 0x00401030 /* RW-4R */
-#define NV_PGRAPH_DMA_RM_ASSIST_A                               0:0 /* RWIVF */
-#define NV_PGRAPH_DMA_RM_ASSIST_A_NOT_PENDING            0x00000000 /* R-I-V */
-#define NV_PGRAPH_DMA_RM_ASSIST_A_PENDING                0x00000001 /* R---V */
-#define NV_PGRAPH_DMA_RM_ASSIST_A_RESET                  0x00000001 /* -W--C */
-#define NV_PGRAPH_DMA_RM_ASSIST_B                               1:1 /* RWIVF */
-#define NV_PGRAPH_DMA_RM_ASSIST_B_NOT_PENDING            0x00000000 /* R-I-V */
-#define NV_PGRAPH_DMA_RM_ASSIST_B_PENDING                0x00000001 /* R---V */
-#define NV_PGRAPH_DMA_RM_ASSIST_B_RESET                  0x00000001 /* -W--C */
-#define NV_PGRAPH_DMA_RM_WRITE_REQ                              4:4 /* CWIVF */
-#define NV_PGRAPH_DMA_RM_WRITE_REQ_NOT_PENDING           0x00000000 /* CWI-V */
-#define NV_PGRAPH_DMA_RM_WRITE_REQ_PENDING               0x00000001 /* -W--T */
-#define NV_PGRAPH_DMA_A_XLATE_INST                       0x00401040 /* RW-4R */
-#define NV_PGRAPH_DMA_A_XLATE_INST_VALUE                       15:0 /* RWXUF */
-#define NV_PGRAPH_DMA_A_CONTROL                          0x00401044 /* RW-4R */
-#define NV_PGRAPH_DMA_A_CONTROL_PAGE_TABLE                    12:12 /* RWIVF */
-#define NV_PGRAPH_DMA_A_CONTROL_PAGE_TABLE_NOT_PRESENT   0x00000000 /* RWI-V */
-#define NV_PGRAPH_DMA_A_CONTROL_PAGE_TABLE_PRESENT       0x00000001 /* RW--V */
-#define NV_PGRAPH_DMA_A_CONTROL_PAGE_ENTRY                    13:13 /* RWXVF */
-#define NV_PGRAPH_DMA_A_CONTROL_PAGE_ENTRY_NOT_LINEAR    0x00000000 /* RW--V */
-#define NV_PGRAPH_DMA_A_CONTROL_PAGE_ENTRY_LINEAR        0x00000001 /* RW--V */
-#define NV_PGRAPH_DMA_A_CONTROL_TARGET_NODE                   17:16 /* RWXUF */
-#define NV_PGRAPH_DMA_A_CONTROL_TARGET_NODE_NVM          0x00000000 /* RW--V */
-#define NV_PGRAPH_DMA_A_CONTROL_TARGET_NODE_PCI          0x00000002 /* RW--V */
-#define NV_PGRAPH_DMA_A_CONTROL_TARGET_NODE_AGP          0x00000003 /* RW--V */
-#define NV_PGRAPH_DMA_A_CONTROL_ADJUST                        31:20 /* RWXUF */
-#define NV_PGRAPH_DMA_A_LIMIT                            0x00401048 /* RW-4R */
-#define NV_PGRAPH_DMA_A_LIMIT_OFFSET                           31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_A_TLB_PTE                          0x0040104C /* RW-4R */
-#define NV_PGRAPH_DMA_A_TLB_PTE_ACCESS                          1:1 /* RWXVF */
-#define NV_PGRAPH_DMA_A_TLB_PTE_ACCESS_READ_ONLY         0x00000000 /* RW--V */
-#define NV_PGRAPH_DMA_A_TLB_PTE_ACCESS_READ_WRITE        0x00000001 /* RW--V */
-#define NV_PGRAPH_DMA_A_TLB_PTE_FRAME_ADDRESS                 31:12 /* RWXUF */
-#define NV_PGRAPH_DMA_A_TLB_TAG                          0x00401050 /* RW-4R */
-#define NV_PGRAPH_DMA_A_TLB_TAG_ADDRESS                       31:12 /* RWXUF */
-#define NV_PGRAPH_DMA_A_ADJ_OFFSET                       0x00401054 /* RW-4R */
-#define NV_PGRAPH_DMA_A_ADJ_OFFSET_VALUE                       31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_A_OFFSET                           0x00401058 /* RW-4R */
-#define NV_PGRAPH_DMA_A_OFFSET_VALUE                           31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_A_SIZE                             0x0040105C /* RW-4R */
-#define NV_PGRAPH_DMA_A_SIZE_VALUE                             24:0 /* RWXUF */
-#define NV_PGRAPH_DMA_A_Y_SIZE                           0x00401060 /* RW-4R */
-#define NV_PGRAPH_DMA_A_Y_SIZE_VALUE                           10:0 /* RWXUF */
-#define NV_PGRAPH_DMA_B_XLATE_INST                       0x00401080 /* RW-4R */
-#define NV_PGRAPH_DMA_B_XLATE_INST_VALUE                       15:0 /* RWXUF */
-#define NV_PGRAPH_DMA_B_CONTROL                          0x00401084 /* RW-4R */
-#define NV_PGRAPH_DMA_B_CONTROL_PAGE_TABLE                    12:12 /* RWIVF */
-#define NV_PGRAPH_DMA_B_CONTROL_PAGE_TABLE_NOT_PRESENT   0x00000000 /* RWI-V */
-#define NV_PGRAPH_DMA_B_CONTROL_PAGE_TABLE_PRESENT       0x00000001 /* RW--V */
-#define NV_PGRAPH_DMA_B_CONTROL_PAGE_ENTRY                    13:13 /* RWXVF */
-#define NV_PGRAPH_DMA_B_CONTROL_PAGE_ENTRY_NOT_LINEAR    0x00000000 /* RW--V */
-#define NV_PGRAPH_DMA_B_CONTROL_PAGE_ENTRY_LINEAR        0x00000001 /* RW--V */
-#define NV_PGRAPH_DMA_B_CONTROL_TARGET_NODE                   17:16 /* RWXUF */
-#define NV_PGRAPH_DMA_B_CONTROL_TARGET_NODE_NVM          0x00000000 /* RW--V */
-#define NV_PGRAPH_DMA_B_CONTROL_TARGET_NODE_PCI          0x00000002 /* RW--V */
-#define NV_PGRAPH_DMA_B_CONTROL_TARGET_NODE_AGP          0x00000003 /* RW--V */
-#define NV_PGRAPH_DMA_B_CONTROL_ADJUST                        31:20 /* RWXUF */
-#define NV_PGRAPH_DMA_B_LIMIT                            0x00401088 /* RW-4R */
-#define NV_PGRAPH_DMA_B_LIMIT_OFFSET                           31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_B_TLB_PTE                          0x0040108C /* RW-4R */
-#define NV_PGRAPH_DMA_B_TLB_PTE_ACCESS                          1:1 /* RWXVF */
-#define NV_PGRAPH_DMA_B_TLB_PTE_ACCESS_READ_ONLY         0x00000000 /* RW--V */
-#define NV_PGRAPH_DMA_B_TLB_PTE_ACCESS_READ_WRITE        0x00000001 /* RW--V */
-#define NV_PGRAPH_DMA_B_TLB_PTE_FRAME_ADDRESS                 31:12 /* RWXUF */
-#define NV_PGRAPH_DMA_B_TLB_TAG                          0x00401090 /* RW-4R */
-#define NV_PGRAPH_DMA_B_TLB_TAG_ADDRESS                       31:12 /* RWXUF */
-#define NV_PGRAPH_DMA_B_ADJ_OFFSET                       0x00401094 /* RW-4R */
-#define NV_PGRAPH_DMA_B_ADJ_OFFSET_VALUE                       31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_B_OFFSET                           0x00401098 /* RW-4R */
-#define NV_PGRAPH_DMA_B_OFFSET_VALUE                           31:0 /* RWXUF */
-#define NV_PGRAPH_DMA_B_SIZE                             0x0040109C /* RW-4R */
-#define NV_PGRAPH_DMA_B_SIZE_VALUE                             24:0 /* RWXUF */
-#define NV_PGRAPH_DMA_B_Y_SIZE                           0x004010A0 /* RW-4R */
-#define NV_PGRAPH_DMA_B_Y_SIZE_VALUE                           10:0 /* RWXUF */
-
-/* Framebuffer registers */
-#define NV_PFB                                0x00100FFF:0x00100000 /* RW--D */
-#define NV_PFB_BOOT_0                                    0x00100000 /* RW-4R */
-#define NV_PFB_BOOT_0_RAM_AMOUNT                                1:0 /* RW-VF */
-#define NV_PFB_BOOT_0_RAM_AMOUNT_32MB                    0x00000000 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_AMOUNT_4MB                     0x00000001 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_AMOUNT_8MB                     0x00000002 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_AMOUNT_16MB                    0x00000003 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_WIDTH_128                             2:2 /* RW-VF */
-#define NV_PFB_BOOT_0_RAM_WIDTH_128_OFF                  0x00000000 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_WIDTH_128_ON                   0x00000001 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_TYPE                                  4:3 /* RW-VF */
-#define NV_PFB_BOOT_0_RAM_TYPE_256K                      0x00000000 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_TYPE_512K_2BANK                0x00000001 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_TYPE_512K_4BANK                0x00000002 /* RW--V */
-#define NV_PFB_BOOT_0_RAM_TYPE_1024K_2BANK               0x00000003 /* RW--V */
-#define NV_PFB_CONFIG_0                                  0x00100200 /* RW-4R */
-#define NV_PFB_CONFIG_0_TYPE                                   14:0 /* RWIVF */
-#define NV_PFB_CONFIG_0_TYPE_OLD1024_FIXED_8BPP          0x00000120 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_OLD1024_FIXED_16BPP         0x00000220 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_OLD1024_FIXED_32BPP         0x00000320 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_OLD1024_VAR_8BPP            0x00004120 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_OLD1024_VAR_16BPP           0x00004220 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_OLD1024_VAR_32BPP           0x00004320 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_TETRIS                      0x00002000 /* RW--V */
-#define NV_PFB_CONFIG_0_TYPE_NOTILING                    0x00001114 /* RWI-V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE                           17:15 /* RWI-F */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_PASS                 0x00000000 /* RWI-V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_1                    0x00000001 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_2                    0x00000002 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_3                    0x00000003 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_4                    0x00000004 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_5                    0x00000005 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_6                    0x00000006 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_MODE_7                    0x00000007 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_SHIFT                          19:18 /* RWI-F */
-#define NV_PFB_CONFIG_0_TETRIS_SHIFT_0                   0x00000000 /* RWI-V */
-#define NV_PFB_CONFIG_0_TETRIS_SHIFT_1                   0x00000001 /* RW--V */
-#define NV_PFB_CONFIG_0_TETRIS_SHIFT_2                   0x00000002 /* RW--V */
-#define NV_PFB_CONFIG_0_BANK_SWAP                             22:20 /* RWI-F */
-#define NV_PFB_CONFIG_0_BANK_SWAP_OFF                    0x00000000 /* RWI-V */
-#define NV_PFB_CONFIG_0_BANK_SWAP_1M                     0x00000001 /* RW--V */
-#define NV_PFB_CONFIG_0_BANK_SWAP_2M                     0x00000005 /* RW--V */
-#define NV_PFB_CONFIG_0_BANK_SWAP_4M                     0x00000007 /* RW--V */
-#define NV_PFB_CONFIG_0_UNUSED                                23:23 /* RW-VF */
-#define NV_PFB_CONFIG_0_SCRAMBLE_EN                           29:29 /* RWIVF */
-#define NV_PFB_CONFIG_0_SCRAMBLE_EN_INIT                 0x00000000 /* RW--V */
-#define NV_PFB_CONFIG_0_SCRAMBLE_ACTIVE                  0x00000001 /* RW--V */
-#define NV_PFB_CONFIG_0_PRAMIN_WR                             28:28 /* RWIVF */
-#define NV_PFB_CONFIG_0_PRAMIN_WR_INIT                   0x00000000 /* RW--V */
-#define NV_PFB_CONFIG_0_PRAMIN_WR_DISABLED               0x00000001 /* RW--V */
-#define NV_PFB_CONFIG_0_PRAMIN_WR_MASK                        27:24 /* RWIVF */
-#define NV_PFB_CONFIG_0_PRAMIN_WR_MASK_INIT              0x00000000 /* RWI-V */
-#define NV_PFB_CONFIG_0_PRAMIN_WR_MASK_CLEAR             0x0000000f /* RWI-V */
-#define NV_PFB_CONFIG_1                                  0x00100204 /* RW-4R */
-#define NV_PFB_RTL                                       0x00100300 /* RW-4R */
-#define NV_PFB_RTL_H                                            0:0 /* RWIUF */
-#define NV_PFB_RTL_H_DEFAULT                             0x00000000 /* RWI-V */
-#define NV_PFB_RTL_MC                                           1:1 /* RWIUF */
-#define NV_PFB_RTL_MC_DEFAULT                            0x00000000 /* RWI-V */
-#define NV_PFB_RTL_V                                            2:2 /* RWIUF */
-#define NV_PFB_RTL_V_DEFAULT                             0x00000000 /* RWI-V */
-#define NV_PFB_RTL_G                                            3:3 /* RWIUF */
-#define NV_PFB_RTL_G_DEFAULT                             0x00000000 /* RWI-V */
-#define NV_PFB_RTL_GB                                           4:4 /* RWIUF */
-#define NV_PFB_RTL_GB_DEFAULT                            0x00000000 /* RWI-V */
-#define NV_PFB_CONFIG_0_RESOLUTION                              5:0 /* RWIVF */
-#define NV_PFB_CONFIG_0_RESOLUTION_320_PIXELS            0x0000000a /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_400_PIXELS            0x0000000d /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_480_PIXELS            0x0000000f /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_512_PIXELS            0x00000010 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_640_PIXELS            0x00000014 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_800_PIXELS            0x00000019 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_960_PIXELS            0x0000001e /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_1024_PIXELS           0x00000020 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_1152_PIXELS           0x00000024 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_1280_PIXELS           0x00000028 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_1600_PIXELS           0x00000032 /* RW--V */
-#define NV_PFB_CONFIG_0_RESOLUTION_DEFAULT               0x00000014 /* RWI-V */
-#define NV_PFB_CONFIG_0_PIXEL_DEPTH                             9:8 /* RWIVF */
-#define NV_PFB_CONFIG_0_PIXEL_DEPTH_8_BITS               0x00000001 /* RW--V */
-#define NV_PFB_CONFIG_0_PIXEL_DEPTH_16_BITS              0x00000002 /* RW--V */
-#define NV_PFB_CONFIG_0_PIXEL_DEPTH_32_BITS              0x00000003 /* RW--V */
-#define NV_PFB_CONFIG_0_PIXEL_DEPTH_DEFAULT              0x00000001 /* RWI-V */
-#define NV_PFB_CONFIG_0_TILING                                12:12 /* RWIVF */
-#define NV_PFB_CONFIG_0_TILING_ENABLED                   0x00000000 /* RW--V */
-#define NV_PFB_CONFIG_0_TILING_DISABLED                  0x00000001 /* RWI-V */
-#define NV_PFB_CONFIG_1_SGRAM100                                3:3 /* RWIVF */
-#define NV_PFB_CONFIG_1_SGRAM100_ENABLED                 0x00000000 /* RWI-V */
-#define NV_PFB_CONFIG_1_SGRAM100_DISABLED                0x00000001 /* RW--V */
-#define NV_PFB_DEBUG_0_CKE_ALWAYSON                           29:29 /* RWIVF */
-#define NV_PFB_DEBUG_0_CKE_ALWAYSON_OFF                  0x00000000 /* RW--V */
-#define NV_PFB_DEBUG_0_CKE_ALWAYSON_ON                   0x00000001 /* RWI-V */
-
-#define NV_PEXTDEV                            0x00101FFF:0x00101000 /* RW--D */
-#define NV_PEXTDEV_BOOT_0                                0x00101000 /* R--4R */
-#define NV_PEXTDEV_BOOT_0_STRAP_BUS_SPEED                       0:0 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_BUS_SPEED_33MHZ          0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_BUS_SPEED_66MHZ          0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_SUB_VENDOR                      1:1 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_SUB_VENDOR_NO_BIOS       0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_SUB_VENDOR_BIOS          0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_TYPE                        3:2 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_TYPE_SGRAM_256K      0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_TYPE_SGRAM_512K_2BANK 0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_TYPE_SGRAM_512K_4BANK 0x00000002 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_TYPE_1024K_2BANK     0x00000003 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_WIDTH                       4:4 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_WIDTH_64             0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_RAM_WIDTH_128            0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_BUS_TYPE                        5:5 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_BUS_TYPE_PCI             0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_BUS_TYPE_AGP             0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_CRYSTAL                         6:6 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_CRYSTAL_13500K           0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_CRYSTAL_14318180         0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_TVMODE                          8:7 /* R-XVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_TVMODE_SECAM             0x00000000 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_TVMODE_NTSC              0x00000001 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_TVMODE_PAL               0x00000002 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_TVMODE_DISABLED          0x00000003 /* R---V */
-#define NV_PEXTDEV_BOOT_0_STRAP_OVERWRITE                     11:11 /* RWIVF */
-#define NV_PEXTDEV_BOOT_0_STRAP_OVERWRITE_DISABLED       0x00000000 /* RWI-V */
-#define NV_PEXTDEV_BOOT_0_STRAP_OVERWRITE_ENABLED        0x00000001 /* RW--V */
-
-/* Extras */
-#define NV_PRAMIN                             0x007FFFFF:0x00700000 /* RW--M */
-/*#define NV_PRAMIN                             0x00FFFFFF:0x00C00000*/
-#define NV_PNVM                               0x01FFFFFF:0x01000000 /* RW--M */
-/*#define NV_PNVM                               0x00BFFFFF:0x00800000*/
-#define NV_CHAN0                              0x0080ffff:0x00800000
-
-/* FIFO subchannels */
-#define NV_UROP                               0x43
-#define NV_UCHROMA                            0x57
-#define NV_UCLIP                              0x19
-#define NV_UPATT                              0x18
-#define NV_ULIN                               0x5C
-#define NV_UTRI                               0x5D
-#define NV_URECT                              0x5E
-#define NV_UBLIT                              0x5F
-#define NV_UGLYPH                             0x4B
-
-#endif /*__NV4REF_H__*/
-
diff --git a/drivers/video/riva/nv_driver.c b/drivers/video/riva/nv_driver.c
index be630a0ccfd4..a11026812d1b 100644
--- a/drivers/video/riva/nv_driver.c
+++ b/drivers/video/riva/nv_driver.c
@@ -231,12 +231,14 @@ unsigned long riva_get_memlen(struct riva_par *par)
         case NV_ARCH_30:
                 if(chipset == NV_CHIP_IGEFORCE2) {
 
-                        dev = pci_find_slot(0, 1);
+                        dev = pci_get_bus_and_slot(0, 1);
                         pci_read_config_dword(dev, 0x7C, &amt);
+                        pci_dev_put(dev);
                         memlen = (((amt >> 6) & 31) + 1) * 1024;
                 } else if (chipset == NV_CHIP_0x01F0) {
-                        dev = pci_find_slot(0, 1);
+                        dev = pci_get_bus_and_slot(0, 1);
                         pci_read_config_dword(dev, 0x84, &amt);
+                        pci_dev_put(dev);
                         memlen = (((amt >> 4) & 127) + 1) * 1024;
                 } else {
                         switch ((NV_RD32(chip->PFB, 0x0000020C) >> 20) &
diff --git a/drivers/video/riva/riva_hw.c b/drivers/video/riva/riva_hw.c
index e0b8c521cc9c..70bfd78eca81 100644
--- a/drivers/video/riva/riva_hw.c
+++ b/drivers/video/riva/riva_hw.c
@@ -1118,8 +1118,9 @@ static void nForceUpdateArbitrationSettings
     unsigned int uMClkPostDiv;
     struct pci_dev *dev;
 
-    dev = pci_find_slot(0, 3);
+    dev = pci_get_bus_and_slot(0, 3);
     pci_read_config_dword(dev, 0x6C, &uMClkPostDiv);
+    pci_dev_put(dev);
     uMClkPostDiv = (uMClkPostDiv >> 8) & 0xf;
 
     if(!uMClkPostDiv) uMClkPostDiv = 4;
@@ -1132,8 +1133,9 @@ static void nForceUpdateArbitrationSettings
     sim_data.enable_video   = 0;
     sim_data.enable_mp      = 0;
 
-    dev = pci_find_slot(0, 1);
+    dev = pci_get_bus_and_slot(0, 1);
     pci_read_config_dword(dev, 0x7C, &sim_data.memory_type);
+    pci_dev_put(dev);
     sim_data.memory_type    = (sim_data.memory_type >> 12) & 1;
 
     sim_data.memory_width   = 64;
@@ -2112,12 +2114,14 @@ static void nv10GetConfig
      * Fill in chip configuration.
      */
     if(chipset == NV_CHIP_IGEFORCE2) {
-        dev = pci_find_slot(0, 1);
+        dev = pci_get_bus_and_slot(0, 1);
         pci_read_config_dword(dev, 0x7C, &amt);
+        pci_dev_put(dev);
         chip->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024;
     } else if(chipset == NV_CHIP_0x01F0) {
-        dev = pci_find_slot(0, 1);
+        dev = pci_get_bus_and_slot(0, 1);
         pci_read_config_dword(dev, 0x84, &amt);
+        pci_dev_put(dev);
         chip->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024;
     } else {
         switch ((NV_RD32(chip->PFB, 0x0000020C) >> 20) & 0x000000FF)
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 0405e839ff93..a0e22ac483a3 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -70,8 +70,6 @@ static int riva_gpio_getscl(void* data)
         if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x04)
                 val = 1;
 
-        val = VGA_RD08(par->riva.PCIO, 0x3d5);
-
         return val;
 }
 
@@ -88,13 +86,16 @@ static int riva_gpio_getsda(void* data)
         return val;
 }
 
-static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
+static int __devinit riva_setup_i2c_bus(struct riva_i2c_chan *chan,
+                                        const char *name,
+                                        unsigned int i2c_class)
 {
         int rc;
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner             = THIS_MODULE;
         chan->adapter.id                = I2C_HW_B_RIVA;
+        chan->adapter.class             = i2c_class;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->par->pdev->dev;
         chan->algo.setsda               = riva_gpio_setsda;
@@ -124,42 +125,38 @@ static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
         return rc;
 }
 
-void riva_create_i2c_busses(struct riva_par *par)
+void __devinit riva_create_i2c_busses(struct riva_par *par)
 {
-        par->bus = 3;
-
         par->chan[0].par        = par;
         par->chan[1].par        = par;
         par->chan[2].par        = par;
 
-        par->chan[0].ddc_base = 0x3e;
-        par->chan[1].ddc_base = 0x36;
+        par->chan[0].ddc_base = 0x36;
+        par->chan[1].ddc_base = 0x3e;
         par->chan[2].ddc_base = 0x50;
-        riva_setup_i2c_bus(&par->chan[0], "BUS1");
-        riva_setup_i2c_bus(&par->chan[1], "BUS2");
-        riva_setup_i2c_bus(&par->chan[2], "BUS3");
+        riva_setup_i2c_bus(&par->chan[0], "BUS1", I2C_CLASS_HWMON);
+        riva_setup_i2c_bus(&par->chan[1], "BUS2", 0);
+        riva_setup_i2c_bus(&par->chan[2], "BUS3", 0);
 }
 
 void riva_delete_i2c_busses(struct riva_par *par)
 {
-        if (par->chan[0].par)
-                i2c_del_adapter(&par->chan[0].adapter);
-        par->chan[0].par = NULL;
+        int i;
 
-        if (par->chan[1].par)
-                i2c_del_adapter(&par->chan[1].adapter);
-        par->chan[1].par = NULL;
-
-        if (par->chan[2].par)
-                i2c_del_adapter(&par->chan[2].adapter);
-        par->chan[2].par = NULL;
+        for (i = 0; i < 3; i++) {
+                if (!par->chan[i].par)
+                        continue;
+                i2c_del_adapter(&par->chan[i].adapter);
+                par->chan[i].par = NULL;
+        }
 }
 
-int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
+int __devinit riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
 {
         u8 *edid = NULL;
 
-        edid = fb_ddc_read(&par->chan[conn-1].adapter);
+        if (par->chan[conn].par)
+                edid = fb_ddc_read(&par->chan[conn].adapter);
 
         if (out_edid)
                 *out_edid = edid;
diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h
index 48ead6d72f24..d9f107b704c6 100644
--- a/drivers/video/riva/rivafb.h
+++ b/drivers/video/riva/rivafb.h
@@ -4,7 +4,6 @@
 #include <linux/fb.h>
 #include <video/vga.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
 
 #include "riva_hw.h"
@@ -61,7 +60,6 @@ struct riva_par {
         Bool SecondCRTC;
         int FlatPanel;
         struct pci_dev *pdev;
-        int bus;
         int cursor_reset;
 #ifdef CONFIG_MTRR
         struct { int vram; int vram_valid; } mtrr;
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 3091b20124b4..d11735895a01 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -65,7 +65,7 @@ static const struct svga_fb_format s3fb_formats[] = {
 
 
 static const struct svga_pll s3_pll = {3, 129, 3, 33, 0, 3,
-        60000, 240000, 14318};
+        35000, 240000, 14318};
 
 static const int s3_memsizes[] = {4096, 0, 3072, 8192, 2048, 6144, 1024, 512};
 
@@ -164,7 +164,7 @@ MODULE_PARM_DESC(fasttext, "Enable S3 fast text mode (1=enable, 0=disable, defau
 static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map)
 {
         const u8 *font = map->data;
-        u8* fb = (u8 *) info->screen_base;
+        u8 __iomem *fb = (u8 __iomem *) info->screen_base;
         int i, c;
 
         if ((map->width != 8) || (map->height != 16) ||
@@ -177,20 +177,19 @@ static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map)
         fb += 2;
         for (i = 0; i < map->height; i++) {
                 for (c = 0; c < map->length; c++) {
-                        fb[c * 4] = font[c * map->height + i];
+                        fb_writeb(font[c * map->height + i], fb + c * 4);
                 }
                 fb += 1024;
         }
 }
 
-
-
 static struct fb_tile_ops s3fb_tile_ops = {
         .fb_settile     = svga_settile,
         .fb_tilecopy    = svga_tilecopy,
         .fb_tilefill    = svga_tilefill,
         .fb_tileblit    = svga_tileblit,
         .fb_tilecursor  = svga_tilecursor,
+        .fb_get_tilemax = svga_get_tilemax,
 };
 
 static struct fb_tile_ops s3fb_fast_tile_ops = {
@@ -199,6 +198,7 @@ static struct fb_tile_ops s3fb_fast_tile_ops = {
         .fb_tilefill    = svga_tilefill,
         .fb_tileblit    = svga_tileblit,
         .fb_tilecursor  = svga_tilecursor,
+        .fb_get_tilemax = svga_get_tilemax,
 };
 
 
@@ -326,8 +326,13 @@ static void s3_set_pixclock(struct fb_info *info, u32 pixclock)
 {
         u16 m, n, r;
         u8 regval;
+        int rv;
 
-        svga_compute_pll(&s3_pll, 1000000000 / pixclock, &m, &n, &r, info->node);
+        rv = svga_compute_pll(&s3_pll, 1000000000 / pixclock, &m, &n, &r, info->node);
+        if (rv < 0) {
+                printk(KERN_ERR "fb%d: cannot set requested pixclock, keeping old value\n", info->node);
+                return;
+        }
 
         /* Set VGA misc register  */
         regval = vga_r(NULL, VGA_MIS_R);
@@ -449,6 +454,10 @@ static int s3fb_set_par(struct fb_info *info)
                 info->flags &= ~FBINFO_MISC_TILEBLITTING;
                 info->tileops = NULL;
 
+                /* in 4bpp supports 8p wide tiles only, any tiles otherwise */
+                info->pixmap.blit_x = (bpp == 4) ? (1 << (8 - 1)) : (~(u32)0);
+                info->pixmap.blit_y = ~(u32)0;
+
                 offset_value = (info->var.xres_virtual * bpp) / 64;
                 screen_size = info->var.yres_virtual * info->fix.line_length;
         } else {
@@ -458,6 +467,10 @@ static int s3fb_set_par(struct fb_info *info)
                 info->flags |= FBINFO_MISC_TILEBLITTING;
                 info->tileops = fasttext ? &s3fb_fast_tile_ops : &s3fb_tile_ops;
 
+                /* supports 8x16 tiles only */
+                info->pixmap.blit_x = 1 << (8 - 1);
+                info->pixmap.blit_y = 1 << (16 - 1);
+
                 offset_value = info->var.xres_virtual / 16;
                 screen_size = (info->var.xres_virtual * info->var.yres_virtual) / 64;
         }
@@ -656,7 +669,7 @@ static int s3fb_set_par(struct fb_info *info)
         value = ((value * hmul) / 8) - 5;
         vga_wcrt(NULL, 0x3C, (value + 1) / 2);
 
-        memset((u8*)info->screen_base, 0x00, screen_size);
+        memset_io(info->screen_base, 0x00, screen_size);
         /* Device and screen back on */
         svga_wcrt_mask(0x17, 0x80, 0x80);
         svga_wseq_mask(0x01, 0x00, 0x20);
@@ -699,7 +712,7 @@ static int s3fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                 break;
         case 16:
                 if (regno >= 16)
-                        return -EINVAL;
+                        return 0;
 
                 if (fb->var.green.length == 5)
                         ((u32*)fb->pseudo_palette)[regno] = ((red & 0xF800) >> 1) |
@@ -712,9 +725,9 @@ static int s3fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
         case 24:
         case 32:
                 if (regno >= 16)
-                        return -EINVAL;
+                        return 0;
 
-                ((u32*)fb->pseudo_palette)[regno] = ((transp & 0xFF00) << 16) | ((red & 0xFF00) << 8) |
+                ((u32*)fb->pseudo_palette)[regno] = ((red & 0xFF00) << 8) |
                         (green & 0xFF00) | ((blue & 0xFF00) >> 8);
                 break;
         default:
@@ -767,12 +780,6 @@ static int s3fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 
         unsigned int offset;
 
-        /* Validate the offsets */
-        if ((var->xoffset + var->xres) > var->xres_virtual)
-                return -EINVAL;
-        if ((var->yoffset + var->yres) > var->yres_virtual)
-                return -EINVAL;
-
         /* Calculate the offset */
         if (var->bits_per_pixel == 0) {
                 offset = (var->yoffset / 16) * (var->xres_virtual / 2) + (var->xoffset / 2);
@@ -805,6 +812,7 @@ static struct fb_ops s3fb_ops = {
         .fb_fillrect    = s3fb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = s3fb_imageblit,
+        .fb_get_caps    = svga_get_caps,
 };
 
 /* ------------------------------------------------------------------------- */
@@ -1061,6 +1069,7 @@ static int s3_pci_resume(struct pci_dev* dev)
 {
         struct fb_info *info = pci_get_drvdata(dev);
         struct s3fb_info *par = info->par;
+        int err;
 
         dev_info(&(dev->dev), "resume\n");
 
@@ -1075,7 +1084,13 @@ static int s3_pci_resume(struct pci_dev* dev)
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
-        pci_enable_device(dev);
+        err = pci_enable_device(dev);
+        if (err) {
+                mutex_unlock(&(par->open_lock));
+                release_console_sem();
+                dev_err(&(dev->dev), "error %d enabling device for resume\n", err);
+                return err;
+        }
         pci_set_master(dev);
 
         s3fb_set_par(info);
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 8db066ccca6b..35c1ce62b216 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -41,10 +41,6 @@
 #define SAVAGE4_I2C_SCL_IN      0x00000008
 #define SAVAGE4_I2C_SDA_IN      0x00000010
 
-#define SET_CR_IX(base, val)    writeb((val), base + 0x8000 + VGA_CR_IX)
-#define SET_CR_DATA(base, val)  writeb((val), base + 0x8000 + VGA_CR_DATA)
-#define GET_CR_DATA(base)       readb(base + 0x8000 + VGA_CR_DATA)
-
 static void savage4_gpio_setscl(void *data, int val)
 {
         struct savagefb_i2c_chan *chan = data;
@@ -92,15 +88,15 @@ static void prosavage_gpio_setscl(void* data, int val)
         struct savagefb_i2c_chan *chan = data;
         u32                       r;
 
-        SET_CR_IX(chan->ioaddr, chan->reg);
-        r = GET_CR_DATA(chan->ioaddr);
+        r = VGArCR(chan->reg, chan->par);
         r |= PROSAVAGE_I2C_ENAB;
         if (val) {
                 r |= PROSAVAGE_I2C_SCL_OUT;
         } else {
                 r &= ~PROSAVAGE_I2C_SCL_OUT;
         }
-        SET_CR_DATA(chan->ioaddr, r);
+
+        VGAwCR(chan->reg, r, chan->par);
 }
 
 static void prosavage_gpio_setsda(void* data, int val)
@@ -108,31 +104,29 @@ static void prosavage_gpio_setsda(void* data, int val)
         struct savagefb_i2c_chan *chan = data;
         unsigned int r;
 
-        SET_CR_IX(chan->ioaddr, chan->reg);
-        r = GET_CR_DATA(chan->ioaddr);
+        r = VGArCR(chan->reg, chan->par);
         r |= PROSAVAGE_I2C_ENAB;
         if (val) {
                 r |= PROSAVAGE_I2C_SDA_OUT;
         } else {
                 r &= ~PROSAVAGE_I2C_SDA_OUT;
         }
-        SET_CR_DATA(chan->ioaddr, r);
+
+        VGAwCR(chan->reg, r, chan->par);
 }
 
 static int prosavage_gpio_getscl(void* data)
 {
         struct savagefb_i2c_chan *chan = data;
 
-        SET_CR_IX(chan->ioaddr, chan->reg);
-        return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SCL_IN));
+        return (VGArCR(chan->reg, chan->par) & PROSAVAGE_I2C_SCL_IN) ? 1 : 0;
 }
 
 static int prosavage_gpio_getsda(void* data)
 {
         struct savagefb_i2c_chan *chan = data;
 
-        SET_CR_IX(chan->ioaddr, chan->reg);
-        return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SDA_IN));
+        return (VGArCR(chan->reg, chan->par) & PROSAVAGE_I2C_SDA_IN) ? 1 : 0;
 }
 
 static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index e648a6c0f6d9..8bfdfc3c5234 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -15,6 +15,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
+#include <linux/mutex.h>
+#include <video/vga.h>
 #include "../edid.h"
 
 #ifdef SAVAGEFB_DEBUG
@@ -189,8 +191,12 @@ struct savagefb_par {
         struct savagefb_i2c_chan chan;
         struct savage_reg state;
         struct savage_reg save;
+        struct savage_reg initial;
+        struct vgastate vgastate;
+        struct mutex open_lock;
         unsigned char   *edid;
         u32 pseudo_palette[16];
+        u32 open_count;
         int paletteEnabled;
         int pm_state;
         int display_type;
@@ -203,7 +209,7 @@ struct savagefb_par {
         int clock[4];
         int MCLK, REFCLK, LCDclk;
         struct {
-                u8   __iomem *vbase;
+                void   __iomem *vbase;
                 u32    pbase;
                 u32    len;
 #ifdef CONFIG_MTRR
@@ -212,7 +218,7 @@ struct savagefb_par {
         } video;
 
         struct {
-                volatile u8  __iomem *vbase;
+                void  __iomem *vbase;
                 u32           pbase;
                 u32           len;
         } mmio;
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 0166ec2ccf32..3d7507ad55f6 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1623,8 +1623,46 @@ static void savagefb_restore_state(struct fb_info *info)
         savagefb_blank(FB_BLANK_UNBLANK, info);
 }
 
+static int savagefb_open(struct fb_info *info, int user)
+{
+        struct savagefb_par *par = info->par;
+
+        mutex_lock(&par->open_lock);
+
+        if (!par->open_count) {
+                memset(&par->vgastate, 0, sizeof(par->vgastate));
+                par->vgastate.flags = VGA_SAVE_CMAP | VGA_SAVE_FONTS |
+                        VGA_SAVE_MODE;
+                par->vgastate.vgabase = par->mmio.vbase + 0x8000;
+                save_vga(&par->vgastate);
+                savage_get_default_par(par, &par->initial);
+        }
+
+        par->open_count++;
+        mutex_unlock(&par->open_lock);
+        return 0;
+}
+
+static int savagefb_release(struct fb_info *info, int user)
+{
+        struct savagefb_par *par = info->par;
+
+        mutex_lock(&par->open_lock);
+
+        if (par->open_count == 1) {
+                savage_set_default_par(par, &par->initial);
+                restore_vga(&par->vgastate);
+        }
+
+        par->open_count--;
+        mutex_unlock(&par->open_lock);
+        return 0;
+}
+
 static struct fb_ops savagefb_ops = {
         .owner          = THIS_MODULE,
+        .fb_open        = savagefb_open,
+        .fb_release     = savagefb_release,
         .fb_check_var   = savagefb_check_var,
         .fb_set_par     = savagefb_set_par,
         .fb_setcolreg   = savagefb_setcolreg,
@@ -2173,6 +2211,7 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
         if (!info)
                 return -ENOMEM;
         par = info->par;
+        mutex_init(&par->open_lock);
         err = pci_enable_device(dev);
         if (err)
                 goto failed_enable;
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index d048bd39961b..c1492782cb18 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -58,9 +58,6 @@
 #define SIS_LINUX_KERNEL                /* Linux kernel framebuffer */
 #undef  SIS_XORG_XF86                   /* XFree86/X.org */
 
-#undef SIS_LINUX_KERNEL_24
-#undef SIS_LINUX_KERNEL_26
-
 #ifdef OutPortByte
 #undef OutPortByte
 #endif
@@ -100,8 +97,6 @@
 #define SIS315H
 #endif
 
-#define SIS_LINUX_KERNEL_26
-
 #if !defined(SIS300) && !defined(SIS315H)
 #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
 #warning sisfb will not work!
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index 7d5ee2145e21..d5e2d9c27847 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -27,11 +27,7 @@
 #include <linux/version.h>
 
 #include "osdef.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <video/sisfb.h>
-#else
-#include <linux/sisfb.h>
-#endif
 
 #include "vgatypes.h"
 #include "vstruct.h"
@@ -40,33 +36,17 @@
 #define VER_MINOR               8
 #define VER_LEVEL               9
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <linux/spinlock.h>
-#define SIS_PCI_GET_CLASS(a, b) pci_get_class(a, b)
-#define SIS_PCI_GET_DEVICE(a,b,c) pci_get_device(a,b,c)
-#define SIS_PCI_GET_SLOT(a,b) pci_get_slot(a,b)
-#define SIS_PCI_PUT_DEVICE(a) pci_dev_put(a)
+
 #ifdef CONFIG_COMPAT
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
 #include <linux/ioctl32.h>
 #define SIS_OLD_CONFIG_COMPAT
 #else
-#include <linux/smp_lock.h>
 #define SIS_NEW_CONFIG_COMPAT
 #endif
 #endif  /* CONFIG_COMPAT */
-#else  /* 2.4 */
-#define SIS_PCI_GET_CLASS(a, b) pci_find_class(a, b)
-#define SIS_PCI_GET_DEVICE(a,b,c) pci_find_device(a,b,c)
-#define SIS_PCI_GET_SLOT(a,b) pci_find_slot(a,b)
-#define SIS_PCI_PUT_DEVICE(a)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
-#ifdef __x86_64__       /* Shouldn't we check for CONFIG_IA32_EMULATION here? */
-#include <asm/ioctl32.h>
-#define SIS_OLD_CONFIG_COMPAT
-#endif
-#endif
-#endif /* 2.4 */
+
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 #define SIS_IOTYPE1 void __iomem
 #define SIS_IOTYPE2 __iomem
@@ -498,26 +478,8 @@ struct sis_video_info {
 
         struct fb_var_screeninfo default_var;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         struct fb_fix_screeninfo sisfb_fix;
         u32             pseudo_palette[17];
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        struct display           sis_disp;
-        struct display_switch    sisfb_sw;
-        struct {
-                u16 red, green, blue, pad;
-        }               sis_palette[256];
-        union {
-#ifdef FBCON_HAS_CFB16
-                u16 cfb16[16];
-#endif
-#ifdef FBCON_HAS_CFB32
-                u32 cfb32[16];
-#endif
-        }               sis_fbcon_cmap;
-#endif
 
         struct sisfb_monitor {
                 u16 hmin;
@@ -538,10 +500,6 @@ struct sis_video_info {
 
         int             mni;    /* Mode number index */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        int             currcon;
-#endif
-
         unsigned long   video_size;
         unsigned long   video_base;
         unsigned long   mmio_size;
@@ -578,9 +536,6 @@ struct sis_video_info {
         int             sisfb_tvplug;
         int             sisfb_tvstd;
         int             sisfb_nocrt2rate;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        int             sisfb_inverse;
-#endif
 
         u32             heapstart;              /* offset  */
         SIS_IOTYPE1     *sisfb_heap_start;      /* address */
@@ -646,9 +601,7 @@ struct sis_video_info {
         int             modechanged;
         unsigned char   modeprechange;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         u8              sisfb_lastrates[128];
-#endif
 
         int             newrom;
         int             haveXGIROM;
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 01197d740217..a30e1e13d8be 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -37,7 +37,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/string.h>
@@ -1948,7 +1947,7 @@ sisfb_get_northbridge(int basechipid)
         default:        return NULL;
         }
         for(i = 0; i < nbridgenum; i++) {
-                if((pdev = SIS_PCI_GET_DEVICE(PCI_VENDOR_ID_SI,
+                if((pdev = pci_get_device(PCI_VENDOR_ID_SI,
                                 nbridgeids[nbridgeidx+i], NULL)))
                         break;
         }
@@ -4613,9 +4612,9 @@ sisfb_find_host_bridge(struct sis_video_info *ivideo, struct pci_dev *mypdev,
         unsigned short temp;
         int ret = 0;
 
-        while((pdev = SIS_PCI_GET_CLASS(PCI_CLASS_BRIDGE_HOST, pdev))) {
+        while((pdev = pci_get_class(PCI_CLASS_BRIDGE_HOST, pdev))) {
                 temp = pdev->vendor;
-                SIS_PCI_PUT_DEVICE(pdev);
+                pci_dev_put(pdev);
                 if(temp == pcivendor) {
                         ret = 1;
                         break;
@@ -5154,24 +5153,24 @@ sisfb_post_xgi(struct pci_dev *pdev)
                         if(reg & 0x80) v2 |= 0x80;
                         v2 |= 0x01;
 
-                        if((mypdev = SIS_PCI_GET_DEVICE(PCI_VENDOR_ID_SI, 0x0730, NULL))) {
-                                SIS_PCI_PUT_DEVICE(mypdev);
+                        if((mypdev = pci_get_device(PCI_VENDOR_ID_SI, 0x0730, NULL))) {
+                                pci_dev_put(mypdev);
                                 if(((v2 & 0x06) == 2) || ((v2 & 0x06) == 4))
                                         v2 &= 0xf9;
                                 v2 |= 0x08;
                                 v1 &= 0xfe;
                         } else {
-                                mypdev = SIS_PCI_GET_DEVICE(PCI_VENDOR_ID_SI, 0x0735, NULL);
+                                mypdev = pci_get_device(PCI_VENDOR_ID_SI, 0x0735, NULL);
                                 if(!mypdev)
-                                        mypdev = SIS_PCI_GET_DEVICE(PCI_VENDOR_ID_SI, 0x0645, NULL);
+                                        mypdev = pci_get_device(PCI_VENDOR_ID_SI, 0x0645, NULL);
                                 if(!mypdev)
-                                        mypdev = SIS_PCI_GET_DEVICE(PCI_VENDOR_ID_SI, 0x0650, NULL);
+                                        mypdev = pci_get_device(PCI_VENDOR_ID_SI, 0x0650, NULL);
                                 if(mypdev) {
                                         pci_read_config_dword(mypdev, 0x94, &regd);
                                         regd &= 0xfffffeff;
                                         pci_write_config_dword(mypdev, 0x94, regd);
                                         v1 &= 0xfe;
-                                        SIS_PCI_PUT_DEVICE(mypdev);
+                                        pci_dev_put(mypdev);
                                 } else if(sisfb_find_host_bridge(ivideo, pdev, PCI_VENDOR_ID_SI)) {
                                         v1 &= 0xfe;
                                 } else if(sisfb_find_host_bridge(ivideo, pdev, 0x1106) ||
@@ -5194,13 +5193,13 @@ sisfb_post_xgi(struct pci_dev *pdev)
                         if( (!(v1 & 0x02)) && (v2 & 0x30) && (regd < 0xcf) )
                                 setSISIDXREG(SISCR, 0x5f, 0xf1, 0x01);
 
-                        if((mypdev = SIS_PCI_GET_DEVICE(0x10de, 0x01e0, NULL))) {
+                        if((mypdev = pci_get_device(0x10de, 0x01e0, NULL))) {
                                 /* TODO: set CR5f &0xf1 | 0x01 for version 6570
                                  * of nforce 2 ROM
                                  */
                                 if(0)
                                         setSISIDXREG(SISCR, 0x5f, 0xf1, 0x01);
-                                SIS_PCI_PUT_DEVICE(mypdev);
+                                pci_dev_put(mypdev);
                         }
                 }
 
@@ -5236,9 +5235,9 @@ sisfb_post_xgi(struct pci_dev *pdev)
                 setSISIDXREG(SISCR, 0x75, 0xe0, bios[0x4ff] & 0x1f);
                 setSISIDXREG(SISCR, 0x76, 0xe0, bios[0x500] & 0x1f);
                 v1 = bios[0x501];
-                if((mypdev = SIS_PCI_GET_DEVICE(0x8086, 0x2530, NULL))) {
+                if((mypdev = pci_get_device(0x8086, 0x2530, NULL))) {
                         v1 = 0xf0;
-                        SIS_PCI_PUT_DEVICE(mypdev);
+                        pci_dev_put(mypdev);
                 }
                 outSISIDXREG(SISCR, 0x77, v1);
         }
@@ -5947,7 +5946,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         if(!ivideo->sisvga_enabled) {
                 if(pci_enable_device(pdev)) {
-                        if(ivideo->nbridge) SIS_PCI_PUT_DEVICE(ivideo->nbridge);
+                        if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
                         pci_set_drvdata(pdev, NULL);
                         kfree(sis_fb_info);
                         return -EIO;
@@ -5974,7 +5973,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                         "requiring Chrontel/GPIO setup\n",
                                         mychswtable[i].vendorName,
                                         mychswtable[i].cardName);
-                                ivideo->lpcdev = SIS_PCI_GET_DEVICE(PCI_VENDOR_ID_SI, 0x0008, NULL);
+                                ivideo->lpcdev = pci_get_device(PCI_VENDOR_ID_SI, 0x0008, NULL);
                                 break;
                         }
                         i++;
@@ -5984,7 +5983,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 #ifdef CONFIG_FB_SIS_315
         if((ivideo->chip == SIS_760) && (ivideo->nbridge)) {
-                ivideo->lpcdev = SIS_PCI_GET_SLOT(ivideo->nbridge->bus, (2 << 3));
+                ivideo->lpcdev = pci_get_slot(ivideo->nbridge->bus, (2 << 3));
         }
 #endif
 
@@ -6149,9 +6148,9 @@ error_1:	release_mem_region(ivideo->video_base, ivideo->video_size);
 error_2:        release_mem_region(ivideo->mmio_base, ivideo->mmio_size);
 error_3:        vfree(ivideo->bios_abase);
                 if(ivideo->lpcdev)
-                        SIS_PCI_PUT_DEVICE(ivideo->lpcdev);
+                        pci_dev_put(ivideo->lpcdev);
                 if(ivideo->nbridge)
-                        SIS_PCI_PUT_DEVICE(ivideo->nbridge);
+                        pci_dev_put(ivideo->nbridge);
                 pci_set_drvdata(pdev, NULL);
                 if(!ivideo->sisvga_enabled)
                         pci_disable_device(pdev);
@@ -6331,70 +6330,6 @@ error_3:	vfree(ivideo->bios_abase);
 
                 sisfb_set_vparms(ivideo);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-                /* ---------------- For 2.4: Now switch the mode ------------------ */
-
-                printk(KERN_INFO "sisfb: Setting mode %dx%dx%d (%dHz)\n",
-                        ivideo->video_width, ivideo->video_height, ivideo->video_bpp,
-                        ivideo->refresh_rate);
-
-                /* Determine whether or not acceleration is to be
-                 * used. Need to know before pre/post_set_mode()
-                 */
-                ivideo->accel = 0;
-                ivideo->default_var.accel_flags &= ~FB_ACCELF_TEXT;
-                if(ivideo->sisfb_accel) {
-                        ivideo->accel = -1;
-                        ivideo->default_var.accel_flags |= FB_ACCELF_TEXT;
-                }
-
-                /* Now switch the mode */
-                sisfb_pre_setmode(ivideo);
-
-                if(SiSSetMode(&ivideo->SiS_Pr, ivideo->mode_no) == 0) {
-                        printk(KERN_ERR "sisfb: Fatal error: Setting mode[0x%x] failed\n",
-                                                                        ivideo->mode_no);
-                        ret = -EINVAL;
-                        iounmap(ivideo->mmio_vbase);
-                        goto error_0;
-                }
-
-                outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
-
-                sisfb_post_setmode(ivideo);
-
-                /* Maximize regardless of sisfb_max at startup */
-                ivideo->default_var.yres_virtual = 32767;
-
-                /* Force reset of x virtual in crtc_to_var */
-                ivideo->default_var.xres_virtual = 0;
-
-                /* Copy mode timing to var */
-                sisfb_crtc_to_var(ivideo, &ivideo->default_var);
-
-                /* Find out about screen pitch */
-                sisfb_calc_pitch(ivideo, &ivideo->default_var);
-                sisfb_set_pitch(ivideo);
-
-                /* Init the accelerator (does nothing currently) */
-                sisfb_initaccel(ivideo);
-
-                /* Init some fbinfo entries */
-                sis_fb_info->node  = -1;
-                sis_fb_info->flags = FBINFO_FLAG_DEFAULT;
-                sis_fb_info->fbops = &sisfb_ops;
-                sis_fb_info->disp  = &ivideo->sis_disp;
-                sis_fb_info->blank = &sisfb_blank;
-                sis_fb_info->switch_con = &sisfb_switch;
-                sis_fb_info->updatevar  = &sisfb_update_var;
-                sis_fb_info->changevar  = NULL;
-                strcpy(sis_fb_info->fontname, sisfb_fontname);
-
-                sisfb_set_disp(-1, &ivideo->default_var, sis_fb_info);
-
-#else           /* --------- For 2.6: Setup a somewhat sane default var ------------ */
-
                 printk(KERN_INFO "sisfb: Default mode is %dx%dx%d (%dHz)\n",
                         ivideo->video_width, ivideo->video_height, ivideo->video_bpp,
                         ivideo->refresh_rate);
@@ -6454,7 +6389,6 @@ error_3:	vfree(ivideo->bios_abase);
                 sis_fb_info->pseudo_palette = ivideo->pseudo_palette;
 
                 fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0);
-#endif          /* 2.6 */
 
                 printk(KERN_DEBUG "sisfb: Initial vbflags 0x%x\n", (int)ivideo->vbflags);
 
@@ -6564,10 +6498,10 @@ static void __devexit sisfb_remove(struct pci_dev *pdev)
         vfree(ivideo->bios_abase);
 
         if(ivideo->lpcdev)
-                SIS_PCI_PUT_DEVICE(ivideo->lpcdev);
+                pci_dev_put(ivideo->lpcdev);
 
         if(ivideo->nbridge)
-                SIS_PCI_PUT_DEVICE(ivideo->nbridge);
+                pci_dev_put(ivideo->nbridge);
 
 #ifdef CONFIG_MTRR
         /* Release MTRR region */
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index bb96cb65fdaa..836a612af977 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -14,7 +14,7 @@
  *  of it. 
  *
  *  First the roles of struct fb_info and struct display have changed. Struct
- *  display will go away. The way the the new framebuffer console code will
+ *  display will go away. The way the new framebuffer console code will
  *  work is that it will act to translate data about the tty/console in 
  *  struct vc_data to data in a device independent way in struct fb_info. Then
  *  various functions in struct fb_ops will be called to store the device 
@@ -51,6 +51,7 @@
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/init.h>
+#include <linux/pci.h>
 
     /*
      *  This is just simple sample code.
@@ -60,6 +61,11 @@
      */
 
 /*
+ * Driver data
+ */
+static char *mode_option __devinitdata;
+
+/*
  *  If your driver supports multiple boards, you should make the  
  *  below data types arrays, or allocate them dynamically (using kmalloc()). 
  */ 
@@ -78,7 +84,7 @@ struct xxx_par;
  * if we don't use modedb. If we do use modedb see xxxfb_init how to use it
  * to get a fb_var_screeninfo. Otherwise define a default var as well. 
  */
-static struct fb_fix_screeninfo xxxfb_fix __initdata = {
+static struct fb_fix_screeninfo xxxfb_fix __devinitdata = {
         .id =           "FB's name", 
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
@@ -142,7 +148,7 @@ int xxxfb_setup(char*);
  *
  *      Returns negative errno on error, or zero on success.
  */
-static int xxxfb_open(const struct fb_info *info, int user)
+static int xxxfb_open(struct fb_info *info, int user)
 {
     return 0;
 }
@@ -161,7 +167,7 @@ static int xxxfb_open(const struct fb_info *info, int user)
  *
  *      Returns negative errno on error, or zero on success.
  */
-static int xxxfb_release(const struct fb_info *info, int user)
+static int xxxfb_release(struct fb_info *info, int user)
 {
     return 0;
 }
@@ -278,7 +284,7 @@ static int xxxfb_set_par(struct fb_info *info)
  */
 static int xxxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
-                           const struct fb_info *info)
+                           struct fb_info *info)
 {
     if (regno >= 256)  /* no. of hw registers */
        return -EINVAL;
@@ -416,7 +422,7 @@ static int xxxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
  *      Returns negative errno on error, or zero on success.
  */
 static int xxxfb_pan_display(struct fb_var_screeninfo *var,
-                             const struct fb_info *info)
+                             struct fb_info *info)
 {
     /*
      * If your hardware does not support panning, _do_ _not_ implement this
@@ -454,7 +460,7 @@ static int xxxfb_pan_display(struct fb_var_screeninfo *var,
  *      Return !0 for any modes that are unimplemented.
  *
  */
-static int xxxfb_blank(int blank_mode, const struct fb_info *info)
+static int xxxfb_blank(int blank_mode, struct fb_info *info)
 {
     /* ... */
     return 0;
@@ -483,7 +489,7 @@ static int xxxfb_blank(int blank_mode, const struct fb_info *info)
  *      depending on the rastering operation with the value of color which
  *      is in the current color depth format.
  */
-void xxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region)
+void xxxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region)
 {
 /*      Meaning of struct fb_fillrect
  *
@@ -623,19 +629,6 @@ void xxxfb_rotate(struct fb_info *info, int angle)
 }
 
 /**
- *      xxxfb_poll - NOT a required function. The purpose of this
- *                   function is to provide a way for some process
- *                   to wait until a specific hardware event occurs
- *                   for the framebuffer device.
- *                               
- *      @info: frame buffer structure that represents a single frame buffer
- *      @wait: poll table where we store process that await a event.     
- */
-void xxxfb_poll(struct fb_info *info, poll_table *wait)
-{
-}
-
-/**
  *      xxxfb_sync - NOT a required function. Normally the accel engine 
  *                   for a graphics card take a specific amount of time.
  *                   Often we have to wait for the accelerator to finish
@@ -647,21 +640,49 @@ void xxxfb_poll(struct fb_info *info, poll_table *wait)
  *      If the driver has implemented its own hardware-based drawing function,
  *      implementing this function is highly recommended.
  */
-void xxxfb_sync(struct fb_info *info)
+int xxxfb_sync(struct fb_info *info)
 {
+        return 0;
 }
 
     /*
+     *  Frame buffer operations
+     */
+
+static struct fb_ops xxxfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_open        = xxxfb_open,
+        .fb_read        = xxxfb_read,
+        .fb_write       = xxxfb_write,
+        .fb_release     = xxxfb_release,
+        .fb_check_var   = xxxfb_check_var,
+        .fb_set_par     = xxxfb_set_par,
+        .fb_setcolreg   = xxxfb_setcolreg,
+        .fb_blank       = xxxfb_blank,
+        .fb_pan_display = xxxfb_pan_display,
+        .fb_fillrect    = xxxfb_fillrect,       /* Needed !!! */
+        .fb_copyarea    = xxxfb_copyarea,       /* Needed !!! */
+        .fb_imageblit   = xxxfb_imageblit,      /* Needed !!! */
+        .fb_cursor      = xxxfb_cursor,         /* Optional !!! */
+        .fb_rotate      = xxxfb_rotate,
+        .fb_sync        = xxxfb_sync,
+        .fb_ioctl       = xxxfb_ioctl,
+        .fb_mmap        = xxxfb_mmap,
+};
+
+/* ------------------------------------------------------------------------- */
+
+    /*
      *  Initialization
      */
 
 /* static int __init xxfb_probe (struct device *device) -- for platform devs */
-static int __init xxxfb_probe(struct pci_dev *dev,
-                              const_struct pci_device_id *ent)
+static int __devinit xxxfb_probe(struct pci_dev *dev,
+                              const struct pci_device_id *ent)
 {
     struct fb_info *info;
     struct xxx_par *par;
-    struct device = &dev->dev; /* for pci drivers */
+    struct device* device = &dev->dev; /* for pci drivers */
     int cmap_len, retval;       
    
     /*
@@ -684,7 +705,7 @@ static int __init xxxfb_probe(struct pci_dev *dev,
     info->screen_base = framebuffer_virtual_memory;
     info->fbops = &xxxfb_ops;
     info->fix = xxxfb_fix; /* this will be the only time xxxfb_fix will be
-                            * used, so mark it as __initdata
+                            * used, so mark it as __devinitdata
                             */
     info->pseudo_palette = pseudo_palette; /* The pseudopalette is an
                                             * 16-member array
@@ -760,7 +781,7 @@ static int __init xxxfb_probe(struct pci_dev *dev,
      *
      * NOTE: This field is currently unused.
      */
-    info->pixmap.scan_align = 32
+    info->pixmap.scan_align = 32;
 /***************************** End optional stage ***************************/
 
     /*
@@ -770,13 +791,13 @@ static int __init xxxfb_probe(struct pci_dev *dev,
     if (!mode_option)
         mode_option = "640x480@60";             
 
-    retval = fb_find_mode(info->var, info, mode_option, NULL, 0, NULL, 8);
+    retval = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
   
     if (!retval || retval == 4)
         return -EINVAL;                 
 
     /* This has to been done !!! */     
-    fb_alloc_cmap(info->cmap, cmap_len, 0);
+    fb_alloc_cmap(&info->cmap, cmap_len, 0);
         
     /* 
      * The following is done in the case of having hardware with a static 
@@ -811,34 +832,77 @@ static int __init xxxfb_probe(struct pci_dev *dev,
     /*
      *  Cleanup
      */
-/* static void __exit xxxfb_remove(struct device *device) */
-static void __exit xxxfb_remove(struct pci_dev *dev)
+/* static void __devexit xxxfb_remove(struct device *device) */
+static void __devexit xxxfb_remove(struct pci_dev *dev)
 {
-        struct fb_info *info = pci_get_drv_data(dev);
-        /* or dev_get_drv_data(device); */
+        struct fb_info *info = pci_get_drvdata(dev);
+        /* or dev_get_drvdata(device); */
 
         if (info) {
                 unregister_framebuffer(info);
-                fb_dealloc_cmap(&info.cmap);
+                fb_dealloc_cmap(&info->cmap);
                 /* ... */
                 framebuffer_release(info);
         }
+}
+
+#ifdef CONFIG_PCI
+#ifdef CONFIG_PM
+/**
+ *      xxxfb_suspend - Optional but recommended function. Suspend the device.
+ *      @dev: PCI device
+ *      @msg: the suspend event code.
+ *
+ *      See Documentation/power/devices.txt for more information
+ */
+static int xxxfb_suspend(struct pci_dev *dev, pm_message_t msg)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct xxxfb_par *par = info->par;
+
+        /* suspend here */
+        return 0;
+}
+
+/**
+ *      xxxfb_resume - Optional but recommended function. Resume the device.
+ *      @dev: PCI device
+ *
+ *      See Documentation/power/devices.txt for more information
+ */
+static int xxxfb_resume(struct pci_dev *dev)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct xxxfb_par *par = info->par;
 
+        /* resume here */
         return 0;
 }
+#else
+#define xxxfb_suspend NULL
+#define xxxfb_resume NULL
+#endif /* CONFIG_PM */
+
+static struct pci_device_id xxxfb_id_table[] = {
+        { PCI_VENDOR_ID_XXX, PCI_DEVICE_ID_XXX,
+          PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
+          PCI_CLASS_MASK, 0 },
+        { 0, }
+};
 
-#if CONFIG_PCI
 /* For PCI drivers */
 static struct pci_driver xxxfb_driver = {
         .name =         "xxxfb",
-        .id_table =     xxxfb_devices,
+        .id_table =     xxxfb_id_table,
         .probe =        xxxfb_probe,
         .remove =       __devexit_p(xxxfb_remove),
-        .suspend =      xxxfb_suspend, /* optional */
-        .resume =       xxxfb_resume,  /* optional */
+        .suspend =      xxxfb_suspend, /* optional but recommended */
+        .resume =       xxxfb_resume,  /* optional but recommended */
 };
 
-static int __init xxxfb_init(void)
+MODULE_DEVICE_TABLE(pci, xxxfb_id_table);
+
+int __init xxxfb_init(void)
 {
         /*
          *  For kernel boot options (in 'video=xxxfb:<options>' format)
@@ -858,16 +922,53 @@ static void __exit xxxfb_exit(void)
 {
         pci_unregister_driver(&xxxfb_driver);
 }
-#else
+#else /* non PCI, platform drivers */
 #include <linux/platform_device.h>
 /* for platform devices */
+
+#ifdef CONFIG_PM
+/**
+ *      xxxfb_suspend - Optional but recommended function. Suspend the device.
+ *      @dev: platform device
+ *      @msg: the suspend event code.
+ *
+ *      See Documentation/power/devices.txt for more information
+ */
+static int xxxfb_suspend(struct platform_device *dev, pm_message_t msg)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct xxxfb_par *par = info->par;
+
+        /* suspend here */
+        return 0;
+}
+
+/**
+ *      xxxfb_resume - Optional but recommended function. Resume the device.
+ *      @dev: platform device
+ *
+ *      See Documentation/power/devices.txt for more information
+ */
+static int xxxfb_resume(struct platform_dev *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct xxxfb_par *par = info->par;
+
+        /* resume here */
+        return 0;
+}
+#else
+#define xxxfb_suspend NULL
+#define xxxfb_resume NULL
+#endif /* CONFIG_PM */
+
 static struct device_driver xxxfb_driver = {
         .name = "xxxfb",
         .bus  = &platform_bus_type,
         .probe = xxxfb_probe,
         .remove = xxxfb_remove,
-        .suspend = xxxfb_suspend, /* optional */
-        .resume = xxxfb_resume,   /* optional */
+        .suspend = xxxfb_suspend, /* optional but recommended */
+        .resume = xxxfb_resume,   /* optional but recommended */
 };
 
 static struct platform_device xxxfb_device = {
@@ -903,8 +1004,9 @@ static void __exit xxxfb_exit(void)
         platform_device_unregister(&xxxfb_device);
         driver_unregister(&xxxfb_driver);
 }
-#endif
+#endif /* CONFIG_PCI */
 
+#ifdef MODULE
     /*
      *  Setup
      */
@@ -917,34 +1019,7 @@ int __init xxxfb_setup(char *options)
 {
     /* Parse user speficied options (`video=xxxfb:') */
 }
-
-/* ------------------------------------------------------------------------- */
-
-    /*
-     *  Frame buffer operations
-     */
-
-static struct fb_ops xxxfb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_open        = xxxfb_open,
-        .fb_read        = xxxfb_read,
-        .fb_write       = xxxfb_write,
-        .fb_release     = xxxfb_release,
-        .fb_check_var   = xxxfb_check_var,
-        .fb_set_par     = xxxfb_set_par,        
-        .fb_setcolreg   = xxxfb_setcolreg,
-        .fb_blank       = xxxfb_blank,
-        .fb_pan_display = xxxfb_pan_display,    
-        .fb_fillrect    = xxxfb_fillrect,       /* Needed !!! */ 
-        .fb_copyarea    = xxxfb_copyarea,       /* Needed !!! */ 
-        .fb_imageblit   = xxxfb_imageblit,      /* Needed !!! */
-        .fb_cursor      = xxxfb_cursor,         /* Optional !!! */
-        .fb_rotate      = xxxfb_rotate,
-        .fb_poll        = xxxfb_poll,
-        .fb_sync        = xxxfb_sync,
-        .fb_ioctl       = xxxfb_ioctl,
-        .fb_mmap        = xxxfb_mmap,   
-};
+#endif /* MODULE */
 
 /* ------------------------------------------------------------------------- */
 
@@ -954,6 +1029,6 @@ static struct fb_ops xxxfb_ops = {
      */
 
 module_init(xxxfb_init);
-module_exit(xxxfb_cleanup);
+module_exit(xxxfb_remove);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 0a44c44672c8..c86df126f93a 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -989,7 +989,7 @@ static int sm501fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                         ((info->cmap.green[fg_col] & 0xFC) << 3) |
                         ((info->cmap.blue[fg_col] & 0xF8) >> 3);
 
-                dev_dbg(fbi->dev, "fgcol %08x, bgcol %08x\n", fg, bg);
+                dev_dbg(fbi->dev, "fgcol %08lx, bgcol %08lx\n", fg, bg);
 
                 writel(bg, base + SM501_OFF_HWC_COLOR_1_2);
                 writel(fg, base + SM501_OFF_HWC_COLOR_3);
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 68b30d9eac58..25df928d37d8 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -194,7 +194,7 @@ void svga_dump_var(struct fb_var_screeninfo *var, int node)
 void svga_settile(struct fb_info *info, struct fb_tilemap *map)
 {
         const u8 *font = map->data;
-        u8* fb = (u8 *) info->screen_base;
+        u8 __iomem *fb = (u8 __iomem *)info->screen_base;
         int i, c;
 
         if ((map->width != 8) || (map->height != 16) ||
@@ -207,7 +207,8 @@ void svga_settile(struct fb_info *info, struct fb_tilemap *map)
         fb += 2;
         for (c = 0; c < map->length; c++) {
                 for (i = 0; i < map->height; i++) {
-                        fb[i * 4] = font[i];
+                        fb_writeb(font[i], fb + i * 4);
+//                      fb[i * 4] = font[i];
                 }
                 fb += 128;
                 font += map->height;
@@ -221,8 +222,8 @@ void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area)
         /*  colstride is halved in this function because u16 are used */
         int colstride = 1 << (info->fix.type_aux & FB_AUX_TEXT_SVGA_MASK);
         int rowstride = colstride * (info->var.xres_virtual / 8);
-        u16 *fb = (u16 *) info->screen_base;
-        u16 *src, *dst;
+        u16 __iomem *fb = (u16 __iomem *) info->screen_base;
+        u16 __iomem *src, *dst;
 
         if ((area->sy > area->dy) ||
             ((area->sy == area->dy) && (area->sx > area->dx))) {
@@ -239,10 +240,11 @@ void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area)
             }
 
         for (dy = 0; dy < area->height; dy++) {
-                u16* src2 = src;
-                u16* dst2 = dst;
+                u16 __iomem *src2 = src;
+                u16 __iomem *dst2 = dst;
                 for (dx = 0; dx < area->width; dx++) {
-                        *dst2 = *src2;
+                        fb_writew(fb_readw(src2), dst2);
+//                      *dst2 = *src2;
                         src2 += colstride;
                         dst2 += colstride;
                 }
@@ -258,14 +260,14 @@ void svga_tilefill(struct fb_info *info, struct fb_tilerect *rect)
         int colstride = 2 << (info->fix.type_aux & FB_AUX_TEXT_SVGA_MASK);
         int rowstride = colstride * (info->var.xres_virtual / 8);
         int attr = (0x0F & rect->bg) << 4 | (0x0F & rect->fg);
-        u8  *fb = (u8 *) info->screen_base;
+        u8 __iomem *fb = (u8 __iomem *)info->screen_base;
         fb += rect->sx * colstride + rect->sy * rowstride;
 
         for (dy = 0; dy < rect->height; dy++) {
-                u8* fb2 = fb;
+                u8 __iomem *fb2 = fb;
                 for (dx = 0; dx < rect->width; dx++) {
-                        fb2[0] = rect->index;
-                        fb2[1] = attr;
+                        fb_writeb(rect->index, fb2);
+                        fb_writeb(attr, fb2 + 1);
                         fb2 += colstride;
                 }
                 fb += rowstride;
@@ -279,15 +281,15 @@ void svga_tileblit(struct fb_info *info, struct fb_tileblit *blit)
         int colstride = 2 << (info->fix.type_aux & FB_AUX_TEXT_SVGA_MASK);
         int rowstride = colstride * (info->var.xres_virtual / 8);
         int attr = (0x0F & blit->bg) << 4 | (0x0F & blit->fg);
-        u8* fb = (u8 *) info->screen_base;
+        u8 __iomem *fb = (u8 __iomem *)info->screen_base;
         fb += blit->sx * colstride + blit->sy * rowstride;
 
         i=0;
         for (dy=0; dy < blit->height; dy ++) {
-                u8* fb2 = fb;
+                u8 __iomem *fb2 = fb;
                 for (dx = 0; dx < blit->width; dx ++) {
-                        fb2[0] = blit->indices[i];
-                        fb2[1] = attr;
+                        fb_writeb(blit->indices[i], fb2);
+                        fb_writeb(attr, fb2 + 1);
                         fb2 += colstride;
                         i ++;
                         if (i == blit->length) return;
@@ -340,6 +342,28 @@ void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor)
         vga_wcrt(NULL, 0x0A, cs); /* set cursor start and enable it */
 }
 
+int svga_get_tilemax(struct fb_info *info)
+{
+        return 256;
+}
+
+/* Get capabilities of accelerator based on the mode */
+
+void svga_get_caps(struct fb_info *info, struct fb_blit_caps *caps,
+                   struct fb_var_screeninfo *var)
+{
+        if (var->bits_per_pixel == 0) {
+                /* can only support 256 8x16 bitmap */
+                caps->x = 1 << (8 - 1);
+                caps->y = 1 << (16 - 1);
+                caps->len = 256;
+        } else {
+                caps->x = (var->bits_per_pixel == 4) ? 1 << (8 - 1) : ~(u32)0;
+                caps->y = ~(u32)0;
+                caps->len = ~(u32)0;
+        }
+}
+EXPORT_SYMBOL(svga_get_caps);
 
 /* ------------------------------------------------------------------------- */
 
@@ -621,6 +645,7 @@ EXPORT_SYMBOL(svga_tilecopy);
 EXPORT_SYMBOL(svga_tilefill);
 EXPORT_SYMBOL(svga_tileblit);
 EXPORT_SYMBOL(svga_tilecursor);
+EXPORT_SYMBOL(svga_get_tilemax);
 
 EXPORT_SYMBOL(svga_compute_pll);
 EXPORT_SYMBOL(svga_check_timings);
diff --git a/drivers/video/syscopyarea.c b/drivers/video/syscopyarea.c
new file mode 100644
index 000000000000..37af10ab8f52
--- /dev/null
+++ b/drivers/video/syscopyarea.c
@@ -0,0 +1,378 @@
+/*
+ *  Generic Bit Block Transfer for frame buffers located in system RAM with
+ *  packed pixels of any depth.
+ *
+ *  Based almost entirely from cfbcopyarea.c (which is based almost entirely
+ *  on Geert Uytterhoeven's copyarea routine)
+ *
+ *      Copyright (C)  2007 Antonino Daplas <adaplas@pol.net>
+ *
+ *  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/string.h>
+#include <linux/fb.h>
+#include <linux/slab.h>
+#include <asm/types.h>
+#include <asm/io.h>
+#include "fb_draw.h"
+
+    /*
+     *  Generic bitwise copy algorithm
+     */
+
+static void
+bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
+        int src_idx, int bits, unsigned n)
+{
+        unsigned long first, last;
+        int const shift = dst_idx-src_idx;
+        int left, right;
+
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+
+        if (!shift) {
+                /* Same alignment for source and dest */
+                if (dst_idx+n <= bits) {
+                        /* Single word */
+                        if (last)
+                                first &= last;
+                        *dst = comp(*src, *dst, first);
+                } else {
+                        /* Multiple destination words */
+                        /* Leading bits */
+                        if (first != ~0UL) {
+                                *dst = comp(*src, *dst, first);
+                                dst++;
+                                src++;
+                                n -= bits - dst_idx;
+                        }
+
+                        /* Main chunk */
+                        n /= bits;
+                        while (n >= 8) {
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                *dst++ = *src++;
+                                n -= 8;
+                        }
+                        while (n--)
+                                *dst++ = *src++;
+
+                        /* Trailing bits */
+                        if (last)
+                                *dst = comp(*src, *dst, last);
+                }
+        } else {
+                unsigned long d0, d1;
+                int m;
+
+                /* Different alignment for source and dest */
+                right = shift & (bits - 1);
+                left = -shift & (bits - 1);
+
+                if (dst_idx+n <= bits) {
+                        /* Single destination word */
+                        if (last)
+                                first &= last;
+                        if (shift > 0) {
+                                /* Single source word */
+                                *dst = comp(*src >> right, *dst, first);
+                        } else if (src_idx+n <= bits) {
+                                /* Single source word */
+                                *dst = comp(*src << left, *dst, first);
+                        } else {
+                                /* 2 source words */
+                                d0 = *src++;
+                                d1 = *src;
+                                *dst = comp(d0 << left | d1 >> right, *dst,
+                                            first);
+                        }
+                } else {
+                        /* Multiple destination words */
+                        /** We must always remember the last value read,
+                            because in case SRC and DST overlap bitwise (e.g.
+                            when moving just one pixel in 1bpp), we always
+                            collect one full long for DST and that might
+                            overlap with the current long from SRC. We store
+                            this value in 'd0'. */
+                        d0 = *src++;
+                        /* Leading bits */
+                        if (shift > 0) {
+                                /* Single source word */
+                                *dst = comp(d0 >> right, *dst, first);
+                                dst++;
+                                n -= bits - dst_idx;
+                        } else {
+                                /* 2 source words */
+                                d1 = *src++;
+                                *dst = comp(d0 << left | *dst >> right, *dst, first);
+                                d0 = d1;
+                                dst++;
+                                n -= bits - dst_idx;
+                        }
+
+                        /* Main chunk */
+                        m = n % bits;
+                        n /= bits;
+                        while (n >= 4) {
+                                d1 = *src++;
+                                *dst++ = d0 << left | d1 >> right;
+                                d0 = d1;
+                                d1 = *src++;
+                                *dst++ = d0 << left | d1 >> right;
+                                d0 = d1;
+                                d1 = *src++;
+                                *dst++ = d0 << left | d1 >> right;
+                                d0 = d1;
+                                d1 = *src++;
+                                *dst++ = d0 << left | d1 >> right;
+                                d0 = d1;
+                                n -= 4;
+                        }
+                        while (n--) {
+                                d1 = *src++;
+                                *dst++ = d0 << left | d1 >> right;
+                                d0 = d1;
+                        }
+
+                        /* Trailing bits */
+                        if (last) {
+                                if (m <= right) {
+                                        /* Single source word */
+                                        *dst = comp(d0 << left, *dst, last);
+                                } else {
+                                        /* 2 source words */
+                                        d1 = *src;
+                                        *dst = comp(d0 << left | d1 >> right,
+                                                    *dst, last);
+                                }
+                        }
+                }
+        }
+}
+
+    /*
+     *  Generic bitwise copy algorithm, operating backward
+     */
+
+static void
+bitcpy_rev(unsigned long *dst, int dst_idx, const unsigned long *src,
+           int src_idx, int bits, unsigned n)
+{
+        unsigned long first, last;
+        int shift;
+
+        dst += (n-1)/bits;
+        src += (n-1)/bits;
+        if ((n-1) % bits) {
+                dst_idx += (n-1) % bits;
+                dst += dst_idx >> (ffs(bits) - 1);
+                dst_idx &= bits - 1;
+                src_idx += (n-1) % bits;
+                src += src_idx >> (ffs(bits) - 1);
+                src_idx &= bits - 1;
+        }
+
+        shift = dst_idx-src_idx;
+
+        first = FB_SHIFT_LOW(~0UL, bits - 1 - dst_idx);
+        last = ~(FB_SHIFT_LOW(~0UL, bits - 1 - ((dst_idx-n) % bits)));
+
+        if (!shift) {
+                /* Same alignment for source and dest */
+                if ((unsigned long)dst_idx+1 >= n) {
+                        /* Single word */
+                        if (last)
+                                first &= last;
+                        *dst = comp(*src, *dst, first);
+                } else {
+                        /* Multiple destination words */
+
+                        /* Leading bits */
+                        if (first != ~0UL) {
+                                *dst = comp(*src, *dst, first);
+                                dst--;
+                                src--;
+                                n -= dst_idx+1;
+                        }
+
+                        /* Main chunk */
+                        n /= bits;
+                        while (n >= 8) {
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                *dst-- = *src--;
+                                n -= 8;
+                        }
+                        while (n--)
+                                *dst-- = *src--;
+                        /* Trailing bits */
+                        if (last)
+                                *dst = comp(*src, *dst, last);
+                }
+        } else {
+                /* Different alignment for source and dest */
+
+                int const left = -shift & (bits-1);
+                int const right = shift & (bits-1);
+
+                if ((unsigned long)dst_idx+1 >= n) {
+                        /* Single destination word */
+                        if (last)
+                                first &= last;
+                        if (shift < 0) {
+                                /* Single source word */
+                                *dst = comp(*src << left, *dst, first);
+                        } else if (1+(unsigned long)src_idx >= n) {
+                                /* Single source word */
+                                *dst = comp(*src >> right, *dst, first);
+                        } else {
+                                /* 2 source words */
+                                *dst = comp(*src >> right | *(src-1) << left,
+                                            *dst, first);
+                        }
+                } else {
+                        /* Multiple destination words */
+                        /** We must always remember the last value read,
+                            because in case SRC and DST overlap bitwise (e.g.
+                            when moving just one pixel in 1bpp), we always
+                            collect one full long for DST and that might
+                            overlap with the current long from SRC. We store
+                            this value in 'd0'. */
+                        unsigned long d0, d1;
+                        int m;
+
+                        d0 = *src--;
+                        /* Leading bits */
+                        if (shift < 0) {
+                                /* Single source word */
+                                *dst = comp(d0 << left, *dst, first);
+                        } else {
+                                /* 2 source words */
+                                d1 = *src--;
+                                *dst = comp(d0 >> right | d1 << left, *dst,
+                                            first);
+                                d0 = d1;
+                        }
+                        dst--;
+                        n -= dst_idx+1;
+
+                        /* Main chunk */
+                        m = n % bits;
+                        n /= bits;
+                        while (n >= 4) {
+                                d1 = *src--;
+                                *dst-- = d0 >> right | d1 << left;
+                                d0 = d1;
+                                d1 = *src--;
+                                *dst-- = d0 >> right | d1 << left;
+                                d0 = d1;
+                                d1 = *src--;
+                                *dst-- = d0 >> right | d1 << left;
+                                d0 = d1;
+                                d1 = *src--;
+                                *dst-- = d0 >> right | d1 << left;
+                                d0 = d1;
+                                n -= 4;
+                        }
+                        while (n--) {
+                                d1 = *src--;
+                                *dst-- = d0 >> right | d1 << left;
+                                d0 = d1;
+                        }
+
+                        /* Trailing bits */
+                        if (last) {
+                                if (m <= left) {
+                                        /* Single source word */
+                                        *dst = comp(d0 >> right, *dst, last);
+                                } else {
+                                        /* 2 source words */
+                                        d1 = *src;
+                                        *dst = comp(d0 >> right | d1 << left,
+                                                    *dst, last);
+                                }
+                        }
+                }
+        }
+}
+
+void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
+{
+        u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;
+        u32 height = area->height, width = area->width;
+        unsigned long const bits_per_line = p->fix.line_length*8u;
+        unsigned long *dst = NULL, *src = NULL;
+        int bits = BITS_PER_LONG, bytes = bits >> 3;
+        int dst_idx = 0, src_idx = 0, rev_copy = 0;
+
+        if (p->state != FBINFO_STATE_RUNNING)
+                return;
+
+        /* if the beginning of the target area might overlap with the end of
+        the source area, be have to copy the area reverse. */
+        if ((dy == sy && dx > sx) || (dy > sy)) {
+                dy += height;
+                sy += height;
+                rev_copy = 1;
+        }
+
+        /* split the base of the framebuffer into a long-aligned address and
+           the index of the first bit */
+        dst = src = (unsigned long *)((unsigned long)p->screen_base &
+                                      ~(bytes-1));
+        dst_idx = src_idx = 8*((unsigned long)p->screen_base & (bytes-1));
+        /* add offset of source and target area */
+        dst_idx += dy*bits_per_line + dx*p->var.bits_per_pixel;
+        src_idx += sy*bits_per_line + sx*p->var.bits_per_pixel;
+
+        if (p->fbops->fb_sync)
+                p->fbops->fb_sync(p);
+
+        if (rev_copy) {
+                while (height--) {
+                        dst_idx -= bits_per_line;
+                        src_idx -= bits_per_line;
+                        dst += dst_idx >> (ffs(bits) - 1);
+                        dst_idx &= (bytes - 1);
+                        src += src_idx >> (ffs(bits) - 1);
+                        src_idx &= (bytes - 1);
+                        bitcpy_rev(dst, dst_idx, src, src_idx, bits,
+                                width*p->var.bits_per_pixel);
+                }
+        } else {
+                while (height--) {
+                        dst += dst_idx >> (ffs(bits) - 1);
+                        dst_idx &= (bytes - 1);
+                        src += src_idx >> (ffs(bits) - 1);
+                        src_idx &= (bytes - 1);
+                        bitcpy(dst, dst_idx, src, src_idx, bits,
+                                width*p->var.bits_per_pixel);
+                        dst_idx += bits_per_line;
+                        src_idx += bits_per_line;
+                }
+        }
+}
+
+EXPORT_SYMBOL(sys_copyarea);
+
+MODULE_AUTHOR("Antonino Daplas <adaplas@pol.net>");
+MODULE_DESCRIPTION("Generic copyarea (sys-to-sys)");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/sysfillrect.c b/drivers/video/sysfillrect.c
new file mode 100644
index 000000000000..a261e9e6a675
--- /dev/null
+++ b/drivers/video/sysfillrect.c
@@ -0,0 +1,334 @@
+/*
+ *  Generic fillrect for frame buffers in system RAM with packed pixels of
+ *  any depth.
+ *
+ *  Based almost entirely from cfbfillrect.c (which is based almost entirely
+ *  on Geert Uytterhoeven's fillrect routine)
+ *
+ *      Copyright (C)  2007 Antonino Daplas <adaplas@pol.net>
+ *
+ *  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/string.h>
+#include <linux/fb.h>
+#include <asm/types.h>
+#include "fb_draw.h"
+
+    /*
+     *  Aligned pattern fill using 32/64-bit memory accesses
+     */
+
+static void
+bitfill_aligned(unsigned long *dst, int dst_idx, unsigned long pat,
+                unsigned n, int bits)
+{
+        unsigned long first, last;
+
+        if (!n)
+                return;
+
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+
+        if (dst_idx+n <= bits) {
+                /* Single word */
+                if (last)
+                        first &= last;
+                *dst = comp(pat, *dst, first);
+        } else {
+                /* Multiple destination words */
+
+                /* Leading bits */
+                if (first!= ~0UL) {
+                        *dst = comp(pat, *dst, first);
+                        dst++;
+                        n -= bits - dst_idx;
+                }
+
+                /* Main chunk */
+                n /= bits;
+                while (n >= 8) {
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        *dst++ = pat;
+                        n -= 8;
+                }
+                while (n--)
+                        *dst++ = pat;
+                /* Trailing bits */
+                if (last)
+                        *dst = comp(pat, *dst, last);
+        }
+}
+
+
+    /*
+     *  Unaligned generic pattern fill using 32/64-bit memory accesses
+     *  The pattern must have been expanded to a full 32/64-bit value
+     *  Left/right are the appropriate shifts to convert to the pattern to be
+     *  used for the next 32/64-bit word
+     */
+
+static void
+bitfill_unaligned(unsigned long *dst, int dst_idx, unsigned long pat,
+                  int left, int right, unsigned n, int bits)
+{
+        unsigned long first, last;
+
+        if (!n)
+                return;
+
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+
+        if (dst_idx+n <= bits) {
+                /* Single word */
+                if (last)
+                        first &= last;
+                *dst = comp(pat, *dst, first);
+        } else {
+                /* Multiple destination words */
+                /* Leading bits */
+                if (first) {
+                        *dst = comp(pat, *dst, first);
+                        dst++;
+                        pat = pat << left | pat >> right;
+                        n -= bits - dst_idx;
+                }
+
+                /* Main chunk */
+                n /= bits;
+                while (n >= 4) {
+                        *dst++ = pat;
+                        pat = pat << left | pat >> right;
+                        *dst++ = pat;
+                        pat = pat << left | pat >> right;
+                        *dst++ = pat;
+                        pat = pat << left | pat >> right;
+                        *dst++ = pat;
+                        pat = pat << left | pat >> right;
+                        n -= 4;
+                }
+                while (n--) {
+                        *dst++ = pat;
+                        pat = pat << left | pat >> right;
+                }
+
+                /* Trailing bits */
+                if (last)
+                        *dst = comp(pat, *dst, first);
+        }
+}
+
+    /*
+     *  Aligned pattern invert using 32/64-bit memory accesses
+     */
+static void
+bitfill_aligned_rev(unsigned long *dst, int dst_idx, unsigned long pat,
+                    unsigned n, int bits)
+{
+        unsigned long val = pat;
+        unsigned long first, last;
+
+        if (!n)
+                return;
+
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+
+        if (dst_idx+n <= bits) {
+                /* Single word */
+                if (last)
+                        first &= last;
+                *dst = comp(*dst ^ val, *dst, first);
+        } else {
+                /* Multiple destination words */
+                /* Leading bits */
+                if (first!=0UL) {
+                        *dst = comp(*dst ^ val, *dst, first);
+                        dst++;
+                        n -= bits - dst_idx;
+                }
+
+                /* Main chunk */
+                n /= bits;
+                while (n >= 8) {
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        *dst++ ^= val;
+                        n -= 8;
+                }
+                while (n--)
+                        *dst++ ^= val;
+                /* Trailing bits */
+                if (last)
+                        *dst = comp(*dst ^ val, *dst, last);
+        }
+}
+
+
+    /*
+     *  Unaligned generic pattern invert using 32/64-bit memory accesses
+     *  The pattern must have been expanded to a full 32/64-bit value
+     *  Left/right are the appropriate shifts to convert to the pattern to be
+     *  used for the next 32/64-bit word
+     */
+
+static void
+bitfill_unaligned_rev(unsigned long *dst, int dst_idx, unsigned long pat,
+                        int left, int right, unsigned n, int bits)
+{
+        unsigned long first, last;
+
+        if (!n)
+                return;
+
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+
+        if (dst_idx+n <= bits) {
+                /* Single word */
+                if (last)
+                        first &= last;
+                *dst = comp(*dst ^ pat, *dst, first);
+        } else {
+                /* Multiple destination words */
+
+                /* Leading bits */
+                if (first != 0UL) {
+                        *dst = comp(*dst ^ pat, *dst, first);
+                        dst++;
+                        pat = pat << left | pat >> right;
+                        n -= bits - dst_idx;
+                }
+
+                /* Main chunk */
+                n /= bits;
+                while (n >= 4) {
+                        *dst++ ^= pat;
+                        pat = pat << left | pat >> right;
+                        *dst++ ^= pat;
+                        pat = pat << left | pat >> right;
+                        *dst++ ^= pat;
+                        pat = pat << left | pat >> right;
+                        *dst++ ^= pat;
+                        pat = pat << left | pat >> right;
+                        n -= 4;
+                }
+                while (n--) {
+                        *dst ^= pat;
+                        pat = pat << left | pat >> right;
+                }
+
+                /* Trailing bits */
+                if (last)
+                        *dst = comp(*dst ^ pat, *dst, last);
+        }
+}
+
+void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
+{
+        unsigned long pat, fg;
+        unsigned long width = rect->width, height = rect->height;
+        int bits = BITS_PER_LONG, bytes = bits >> 3;
+        u32 bpp = p->var.bits_per_pixel;
+        unsigned long *dst;
+        int dst_idx, left;
+
+        if (p->state != FBINFO_STATE_RUNNING)
+                return;
+
+        if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
+            p->fix.visual == FB_VISUAL_DIRECTCOLOR )
+                fg = ((u32 *) (p->pseudo_palette))[rect->color];
+        else
+                fg = rect->color;
+
+        pat = pixel_to_pat( bpp, fg);
+
+        dst = (unsigned long *)((unsigned long)p->screen_base & ~(bytes-1));
+        dst_idx = ((unsigned long)p->screen_base & (bytes - 1))*8;
+        dst_idx += rect->dy*p->fix.line_length*8+rect->dx*bpp;
+        /* FIXME For now we support 1-32 bpp only */
+        left = bits % bpp;
+        if (p->fbops->fb_sync)
+                p->fbops->fb_sync(p);
+        if (!left) {
+                void (*fill_op32)(unsigned long *dst, int dst_idx,
+                                  unsigned long pat, unsigned n, int bits) =
+                        NULL;
+
+                switch (rect->rop) {
+                case ROP_XOR:
+                        fill_op32 = bitfill_aligned_rev;
+                        break;
+                case ROP_COPY:
+                        fill_op32 = bitfill_aligned;
+                        break;
+                default:
+                        printk( KERN_ERR "cfb_fillrect(): unknown rop, "
+                                "defaulting to ROP_COPY\n");
+                        fill_op32 = bitfill_aligned;
+                        break;
+                }
+                while (height--) {
+                        dst += dst_idx >> (ffs(bits) - 1);
+                        dst_idx &= (bits - 1);
+                        fill_op32(dst, dst_idx, pat, width*bpp, bits);
+                        dst_idx += p->fix.line_length*8;
+                }
+        } else {
+                int right;
+                int r;
+                int rot = (left-dst_idx) % bpp;
+                void (*fill_op)(unsigned long *dst, int dst_idx,
+                                unsigned long pat, int left, int right,
+                                unsigned n, int bits) = NULL;
+
+                /* rotate pattern to correct start position */
+                pat = pat << rot | pat >> (bpp-rot);
+
+                right = bpp-left;
+                switch (rect->rop) {
+                case ROP_XOR:
+                        fill_op = bitfill_unaligned_rev;
+                        break;
+                case ROP_COPY:
+                        fill_op = bitfill_unaligned;
+                        break;
+                default:
+                        printk(KERN_ERR "cfb_fillrect(): unknown rop, "
+                                "defaulting to ROP_COPY\n");
+                        fill_op = bitfill_unaligned;
+                        break;
+                }
+                while (height--) {
+                        dst += dst_idx >> (ffs(bits) - 1);
+                        dst_idx &= (bits - 1);
+                        fill_op(dst, dst_idx, pat, left, right,
+                                width*bpp, bits);
+                        r = (p->fix.line_length*8) % bpp;
+                        pat = pat << (bpp-r) | pat >> r;
+                        dst_idx += p->fix.line_length*8;
+                }
+        }
+}
+
+EXPORT_SYMBOL(sys_fillrect);
+
+MODULE_AUTHOR("Antonino Daplas <adaplas@pol.net>");
+MODULE_DESCRIPTION("Generic fill rectangle (sys-to-sys)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/sysimgblt.c b/drivers/video/sysimgblt.c
new file mode 100644
index 000000000000..bd7e7e9d155f
--- /dev/null
+++ b/drivers/video/sysimgblt.c
@@ -0,0 +1,291 @@
+/*
+ *  Generic 1-bit or 8-bit source to 1-32 bit destination expansion
+ *  for frame buffer located in system RAM with packed pixels of any depth.
+ *
+ *  Based almost entirely on cfbimgblt.c
+ *
+ *      Copyright (C)  April 2007 Antonino Daplas <adaplas@pol.net>
+ *
+ *  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/string.h>
+#include <linux/fb.h>
+#include <asm/types.h>
+
+#define DEBUG
+
+#ifdef DEBUG
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args)
+#else
+#define DPRINTK(fmt, args...)
+#endif
+
+static const u32 cfb_tab8[] = {
+#if defined(__BIG_ENDIAN)
+    0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
+    0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
+    0xff000000,0xff0000ff,0xff00ff00,0xff00ffff,
+    0xffff0000,0xffff00ff,0xffffff00,0xffffffff
+#elif defined(__LITTLE_ENDIAN)
+    0x00000000,0xff000000,0x00ff0000,0xffff0000,
+    0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
+    0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
+    0x0000ffff,0xff00ffff,0x00ffffff,0xffffffff
+#else
+#error FIXME: No endianness??
+#endif
+};
+
+static const u32 cfb_tab16[] = {
+#if defined(__BIG_ENDIAN)
+    0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
+#elif defined(__LITTLE_ENDIAN)
+    0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
+#else
+#error FIXME: No endianness??
+#endif
+};
+
+static const u32 cfb_tab32[] = {
+        0x00000000, 0xffffffff
+};
+
+static void color_imageblit(const struct fb_image *image, struct fb_info *p,
+                            void *dst1, u32 start_index, u32 pitch_index)
+{
+        /* Draw the penguin */
+        u32 *dst, *dst2;
+        u32 color = 0, val, shift;
+        int i, n, bpp = p->var.bits_per_pixel;
+        u32 null_bits = 32 - bpp;
+        u32 *palette = (u32 *) p->pseudo_palette;
+        const u8 *src = image->data;
+
+        dst2 = dst1;
+        for (i = image->height; i--; ) {
+                n = image->width;
+                dst = dst1;
+                shift = 0;
+                val = 0;
+
+                if (start_index) {
+                        u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0,
+                                                         start_index));
+                        val = *dst & start_mask;
+                        shift = start_index;
+                }
+                while (n--) {
+                        if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
+                            p->fix.visual == FB_VISUAL_DIRECTCOLOR )
+                                color = palette[*src];
+                        else
+                                color = *src;
+                        color <<= FB_LEFT_POS(bpp);
+                        val |= FB_SHIFT_HIGH(color, shift);
+                        if (shift >= null_bits) {
+                                *dst++ = val;
+
+                                val = (shift == null_bits) ? 0 :
+                                        FB_SHIFT_LOW(color, 32 - shift);
+                        }
+                        shift += bpp;
+                        shift &= (32 - 1);
+                        src++;
+                }
+                if (shift) {
+                        u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift);
+
+                        *dst &= end_mask;
+                        *dst |= val;
+                }
+                dst1 += p->fix.line_length;
+                if (pitch_index) {
+                        dst2 += p->fix.line_length;
+                        dst1 = (u8 *)((long)dst2 & ~(sizeof(u32) - 1));
+
+                        start_index += pitch_index;
+                        start_index &= 32 - 1;
+                }
+        }
+}
+
+static void slow_imageblit(const struct fb_image *image, struct fb_info *p,
+                                  void *dst1, u32 fgcolor, u32 bgcolor,
+                                  u32 start_index, u32 pitch_index)
+{
+        u32 shift, color = 0, bpp = p->var.bits_per_pixel;
+        u32 *dst, *dst2;
+        u32 val, pitch = p->fix.line_length;
+        u32 null_bits = 32 - bpp;
+        u32 spitch = (image->width+7)/8;
+        const u8 *src = image->data, *s;
+        u32 i, j, l;
+
+        dst2 = dst1;
+        fgcolor <<= FB_LEFT_POS(bpp);
+        bgcolor <<= FB_LEFT_POS(bpp);
+
+        for (i = image->height; i--; ) {
+                shift = val = 0;
+                l = 8;
+                j = image->width;
+                dst = dst1;
+                s = src;
+
+                /* write leading bits */
+                if (start_index) {
+                        u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0,start_index));
+                        val = *dst & start_mask;
+                        shift = start_index;
+                }
+
+                while (j--) {
+                        l--;
+                        color = (*s & (1 << l)) ? fgcolor : bgcolor;
+                        val |= FB_SHIFT_HIGH(color, shift);
+
+                        /* Did the bitshift spill bits to the next long? */
+                        if (shift >= null_bits) {
+                                *dst++ = val;
+                                val = (shift == null_bits) ? 0 :
+                                        FB_SHIFT_LOW(color,32 - shift);
+                        }
+                        shift += bpp;
+                        shift &= (32 - 1);
+                        if (!l) { l = 8; s++; };
+                }
+
+                /* write trailing bits */
+                if (shift) {
+                        u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift);
+
+                        *dst &= end_mask;
+                        *dst |= val;
+                }
+
+                dst1 += pitch;
+                src += spitch;
+                if (pitch_index) {
+                        dst2 += pitch;
+                        dst1 = (u8 *)((long)dst2 & ~(sizeof(u32) - 1));
+                        start_index += pitch_index;
+                        start_index &= 32 - 1;
+                }
+
+        }
+}
+
+/*
+ * fast_imageblit - optimized monochrome color expansion
+ *
+ * Only if:  bits_per_pixel == 8, 16, or 32
+ *           image->width is divisible by pixel/dword (ppw);
+ *           fix->line_legth is divisible by 4;
+ *           beginning and end of a scanline is dword aligned
+ */
+static void fast_imageblit(const struct fb_image *image, struct fb_info *p,
+                                  void *dst1, u32 fgcolor, u32 bgcolor)
+{
+        u32 fgx = fgcolor, bgx = bgcolor, bpp = p->var.bits_per_pixel;
+        u32 ppw = 32/bpp, spitch = (image->width + 7)/8;
+        u32 bit_mask, end_mask, eorx, shift;
+        const char *s = image->data, *src;
+        u32 *dst;
+        const u32 *tab = NULL;
+        int i, j, k;
+
+        switch (bpp) {
+        case 8:
+                tab = cfb_tab8;
+                break;
+        case 16:
+                tab = cfb_tab16;
+                break;
+        case 32:
+        default:
+                tab = cfb_tab32;
+                break;
+        }
+
+        for (i = ppw-1; i--; ) {
+                fgx <<= bpp;
+                bgx <<= bpp;
+                fgx |= fgcolor;
+                bgx |= bgcolor;
+        }
+
+        bit_mask = (1 << ppw) - 1;
+        eorx = fgx ^ bgx;
+        k = image->width/ppw;
+
+        for (i = image->height; i--; ) {
+                dst = dst1;
+                shift = 8;
+                src = s;
+
+                for (j = k; j--; ) {
+                        shift -= ppw;
+                        end_mask = tab[(*src >> shift) & bit_mask];
+                        *dst++ = (end_mask & eorx) ^ bgx;
+                        if (!shift) {
+                                shift = 8;
+                                src++;
+                        }
+                }
+                dst1 += p->fix.line_length;
+                s += spitch;
+        }
+}
+
+void sys_imageblit(struct fb_info *p, const struct fb_image *image)
+{
+        u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0;
+        u32 bpl = sizeof(u32), bpp = p->var.bits_per_pixel;
+        u32 width = image->width;
+        u32 dx = image->dx, dy = image->dy;
+        void *dst1;
+
+        if (p->state != FBINFO_STATE_RUNNING)
+                return;
+
+        bitstart = (dy * p->fix.line_length * 8) + (dx * bpp);
+        start_index = bitstart & (32 - 1);
+        pitch_index = (p->fix.line_length & (bpl - 1)) * 8;
+
+        bitstart /= 8;
+        bitstart &= ~(bpl - 1);
+        dst1 = (void __force *)p->screen_base + bitstart;
+
+        if (p->fbops->fb_sync)
+                p->fbops->fb_sync(p);
+
+        if (image->depth == 1) {
+                if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
+                    p->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+                        fgcolor = ((u32*)(p->pseudo_palette))[image->fg_color];
+                        bgcolor = ((u32*)(p->pseudo_palette))[image->bg_color];
+                } else {
+                        fgcolor = image->fg_color;
+                        bgcolor = image->bg_color;
+                }
+
+                if (32 % bpp == 0 && !start_index && !pitch_index &&
+                    ((width & (32/bpp-1)) == 0) &&
+                    bpp >= 8 && bpp <= 32)
+                        fast_imageblit(image, p, dst1, fgcolor, bgcolor);
+                else
+                        slow_imageblit(image, p, dst1, fgcolor, bgcolor,
+                                        start_index, pitch_index);
+        } else
+                color_imageblit(image, p, dst1, start_index, pitch_index);
+}
+
+EXPORT_SYMBOL(sys_imageblit);
+
+MODULE_AUTHOR("Antonino Daplas <adaplas@pol.net>");
+MODULE_DESCRIPTION("1-bit/8-bit to 1-32 bit color expansion (sys-to-sys)");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 7478d0e3e211..f0fde6ea7c36 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -5,27 +5,45 @@
  *      Copyright (C) 1997 Geert Uytterhoeven
  *      Copyright (C) 1999,2000 Martin Lucina, Tom Zerucha
  *      Copyright (C) 2002 Richard Henderson
+ *      Copyright (C) 2006 Maciej W. Rozycki
  *
  *  This file is subject to the terms and conditions of the GNU General Public
  *  License. See the file COPYING in the main directory of this archive for
  *  more details.
  */
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
+#include <linux/bitrev.h>
 #include <linux/delay.h>
-#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/errno.h>
 #include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/selection.h>
-#include <linux/bitrev.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/tc.h>
+
 #include <asm/io.h>
+
 #include <video/tgafb.h>
 
+#ifdef CONFIG_PCI
+#define TGA_BUS_PCI(dev) (dev->bus == &pci_bus_type)
+#else
+#define TGA_BUS_PCI(dev) 0
+#endif
+
+#ifdef CONFIG_TC
+#define TGA_BUS_TC(dev) (dev->bus == &tc_bus_type)
+#else
+#define TGA_BUS_TC(dev) 0
+#endif
+
 /*
  * Local functions.
  */
@@ -41,14 +59,19 @@ static void tgafb_init_fix(struct fb_info *);
 static void tgafb_imageblit(struct fb_info *, const struct fb_image *);
 static void tgafb_fillrect(struct fb_info *, const struct fb_fillrect *);
 static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);
+static int tgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);
 
-static int __devinit tgafb_pci_register(struct pci_dev *,
-                                        const struct pci_device_id *);
-static void __devexit tgafb_pci_unregister(struct pci_dev *);
+static int __devinit tgafb_register(struct device *dev);
+static void __devexit tgafb_unregister(struct device *dev);
 
-static const char *mode_option = "640x480@60";
+static const char *mode_option;
+static const char *mode_option_pci = "640x480@60";
+static const char *mode_option_tc = "1280x1024@72";
 
 
+static struct pci_driver tgafb_pci_driver;
+static struct tc_driver tgafb_tc_driver;
+
 /*
  *  Frame buffer operations
  */
@@ -59,15 +82,20 @@ static struct fb_ops tgafb_ops = {
         .fb_set_par             = tgafb_set_par,
         .fb_setcolreg           = tgafb_setcolreg,
         .fb_blank               = tgafb_blank,
+        .fb_pan_display         = tgafb_pan_display,
         .fb_fillrect            = tgafb_fillrect,
         .fb_copyarea            = tgafb_copyarea,
         .fb_imageblit           = tgafb_imageblit,
 };
 
 
+#ifdef CONFIG_PCI
 /*
  *  PCI registration operations
  */
+static int __devinit tgafb_pci_register(struct pci_dev *,
+                                        const struct pci_device_id *);
+static void __devexit tgafb_pci_unregister(struct pci_dev *);
 
 static struct pci_device_id const tgafb_pci_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TGA) },
@@ -75,13 +103,68 @@ static struct pci_device_id const tgafb_pci_table[] = {
 };
 MODULE_DEVICE_TABLE(pci, tgafb_pci_table);
 
-static struct pci_driver tgafb_driver = {
+static struct pci_driver tgafb_pci_driver = {
         .name                   = "tgafb",
         .id_table               = tgafb_pci_table,
         .probe                  = tgafb_pci_register,
         .remove                 = __devexit_p(tgafb_pci_unregister),
 };
 
+static int __devinit
+tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        return tgafb_register(&pdev->dev);
+}
+
+static void __devexit
+tgafb_pci_unregister(struct pci_dev *pdev)
+{
+        tgafb_unregister(&pdev->dev);
+}
+#endif /* CONFIG_PCI */
+
+#ifdef CONFIG_TC
+/*
+ *  TC registration operations
+ */
+static int __devinit tgafb_tc_register(struct device *);
+static int __devexit tgafb_tc_unregister(struct device *);
+
+static struct tc_device_id const tgafb_tc_table[] = {
+        { "DEC     ", "PMAGD-AA" },
+        { "DEC     ", "PMAGD   " },
+        { }
+};
+MODULE_DEVICE_TABLE(tc, tgafb_tc_table);
+
+static struct tc_driver tgafb_tc_driver = {
+        .id_table               = tgafb_tc_table,
+        .driver                 = {
+                .name           = "tgafb",
+                .bus            = &tc_bus_type,
+                .probe          = tgafb_tc_register,
+                .remove         = __devexit_p(tgafb_tc_unregister),
+        },
+};
+
+static int __devinit
+tgafb_tc_register(struct device *dev)
+{
+        int status = tgafb_register(dev);
+        if (!status)
+                get_device(dev);
+        return status;
+}
+
+static int __devexit
+tgafb_tc_unregister(struct device *dev)
+{
+        put_device(dev);
+        tgafb_unregister(dev);
+        return 0;
+}
+#endif /* CONFIG_TC */
+
 
 /**
  *      tgafb_check_var - Optional function.  Validates a var passed in.
@@ -132,10 +215,10 @@ static int
 tgafb_set_par(struct fb_info *info)
 {
         static unsigned int const deep_presets[4] = {
-                0x00014000,
-                0x0001440d,
+                0x00004000,
+                0x0000440d,
                 0xffffffff,
-                0x0001441d
+                0x0000441d
         };
         static unsigned int const rasterop_presets[4] = {
                 0x00000003,
@@ -157,6 +240,8 @@ tgafb_set_par(struct fb_info *info)
         };
 
         struct tga_par *par = (struct tga_par *) info->par;
+        int tga_bus_pci = TGA_BUS_PCI(par->dev);
+        int tga_bus_tc = TGA_BUS_TC(par->dev);
         u32 htimings, vtimings, pll_freq;
         u8 tga_type;
         int i;
@@ -221,7 +306,7 @@ tgafb_set_par(struct fb_info *info)
         TGA_WRITE_REG(par, vtimings, TGA_VERT_REG);
 
         /* Initalise RAMDAC. */
-        if (tga_type == TGA_TYPE_8PLANE) {
+        if (tga_type == TGA_TYPE_8PLANE && tga_bus_pci) {
 
                 /* Init BT485 RAMDAC registers.  */
                 BT485_WRITE(par, 0xa2 | (par->sync_on_green ? 0x8 : 0x0),
@@ -236,21 +321,7 @@ tgafb_set_par(struct fb_info *info)
                 BT485_WRITE(par, 0x00, BT485_ADDR_PAL_WRITE);
                 TGA_WRITE_REG(par, BT485_DATA_PAL, TGA_RAMDAC_SETUP_REG);
 
-#ifdef CONFIG_HW_CONSOLE
-                for (i = 0; i < 16; i++) {
-                        int j = color_table[i];
-
-                        TGA_WRITE_REG(par, default_red[j]|(BT485_DATA_PAL<<8),
-                                      TGA_RAMDAC_REG);
-                        TGA_WRITE_REG(par, default_grn[j]|(BT485_DATA_PAL<<8),
-                                      TGA_RAMDAC_REG);
-                        TGA_WRITE_REG(par, default_blu[j]|(BT485_DATA_PAL<<8),
-                                      TGA_RAMDAC_REG);
-                }
-                for (i = 0; i < 240 * 3; i += 4) {
-#else
                 for (i = 0; i < 256 * 3; i += 4) {
-#endif
                         TGA_WRITE_REG(par, 0x55 | (BT485_DATA_PAL << 8),
                                       TGA_RAMDAC_REG);
                         TGA_WRITE_REG(par, 0x00 | (BT485_DATA_PAL << 8),
@@ -261,6 +332,27 @@ tgafb_set_par(struct fb_info *info)
                                       TGA_RAMDAC_REG);
                 }
 
+        } else if (tga_type == TGA_TYPE_8PLANE && tga_bus_tc) {
+
+                /* Init BT459 RAMDAC registers.  */
+                BT459_WRITE(par, BT459_REG_ACC, BT459_CMD_REG_0, 0x40);
+                BT459_WRITE(par, BT459_REG_ACC, BT459_CMD_REG_1, 0x00);
+                BT459_WRITE(par, BT459_REG_ACC, BT459_CMD_REG_2,
+                            (par->sync_on_green ? 0xc0 : 0x40));
+
+                BT459_WRITE(par, BT459_REG_ACC, BT459_CUR_CMD_REG, 0x00);
+
+                /* Fill the palette.  */
+                BT459_LOAD_ADDR(par, 0x0000);
+                TGA_WRITE_REG(par, BT459_PALETTE << 2, TGA_RAMDAC_SETUP_REG);
+
+                for (i = 0; i < 256 * 3; i += 4) {
+                        TGA_WRITE_REG(par, 0x55, TGA_RAMDAC_REG);
+                        TGA_WRITE_REG(par, 0x00, TGA_RAMDAC_REG);
+                        TGA_WRITE_REG(par, 0x00, TGA_RAMDAC_REG);
+                        TGA_WRITE_REG(par, 0x00, TGA_RAMDAC_REG);
+                }
+
         } else { /* 24-plane or 24plusZ */
 
                 /* Init BT463 RAMDAC registers.  */
@@ -431,6 +523,8 @@ tgafb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
                 unsigned transp, struct fb_info *info)
 {
         struct tga_par *par = (struct tga_par *) info->par;
+        int tga_bus_pci = TGA_BUS_PCI(par->dev);
+        int tga_bus_tc = TGA_BUS_TC(par->dev);
 
         if (regno > 255)
                 return 1;
@@ -438,12 +532,18 @@ tgafb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
         green >>= 8;
         blue >>= 8;
 
-        if (par->tga_type == TGA_TYPE_8PLANE) {
+        if (par->tga_type == TGA_TYPE_8PLANE && tga_bus_pci) {
                 BT485_WRITE(par, regno, BT485_ADDR_PAL_WRITE);
                 TGA_WRITE_REG(par, BT485_DATA_PAL, TGA_RAMDAC_SETUP_REG);
                 TGA_WRITE_REG(par, red|(BT485_DATA_PAL<<8),TGA_RAMDAC_REG);
                 TGA_WRITE_REG(par, green|(BT485_DATA_PAL<<8),TGA_RAMDAC_REG);
                 TGA_WRITE_REG(par, blue|(BT485_DATA_PAL<<8),TGA_RAMDAC_REG);
+        } else if (par->tga_type == TGA_TYPE_8PLANE && tga_bus_tc) {
+                BT459_LOAD_ADDR(par, regno);
+                TGA_WRITE_REG(par, BT459_PALETTE << 2, TGA_RAMDAC_SETUP_REG);
+                TGA_WRITE_REG(par, red, TGA_RAMDAC_REG);
+                TGA_WRITE_REG(par, green, TGA_RAMDAC_REG);
+                TGA_WRITE_REG(par, blue, TGA_RAMDAC_REG);
         } else {
                 if (regno < 16) {
                         u32 value = (regno << 16) | (regno << 8) | regno;
@@ -523,16 +623,8 @@ tgafb_blank(int blank, struct fb_info *info)
  *  Acceleration.
  */
 
-/**
- *      tgafb_imageblit - REQUIRED function. Can use generic routines if
- *                        non acclerated hardware and packed pixel based.
- *                        Copies a image from system memory to the screen. 
- *
- *      @info: frame buffer structure that represents a single frame buffer
- *      @image: structure defining the image.
- */
 static void
-tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
+tgafb_mono_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct tga_par *par = (struct tga_par *) info->par;
         u32 fgcolor, bgcolor, dx, dy, width, height, vxres, vyres, pixelmask;
@@ -542,6 +634,17 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
         void __iomem *regs_base;
         void __iomem *fb_base;
 
+        is8bpp = info->var.bits_per_pixel == 8;
+
+        /* For copies that aren't pixel expansion, there's little we
+           can do better than the generic code.  */
+        /* ??? There is a DMA write mode; I wonder if that could be
+           made to pull the data from the image buffer...  */
+        if (image->depth > 1) {
+                cfb_imageblit(info, image);
+                return;
+        }
+
         dx = image->dx;
         dy = image->dy;
         width = image->width;
@@ -559,18 +662,8 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
         if (dy + height > vyres)
                 height = vyres - dy;
 
-        /* For copies that aren't pixel expansion, there's little we
-           can do better than the generic code.  */
-        /* ??? There is a DMA write mode; I wonder if that could be
-           made to pull the data from the image buffer...  */
-        if (image->depth > 1) {
-                cfb_imageblit(info, image);
-                return;
-        }
-
         regs_base = par->tga_regs_base;
         fb_base = par->tga_fb_base;
-        is8bpp = info->var.bits_per_pixel == 8;
 
         /* Expand the color values to fill 32-bits.  */
         /* ??? Would be nice to notice colour changes elsewhere, so
@@ -748,6 +841,85 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
                      regs_base + TGA_MODE_REG);
 }
 
+static void
+tgafb_clut_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        struct tga_par *par = (struct tga_par *) info->par;
+        u32 color, dx, dy, width, height, vxres, vyres;
+        u32 *palette = ((u32 *)info->pseudo_palette);
+        unsigned long pos, line_length, i, j;
+        const unsigned char *data;
+        void *regs_base, *fb_base;
+
+        dx = image->dx;
+        dy = image->dy;
+        width = image->width;
+        height = image->height;
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+        line_length = info->fix.line_length;
+
+        /* Crop the image to the screen.  */
+        if (dx > vxres || dy > vyres)
+                return;
+        if (dx + width > vxres)
+                width = vxres - dx;
+        if (dy + height > vyres)
+                height = vyres - dy;
+
+        regs_base = par->tga_regs_base;
+        fb_base = par->tga_fb_base;
+
+        pos = dy * line_length + (dx * 4);
+        data = image->data;
+
+        /* Now copy the image, color_expanding via the palette. */
+        for (i = 0; i < height; i++) {
+                for (j = 0; j < width; j++) {
+                        color = palette[*data++];
+                        __raw_writel(color, fb_base + pos + j*4);
+                }
+                pos += line_length;
+        }
+}
+
+/**
+ *      tgafb_imageblit - REQUIRED function. Can use generic routines if
+ *                        non acclerated hardware and packed pixel based.
+ *                        Copies a image from system memory to the screen.
+ *
+ *      @info: frame buffer structure that represents a single frame buffer
+ *      @image: structure defining the image.
+ */
+static void
+tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        unsigned int is8bpp = info->var.bits_per_pixel == 8;
+
+        /* If a mono image, regardless of FB depth, go do it. */
+        if (image->depth == 1) {
+                tgafb_mono_imageblit(info, image);
+                return;
+        }
+
+        /* For copies that aren't pixel expansion, there's little we
+           can do better than the generic code.  */
+        /* ??? There is a DMA write mode; I wonder if that could be
+           made to pull the data from the image buffer...  */
+        if (image->depth == info->var.bits_per_pixel) {
+                cfb_imageblit(info, image);
+                return;
+        }
+
+        /* If 24-plane FB and the image is 8-plane with CLUT, we can do it. */
+        if (!is8bpp && image->depth == 8) {
+                tgafb_clut_imageblit(info, image);
+                return;
+        }
+
+        /* Silently return... */
+}
+
 /**
  *      tgafb_fillrect - REQUIRED function. Can use generic routines if 
  *                       non acclerated hardware and packed pixel based.
@@ -1309,18 +1481,29 @@ static void
 tgafb_init_fix(struct fb_info *info)
 {
         struct tga_par *par = (struct tga_par *)info->par;
+        int tga_bus_pci = TGA_BUS_PCI(par->dev);
+        int tga_bus_tc = TGA_BUS_TC(par->dev);
         u8 tga_type = par->tga_type;
-        const char *tga_type_name;
+        const char *tga_type_name = NULL;
 
         switch (tga_type) {
         case TGA_TYPE_8PLANE:
-                tga_type_name = "Digital ZLXp-E1";
+                if (tga_bus_pci)
+                        tga_type_name = "Digital ZLXp-E1";
+                if (tga_bus_tc)
+                        tga_type_name = "Digital ZLX-E1";
                 break;
         case TGA_TYPE_24PLANE:
-                tga_type_name = "Digital ZLXp-E2";
+                if (tga_bus_pci)
+                        tga_type_name = "Digital ZLXp-E2";
+                if (tga_bus_tc)
+                        tga_type_name = "Digital ZLX-E2";
                 break;
         case TGA_TYPE_24PLUSZ:
-                tga_type_name = "Digital ZLXp-E3";
+                if (tga_bus_pci)
+                        tga_type_name = "Digital ZLXp-E3";
+                if (tga_bus_tc)
+                        tga_type_name = "Digital ZLX-E3";
                 break;
         default:
                 tga_type_name = "Unknown";
@@ -1346,11 +1529,37 @@ tgafb_init_fix(struct fb_info *info)
         info->fix.ywrapstep = 0;
 
         info->fix.accel = FB_ACCEL_DEC_TGA;
+
+        /*
+         * These are needed by fb_set_logo_truepalette(), so we
+         * set them here for 24-plane cards.
+         */
+        if (tga_type != TGA_TYPE_8PLANE) {
+                info->var.red.length = 8;
+                info->var.green.length = 8;
+                info->var.blue.length = 8;
+                info->var.red.offset = 16;
+                info->var.green.offset = 8;
+                info->var.blue.offset = 0;
+        }
 }
 
-static __devinit int
-tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int tgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        /* We just use this to catch switches out of graphics mode. */
+        tgafb_set_par(info); /* A bit of overkill for BASE_ADDR reset. */
+        return 0;
+}
+
+static int __devinit
+tgafb_register(struct device *dev)
 {
+        static const struct fb_videomode modedb_tc = {
+                /* 1280x1024 @ 72 Hz, 76.8 kHz hsync */
+                "1280x1024@72", 0, 1280, 1024, 7645, 224, 28, 33, 3, 160, 3,
+                FB_SYNC_ON_GREEN, FB_VMODE_NONINTERLACED
+        };
+
         static unsigned int const fb_offset_presets[4] = {
                 TGA_8PLANE_FB_OFFSET,
                 TGA_24PLANE_FB_OFFSET,
@@ -1358,40 +1567,51 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
                 TGA_24PLUSZ_FB_OFFSET
         };
 
+        const struct fb_videomode *modedb_tga = NULL;
+        resource_size_t bar0_start = 0, bar0_len = 0;
+        const char *mode_option_tga = NULL;
+        int tga_bus_pci = TGA_BUS_PCI(dev);
+        int tga_bus_tc = TGA_BUS_TC(dev);
+        unsigned int modedbsize_tga = 0;
         void __iomem *mem_base;
-        unsigned long bar0_start, bar0_len;
         struct fb_info *info;
         struct tga_par *par;
         u8 tga_type;
-        int ret;
+        int ret = 0;
 
         /* Enable device in PCI config.  */
-        if (pci_enable_device(pdev)) {
+        if (tga_bus_pci && pci_enable_device(to_pci_dev(dev))) {
                 printk(KERN_ERR "tgafb: Cannot enable PCI device\n");
                 return -ENODEV;
         }
 
         /* Allocate the fb and par structures.  */
-        info = framebuffer_alloc(sizeof(struct tga_par), &pdev->dev);
+        info = framebuffer_alloc(sizeof(struct tga_par), dev);
         if (!info) {
                 printk(KERN_ERR "tgafb: Cannot allocate memory\n");
                 return -ENOMEM;
         }
 
         par = info->par;
-        pci_set_drvdata(pdev, info);
+        dev_set_drvdata(dev, info);
 
         /* Request the mem regions.  */
-        bar0_start = pci_resource_start(pdev, 0);
-        bar0_len = pci_resource_len(pdev, 0);
         ret = -ENODEV;
+        if (tga_bus_pci) {
+                bar0_start = pci_resource_start(to_pci_dev(dev), 0);
+                bar0_len = pci_resource_len(to_pci_dev(dev), 0);
+        }
+        if (tga_bus_tc) {
+                bar0_start = to_tc_dev(dev)->resource.start;
+                bar0_len = to_tc_dev(dev)->resource.end - bar0_start + 1;
+        }
         if (!request_mem_region (bar0_start, bar0_len, "tgafb")) {
                 printk(KERN_ERR "tgafb: cannot reserve FB region\n");
                 goto err0;
         }
 
         /* Map the framebuffer.  */
-        mem_base = ioremap(bar0_start, bar0_len);
+        mem_base = ioremap_nocache(bar0_start, bar0_len);
         if (!mem_base) {
                 printk(KERN_ERR "tgafb: Cannot map MMIO\n");
                 goto err1;
@@ -1399,12 +1619,16 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Grab info about the card.  */
         tga_type = (readl(mem_base) >> 12) & 0x0f;
-        par->pdev = pdev;
+        par->dev = dev;
         par->tga_mem_base = mem_base;
         par->tga_fb_base = mem_base + fb_offset_presets[tga_type];
         par->tga_regs_base = mem_base + TGA_REGS_OFFSET;
         par->tga_type = tga_type;
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &par->tga_chip_rev);
+        if (tga_bus_pci)
+                pci_read_config_byte(to_pci_dev(dev), PCI_REVISION_ID,
+                                     &par->tga_chip_rev);
+        if (tga_bus_tc)
+                par->tga_chip_rev = TGA_READ_REG(par, TGA_START_REG) & 0xff;
 
         /* Setup framebuffer.  */
         info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA |
@@ -1414,8 +1638,17 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
         info->pseudo_palette = (void *)(par + 1);
 
         /* This should give a reasonable default video mode.  */
-
-        ret = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL,
+        if (tga_bus_pci) {
+                mode_option_tga = mode_option_pci;
+        }
+        if (tga_bus_tc) {
+                mode_option_tga = mode_option_tc;
+                modedb_tga = &modedb_tc;
+                modedbsize_tga = 1;
+        }
+        ret = fb_find_mode(&info->var, info,
+                           mode_option ? mode_option : mode_option_tga,
+                           modedb_tga, modedbsize_tga, NULL,
                            tga_type == TGA_TYPE_8PLANE ? 8 : 32);
         if (ret == 0 || ret == 4) {
                 printk(KERN_ERR "tgafb: Could not find valid video mode\n");
@@ -1438,13 +1671,19 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err1;
         }
 
-        printk(KERN_INFO "tgafb: DC21030 [TGA] detected, rev=0x%02x\n",
-               par->tga_chip_rev);
-        printk(KERN_INFO "tgafb: at PCI bus %d, device %d, function %d\n",
-               pdev->bus->number, PCI_SLOT(pdev->devfn),
-               PCI_FUNC(pdev->devfn));
-        printk(KERN_INFO "fb%d: %s frame buffer device at 0x%lx\n",
-               info->node, info->fix.id, bar0_start);
+        if (tga_bus_pci) {
+                pr_info("tgafb: DC21030 [TGA] detected, rev=0x%02x\n",
+                        par->tga_chip_rev);
+                pr_info("tgafb: at PCI bus %d, device %d, function %d\n",
+                        to_pci_dev(dev)->bus->number,
+                        PCI_SLOT(to_pci_dev(dev)->devfn),
+                        PCI_FUNC(to_pci_dev(dev)->devfn));
+        }
+        if (tga_bus_tc)
+                pr_info("tgafb: SFB+ detected, rev=0x%02x\n",
+                        par->tga_chip_rev);
+        pr_info("fb%d: %s frame buffer device at 0x%lx\n",
+                info->node, info->fix.id, (long)bar0_start);
 
         return 0;
 
@@ -1458,25 +1697,39 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
 }
 
 static void __devexit
-tgafb_pci_unregister(struct pci_dev *pdev)
+tgafb_unregister(struct device *dev)
 {
-        struct fb_info *info = pci_get_drvdata(pdev);
-        struct tga_par *par = info->par;
+        resource_size_t bar0_start = 0, bar0_len = 0;
+        int tga_bus_pci = TGA_BUS_PCI(dev);
+        int tga_bus_tc = TGA_BUS_TC(dev);
+        struct fb_info *info = NULL;
+        struct tga_par *par;
 
+        info = dev_get_drvdata(dev);
         if (!info)
                 return;
+
+        par = info->par;
         unregister_framebuffer(info);
         fb_dealloc_cmap(&info->cmap);
         iounmap(par->tga_mem_base);
-        release_mem_region(pci_resource_start(pdev, 0),
-                           pci_resource_len(pdev, 0));
+        if (tga_bus_pci) {
+                bar0_start = pci_resource_start(to_pci_dev(dev), 0);
+                bar0_len = pci_resource_len(to_pci_dev(dev), 0);
+        }
+        if (tga_bus_tc) {
+                bar0_start = to_tc_dev(dev)->resource.start;
+                bar0_len = to_tc_dev(dev)->resource.end - bar0_start + 1;
+        }
+        release_mem_region(bar0_start, bar0_len);
         framebuffer_release(info);
 }
 
 static void __devexit
 tgafb_exit(void)
 {
-        pci_unregister_driver(&tgafb_driver);
+        tc_unregister_driver(&tgafb_tc_driver);
+        pci_unregister_driver(&tgafb_pci_driver);
 }
 
 #ifndef MODULE
@@ -1505,6 +1758,7 @@ tgafb_setup(char *arg)
 static int __devinit
 tgafb_init(void)
 {
+        int status;
 #ifndef MODULE
         char *option = NULL;
 
@@ -1512,7 +1766,10 @@ tgafb_init(void)
                 return -ENODEV;
         tgafb_setup(option);
 #endif
-        return pci_register_driver(&tgafb_driver);
+        status = pci_register_driver(&tgafb_pci_driver);
+        if (!status)
+                status = tc_register_driver(&tgafb_tc_driver);
+        return status;
 }
 
 /*
@@ -1522,5 +1779,5 @@ tgafb_init(void)
 module_init(tgafb_init);
 module_exit(tgafb_exit);
 
-MODULE_DESCRIPTION("framebuffer driver for TGA chipset");
+MODULE_DESCRIPTION("Framebuffer driver for TGA/SFB+ chipset");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/vermilion/Makefile b/drivers/video/vermilion/Makefile
new file mode 100644
index 000000000000..cc21a656153d
--- /dev/null
+++ b/drivers/video/vermilion/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_FB_LE80578) += vmlfb.o
+obj-$(CONFIG_FB_CARILLO_RANCH) += crvml.o
+
+vmlfb-objs := vermilion.o
+crvml-objs := cr_pll.o
diff --git a/drivers/video/vermilion/cr_pll.c b/drivers/video/vermilion/cr_pll.c
new file mode 100644
index 000000000000..ebc6e6e0dd0f
--- /dev/null
+++ b/drivers/video/vermilion/cr_pll.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *
+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
+ * develop this driver.
+ *
+ * This file is part of the Carillo Ranch video subsystem driver.
+ * The Carillo Ranch video subsystem driver 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.
+ *
+ * The Carillo Ranch video subsystem driver 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 driver; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
+ *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+#include <linux/fb.h>
+#include "vermilion.h"
+
+/* The PLL Clock register sits on Host bridge */
+#define CRVML_DEVICE_MCH   0x5001
+#define CRVML_REG_MCHBAR   0x44
+#define CRVML_REG_MCHEN    0x54
+#define CRVML_MCHEN_BIT    (1 << 28)
+#define CRVML_MCHMAP_SIZE  4096
+#define CRVML_REG_CLOCK    0xc3c
+#define CRVML_CLOCK_SHIFT  8
+#define CRVML_CLOCK_MASK   0x00000f00
+
+static struct pci_dev *mch_dev;
+static u32 mch_bar;
+static void __iomem *mch_regs_base;
+static u32 saved_clock;
+
+static const unsigned crvml_clocks[] = {
+        6750,
+        13500,
+        27000,
+        29700,
+        37125,
+        54000,
+        59400,
+        74250,
+        120000
+            /*
+             * There are more clocks, but they are disabled on the CR board.
+             */
+};
+
+static const u32 crvml_clock_bits[] = {
+        0x0a,
+        0x09,
+        0x08,
+        0x07,
+        0x06,
+        0x05,
+        0x04,
+        0x03,
+        0x0b
+};
+
+static const unsigned crvml_num_clocks = ARRAY_SIZE(crvml_clocks);
+
+static int crvml_sys_restore(struct vml_sys *sys)
+{
+        void __iomem *clock_reg = mch_regs_base + CRVML_REG_CLOCK;
+
+        iowrite32(saved_clock, clock_reg);
+        ioread32(clock_reg);
+
+        return 0;
+}
+
+static int crvml_sys_save(struct vml_sys *sys)
+{
+        void __iomem *clock_reg = mch_regs_base + CRVML_REG_CLOCK;
+
+        saved_clock = ioread32(clock_reg);
+
+        return 0;
+}
+
+static int crvml_nearest_index(const struct vml_sys *sys, int clock)
+{
+        int i;
+        int cur_index = 0;
+        int cur_diff;
+        int diff;
+
+        cur_diff = clock - crvml_clocks[0];
+        cur_diff = (cur_diff < 0) ? -cur_diff : cur_diff;
+        for (i = 1; i < crvml_num_clocks; ++i) {
+                diff = clock - crvml_clocks[i];
+                diff = (diff < 0) ? -diff : diff;
+                if (diff < cur_diff) {
+                        cur_index = i;
+                        cur_diff = diff;
+                }
+        }
+        return cur_index;
+}
+
+static int crvml_nearest_clock(const struct vml_sys *sys, int clock)
+{
+        return crvml_clocks[crvml_nearest_index(sys, clock)];
+}
+
+static int crvml_set_clock(struct vml_sys *sys, int clock)
+{
+        void __iomem *clock_reg = mch_regs_base + CRVML_REG_CLOCK;
+        int index;
+        u32 clock_val;
+
+        index = crvml_nearest_index(sys, clock);
+
+        if (crvml_clocks[index] != clock)
+                return -EINVAL;
+
+        clock_val = ioread32(clock_reg) & ~CRVML_CLOCK_MASK;
+        clock_val = crvml_clock_bits[index] << CRVML_CLOCK_SHIFT;
+        iowrite32(clock_val, clock_reg);
+        ioread32(clock_reg);
+
+        return 0;
+}
+
+static struct vml_sys cr_pll_ops = {
+        .name = "Carillo Ranch",
+        .save = crvml_sys_save,
+        .restore = crvml_sys_restore,
+        .set_clock = crvml_set_clock,
+        .nearest_clock = crvml_nearest_clock,
+};
+
+static int __init cr_pll_init(void)
+{
+        int err;
+        u32 dev_en;
+
+        mch_dev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                        CRVML_DEVICE_MCH, NULL);
+        if (!mch_dev) {
+                printk(KERN_ERR
+                       "Could not find Carillo Ranch MCH device.\n");
+                return -ENODEV;
+        }
+
+        pci_read_config_dword(mch_dev, CRVML_REG_MCHEN, &dev_en);
+        if (!(dev_en & CRVML_MCHEN_BIT)) {
+                printk(KERN_ERR
+                       "Carillo Ranch MCH device was not enabled.\n");
+                pci_dev_put(mch_dev);
+                return -ENODEV;
+        }
+
+        pci_read_config_dword(mch_dev, CRVML_REG_MCHBAR,
+                              &mch_bar);
+        mch_regs_base =
+            ioremap_nocache(mch_bar, CRVML_MCHMAP_SIZE);
+        if (!mch_regs_base) {
+                printk(KERN_ERR
+                       "Carillo Ranch MCH device was not enabled.\n");
+                pci_dev_put(mch_dev);
+                return -ENODEV;
+        }
+
+        err = vmlfb_register_subsys(&cr_pll_ops);
+        if (err) {
+                printk(KERN_ERR
+                       "Carillo Ranch failed to initialize vml_sys.\n");
+                pci_dev_put(mch_dev);
+                return err;
+        }
+
+        return 0;
+}
+
+static void __exit cr_pll_exit(void)
+{
+        vmlfb_unregister_subsys(&cr_pll_ops);
+
+        iounmap(mch_regs_base);
+        pci_dev_put(mch_dev);
+}
+
+module_init(cr_pll_init);
+module_exit(cr_pll_exit);
+
+MODULE_AUTHOR("Tungsten Graphics Inc.");
+MODULE_DESCRIPTION("Carillo Ranch PLL Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
new file mode 100644
index 000000000000..de531c907718
--- /dev/null
+++ b/drivers/video/vermilion/vermilion.c
@@ -0,0 +1,1195 @@
+/*
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *
+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
+ * develop this driver.
+ *
+ * This file is part of the Vermilion Range fb driver.
+ * The Vermilion Range fb driver 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.
+ *
+ * The Vermilion Range fb driver 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 driver; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ *   Michel Dänzer <michel-at-tungstengraphics-dot-com>
+ *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/pci.h>
+#include <asm/cacheflush.h>
+#include <asm/tlbflush.h>
+#include <linux/mmzone.h>
+#include <asm/uaccess.h>
+
+/* #define VERMILION_DEBUG */
+
+#include "vermilion.h"
+
+#define MODULE_NAME "vmlfb"
+
+#define VML_TOHW(_val, _width) ((((_val) << (_width)) + 0x7FFF - (_val)) >> 16)
+
+static struct mutex vml_mutex;
+static struct list_head global_no_mode;
+static struct list_head global_has_mode;
+static struct fb_ops vmlfb_ops;
+static struct vml_sys *subsys = NULL;
+static char *vml_default_mode = "1024x768@60";
+static struct fb_videomode defaultmode = {
+        NULL, 60, 1024, 768, 12896, 144, 24, 29, 3, 136, 6,
+        0, FB_VMODE_NONINTERLACED
+};
+
+static u32 vml_mem_requested = (10 * 1024 * 1024);
+static u32 vml_mem_contig = (4 * 1024 * 1024);
+static u32 vml_mem_min = (4 * 1024 * 1024);
+
+static u32 vml_clocks[] = {
+        6750,
+        13500,
+        27000,
+        29700,
+        37125,
+        54000,
+        59400,
+        74250,
+        120000,
+        148500
+};
+
+static u32 vml_num_clocks = ARRAY_SIZE(vml_clocks);
+
+/*
+ * Allocate a contiguous vram area and make its linear kernel map
+ * uncached.
+ */
+
+static int vmlfb_alloc_vram_area(struct vram_area *va, unsigned max_order,
+                                 unsigned min_order)
+{
+        gfp_t flags;
+        unsigned long i;
+        pgprot_t wc_pageprot;
+
+        wc_pageprot = PAGE_KERNEL_NOCACHE;
+        max_order++;
+        do {
+                /*
+                 * Really try hard to get the needed memory.
+                 * We need memory below the first 32MB, so we
+                 * add the __GFP_DMA flag that guarantees that we are
+                 * below the first 16MB.
+                 */
+
+                flags = __GFP_DMA | __GFP_HIGH;
+                va->logical =
+                         __get_free_pages(flags, --max_order);
+        } while (va->logical == 0 && max_order > min_order);
+
+        if (!va->logical)
+                return -ENOMEM;
+
+        va->phys = virt_to_phys((void *)va->logical);
+        va->size = PAGE_SIZE << max_order;
+        va->order = max_order;
+
+        /*
+         * It seems like __get_free_pages only ups the usage count
+         * of the first page. This doesn't work with nopage mapping, so
+         * up the usage count once more.
+         */
+
+        memset((void *)va->logical, 0x00, va->size);
+        for (i = va->logical; i < va->logical + va->size; i += PAGE_SIZE) {
+                get_page(virt_to_page(i));
+        }
+
+        /*
+         * Change caching policy of the linear kernel map to avoid
+         * mapping type conflicts with user-space mappings.
+         * The first global_flush_tlb() is really only there to do a global
+         * wbinvd().
+         */
+
+        global_flush_tlb();
+        change_page_attr(virt_to_page(va->logical), va->size >> PAGE_SHIFT,
+                         wc_pageprot);
+        global_flush_tlb();
+
+        printk(KERN_DEBUG MODULE_NAME
+               ": Allocated %ld bytes vram area at 0x%08lx\n",
+               va->size, va->phys);
+
+        return 0;
+}
+
+/*
+ * Free a contiguous vram area and reset its linear kernel map
+ * mapping type.
+ */
+
+static void vmlfb_free_vram_area(struct vram_area *va)
+{
+        unsigned long j;
+
+        if (va->logical) {
+
+                /*
+                 * Reset the linear kernel map caching policy.
+                 */
+
+                change_page_attr(virt_to_page(va->logical),
+                                 va->size >> PAGE_SHIFT, PAGE_KERNEL);
+                global_flush_tlb();
+
+                /*
+                 * Decrease the usage count on the pages we've used
+                 * to compensate for upping when allocating.
+                 */
+
+                for (j = va->logical; j < va->logical + va->size;
+                     j += PAGE_SIZE) {
+                        (void)put_page_testzero(virt_to_page(j));
+                }
+
+                printk(KERN_DEBUG MODULE_NAME
+                       ": Freeing %ld bytes vram area at 0x%08lx\n",
+                       va->size, va->phys);
+                free_pages(va->logical, va->order);
+
+                va->logical = 0;
+        }
+}
+
+/*
+ * Free allocated vram.
+ */
+
+static void vmlfb_free_vram(struct vml_info *vinfo)
+{
+        int i;
+
+        for (i = 0; i < vinfo->num_areas; ++i) {
+                vmlfb_free_vram_area(&vinfo->vram[i]);
+        }
+        vinfo->num_areas = 0;
+}
+
+/*
+ * Allocate vram. Currently we try to allocate contiguous areas from the
+ * __GFP_DMA zone and puzzle them together. A better approach would be to
+ * allocate one contiguous area for scanout and use one-page allocations for
+ * offscreen areas. This requires user-space and GPU virtual mappings.
+ */
+
+static int vmlfb_alloc_vram(struct vml_info *vinfo,
+                            size_t requested,
+                            size_t min_total, size_t min_contig)
+{
+        int i, j;
+        int order;
+        int contiguous;
+        int err;
+        struct vram_area *va;
+        struct vram_area *va2;
+
+        vinfo->num_areas = 0;
+        for (i = 0; i < VML_VRAM_AREAS; ++i) {
+                va = &vinfo->vram[i];
+                order = 0;
+
+                while (requested > (PAGE_SIZE << order) && order < MAX_ORDER)
+                        order++;
+
+                err = vmlfb_alloc_vram_area(va, order, 0);
+
+                if (err)
+                        break;
+
+                if (i == 0) {
+                        vinfo->vram_start = va->phys;
+                        vinfo->vram_logical = (void __iomem *) va->logical;
+                        vinfo->vram_contig_size = va->size;
+                        vinfo->num_areas = 1;
+                } else {
+                        contiguous = 0;
+
+                        for (j = 0; j < i; ++j) {
+                                va2 = &vinfo->vram[j];
+                                if (va->phys + va->size == va2->phys ||
+                                    va2->phys + va2->size == va->phys) {
+                                        contiguous = 1;
+                                        break;
+                                }
+                        }
+
+                        if (contiguous) {
+                                vinfo->num_areas++;
+                                if (va->phys < vinfo->vram_start) {
+                                        vinfo->vram_start = va->phys;
+                                        vinfo->vram_logical =
+                                                (void __iomem *)va->logical;
+                                }
+                                vinfo->vram_contig_size += va->size;
+                        } else {
+                                vmlfb_free_vram_area(va);
+                                break;
+                        }
+                }
+
+                if (requested < va->size)
+                        break;
+                else
+                        requested -= va->size;
+        }
+
+        if (vinfo->vram_contig_size > min_total &&
+            vinfo->vram_contig_size > min_contig) {
+
+                printk(KERN_DEBUG MODULE_NAME
+                       ": Contiguous vram: %ld bytes at physical 0x%08lx.\n",
+                       (unsigned long)vinfo->vram_contig_size,
+                       (unsigned long)vinfo->vram_start);
+
+                return 0;
+        }
+
+        printk(KERN_ERR MODULE_NAME
+               ": Could not allocate requested minimal amount of vram.\n");
+
+        vmlfb_free_vram(vinfo);
+
+        return -ENOMEM;
+}
+
+/*
+ * Find the GPU to use with our display controller.
+ */
+
+static int vmlfb_get_gpu(struct vml_par *par)
+{
+        mutex_lock(&vml_mutex);
+
+        par->gpu = pci_get_device(PCI_VENDOR_ID_INTEL, VML_DEVICE_GPU, NULL);
+
+        if (!par->gpu) {
+                mutex_unlock(&vml_mutex);
+                return -ENODEV;
+        }
+
+        mutex_unlock(&vml_mutex);
+
+        if (pci_enable_device(par->gpu) < 0)
+                return -ENODEV;
+
+        return 0;
+}
+
+/*
+ * Find a contiguous vram area that contains a given offset from vram start.
+ */
+static int vmlfb_vram_offset(struct vml_info *vinfo, unsigned long offset)
+{
+        unsigned long aoffset;
+        unsigned i;
+
+        for (i = 0; i < vinfo->num_areas; ++i) {
+                aoffset = offset - (vinfo->vram[i].phys - vinfo->vram_start);
+
+                if (aoffset < vinfo->vram[i].size) {
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
+/*
+ * Remap the MMIO register spaces of the VDC and the GPU.
+ */
+
+static int vmlfb_enable_mmio(struct vml_par *par)
+{
+        int err;
+
+        par->vdc_mem_base = pci_resource_start(par->vdc, 0);
+        par->vdc_mem_size = pci_resource_len(par->vdc, 0);
+        if (!request_mem_region(par->vdc_mem_base, par->vdc_mem_size, "vmlfb")) {
+                printk(KERN_ERR MODULE_NAME
+                       ": Could not claim display controller MMIO.\n");
+                return -EBUSY;
+        }
+        par->vdc_mem = ioremap_nocache(par->vdc_mem_base, par->vdc_mem_size);
+        if (par->vdc_mem == NULL) {
+                printk(KERN_ERR MODULE_NAME
+                       ": Could not map display controller MMIO.\n");
+                err = -ENOMEM;
+                goto out_err_0;
+        }
+
+        par->gpu_mem_base = pci_resource_start(par->gpu, 0);
+        par->gpu_mem_size = pci_resource_len(par->gpu, 0);
+        if (!request_mem_region(par->gpu_mem_base, par->gpu_mem_size, "vmlfb")) {
+                printk(KERN_ERR MODULE_NAME ": Could not claim GPU MMIO.\n");
+                err = -EBUSY;
+                goto out_err_1;
+        }
+        par->gpu_mem = ioremap_nocache(par->gpu_mem_base, par->gpu_mem_size);
+        if (par->gpu_mem == NULL) {
+                printk(KERN_ERR MODULE_NAME ": Could not map GPU MMIO.\n");
+                err = -ENOMEM;
+                goto out_err_2;
+        }
+
+        return 0;
+
+out_err_2:
+        release_mem_region(par->gpu_mem_base, par->gpu_mem_size);
+out_err_1:
+        iounmap(par->vdc_mem);
+out_err_0:
+        release_mem_region(par->vdc_mem_base, par->vdc_mem_size);
+        return err;
+}
+
+/*
+ * Unmap the VDC and GPU register spaces.
+ */
+
+static void vmlfb_disable_mmio(struct vml_par *par)
+{
+        iounmap(par->gpu_mem);
+        release_mem_region(par->gpu_mem_base, par->gpu_mem_size);
+        iounmap(par->vdc_mem);
+        release_mem_region(par->vdc_mem_base, par->vdc_mem_size);
+}
+
+/*
+ * Release and uninit the VDC and GPU.
+ */
+
+static void vmlfb_release_devices(struct vml_par *par)
+{
+        if (atomic_dec_and_test(&par->refcount)) {
+                pci_set_drvdata(par->vdc, NULL);
+                pci_disable_device(par->gpu);
+                pci_disable_device(par->vdc);
+        }
+}
+
+/*
+ * Free up allocated resources for a device.
+ */
+
+static void __devexit vml_pci_remove(struct pci_dev *dev)
+{
+        struct fb_info *info;
+        struct vml_info *vinfo;
+        struct vml_par *par;
+
+        info = pci_get_drvdata(dev);
+        if (info) {
+                vinfo = container_of(info, struct vml_info, info);
+                par = vinfo->par;
+                mutex_lock(&vml_mutex);
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
+                vmlfb_free_vram(vinfo);
+                vmlfb_disable_mmio(par);
+                vmlfb_release_devices(par);
+                kfree(vinfo);
+                kfree(par);
+                mutex_unlock(&vml_mutex);
+        }
+}
+
+static void vmlfb_set_pref_pixel_format(struct fb_var_screeninfo *var)
+{
+        switch (var->bits_per_pixel) {
+        case 16:
+                var->blue.offset = 0;
+                var->blue.length = 5;
+                var->green.offset = 5;
+                var->green.length = 5;
+                var->red.offset = 10;
+                var->red.length = 5;
+                var->transp.offset = 15;
+                var->transp.length = 1;
+                break;
+        case 32:
+                var->blue.offset = 0;
+                var->blue.length = 8;
+                var->green.offset = 8;
+                var->green.length = 8;
+                var->red.offset = 16;
+                var->red.length = 8;
+                var->transp.offset = 24;
+                var->transp.length = 0;
+                break;
+        default:
+                break;
+        }
+
+        var->blue.msb_right = var->green.msb_right =
+            var->red.msb_right = var->transp.msb_right = 0;
+}
+
+/*
+ * Device initialization.
+ * We initialize one vml_par struct per device and one vml_info
+ * struct per pipe. Currently we have only one pipe.
+ */
+
+static int __devinit vml_pci_probe(struct pci_dev *dev,
+                                   const struct pci_device_id *id)
+{
+        struct vml_info *vinfo;
+        struct fb_info *info;
+        struct vml_par *par;
+        int err = 0;
+
+        par = kzalloc(sizeof(*par), GFP_KERNEL);
+        if (par == NULL)
+                return -ENOMEM;
+
+        vinfo = kzalloc(sizeof(*vinfo), GFP_KERNEL);
+        if (vinfo == NULL) {
+                err = -ENOMEM;
+                goto out_err_0;
+        }
+
+        vinfo->par = par;
+        par->vdc = dev;
+        atomic_set(&par->refcount, 1);
+
+        switch (id->device) {
+        case VML_DEVICE_VDC:
+                if ((err = vmlfb_get_gpu(par)))
+                        goto out_err_1;
+                pci_set_drvdata(dev, &vinfo->info);
+                break;
+        default:
+                err = -ENODEV;
+                goto out_err_1;
+                break;
+        }
+
+        info = &vinfo->info;
+        info->flags = FBINFO_DEFAULT | FBINFO_PARTIAL_PAN_OK;
+
+        err = vmlfb_enable_mmio(par);
+        if (err)
+                goto out_err_2;
+
+        err = vmlfb_alloc_vram(vinfo, vml_mem_requested,
+                               vml_mem_contig, vml_mem_min);
+        if (err)
+                goto out_err_3;
+
+        strcpy(info->fix.id, "Vermilion Range");
+        info->fix.mmio_start = 0;
+        info->fix.mmio_len = 0;
+        info->fix.smem_start = vinfo->vram_start;
+        info->fix.smem_len = vinfo->vram_contig_size;
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_TRUECOLOR;
+        info->fix.ypanstep = 1;
+        info->fix.xpanstep = 1;
+        info->fix.ywrapstep = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->screen_base = vinfo->vram_logical;
+        info->pseudo_palette = vinfo->pseudo_palette;
+        info->par = par;
+        info->fbops = &vmlfb_ops;
+        info->device = &dev->dev;
+
+        INIT_LIST_HEAD(&vinfo->head);
+        vinfo->pipe_disabled = 1;
+        vinfo->cur_blank_mode = FB_BLANK_UNBLANK;
+
+        info->var.grayscale = 0;
+        info->var.bits_per_pixel = 16;
+        vmlfb_set_pref_pixel_format(&info->var);
+
+        if (!fb_find_mode
+            (&info->var, info, vml_default_mode, NULL, 0, &defaultmode, 16)) {
+                printk(KERN_ERR MODULE_NAME ": Could not find initial mode\n");
+        }
+
+        if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) {
+                err = -ENOMEM;
+                goto out_err_4;
+        }
+
+        err = register_framebuffer(info);
+        if (err) {
+                printk(KERN_ERR MODULE_NAME ": Register framebuffer error.\n");
+                goto out_err_5;
+        }
+
+        printk("Initialized vmlfb\n");
+
+        return 0;
+
+out_err_5:
+        fb_dealloc_cmap(&info->cmap);
+out_err_4:
+        vmlfb_free_vram(vinfo);
+out_err_3:
+        vmlfb_disable_mmio(par);
+out_err_2:
+        vmlfb_release_devices(par);
+out_err_1:
+        kfree(vinfo);
+out_err_0:
+        kfree(par);
+        return err;
+}
+
+static int vmlfb_open(struct fb_info *info, int user)
+{
+        /*
+         * Save registers here?
+         */
+        return 0;
+}
+
+static int vmlfb_release(struct fb_info *info, int user)
+{
+        /*
+         * Restore registers here.
+         */
+
+        return 0;
+}
+
+static int vml_nearest_clock(int clock)
+{
+
+        int i;
+        int cur_index;
+        int cur_diff;
+        int diff;
+
+        cur_index = 0;
+        cur_diff = clock - vml_clocks[0];
+        cur_diff = (cur_diff < 0) ? -cur_diff : cur_diff;
+        for (i = 1; i < vml_num_clocks; ++i) {
+                diff = clock - vml_clocks[i];
+                diff = (diff < 0) ? -diff : diff;
+                if (diff < cur_diff) {
+                        cur_index = i;
+                        cur_diff = diff;
+                }
+        }
+        return vml_clocks[cur_index];
+}
+
+static int vmlfb_check_var_locked(struct fb_var_screeninfo *var,
+                                  struct vml_info *vinfo)
+{
+        u32 pitch;
+        u64 mem;
+        int nearest_clock;
+        int clock;
+        int clock_diff;
+        struct fb_var_screeninfo v;
+
+        v = *var;
+        clock = PICOS2KHZ(var->pixclock);
+
+        if (subsys && subsys->nearest_clock) {
+                nearest_clock = subsys->nearest_clock(subsys, clock);
+        } else {
+                nearest_clock = vml_nearest_clock(clock);
+        }
+
+        /*
+         * Accept a 20% diff.
+         */
+
+        clock_diff = nearest_clock - clock;
+        clock_diff = (clock_diff < 0) ? -clock_diff : clock_diff;
+        if (clock_diff > clock / 5) {
+#if 0
+                printk(KERN_DEBUG MODULE_NAME ": Diff failure. %d %d\n",clock_diff,clock);
+#endif
+                return -EINVAL;
+        }
+
+        v.pixclock = KHZ2PICOS(nearest_clock);
+
+        if (var->xres > VML_MAX_XRES || var->yres > VML_MAX_YRES) {
+                printk(KERN_DEBUG MODULE_NAME ": Resolution failure.\n");
+                return -EINVAL;
+        }
+        if (var->xres_virtual > VML_MAX_XRES_VIRTUAL) {
+                printk(KERN_DEBUG MODULE_NAME
+                       ": Virtual resolution failure.\n");
+                return -EINVAL;
+        }
+        switch (v.bits_per_pixel) {
+        case 0 ... 16:
+                v.bits_per_pixel = 16;
+                break;
+        case 17 ... 32:
+                v.bits_per_pixel = 32;
+                break;
+        default:
+                printk(KERN_DEBUG MODULE_NAME ": Invalid bpp: %d.\n",
+                       var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        pitch = __ALIGN_MASK((var->xres * var->bits_per_pixel) >> 3, 0x3F);
+        mem = pitch * var->yres_virtual;
+        if (mem > vinfo->vram_contig_size) {
+                return -ENOMEM;
+        }
+
+        switch (v.bits_per_pixel) {
+        case 16:
+                if (var->blue.offset != 0 ||
+                    var->blue.length != 5 ||
+                    var->green.offset != 5 ||
+                    var->green.length != 5 ||
+                    var->red.offset != 10 ||
+                    var->red.length != 5 ||
+                    var->transp.offset != 15 || var->transp.length != 1) {
+                        vmlfb_set_pref_pixel_format(&v);
+                }
+                break;
+        case 32:
+                if (var->blue.offset != 0 ||
+                    var->blue.length != 8 ||
+                    var->green.offset != 8 ||
+                    var->green.length != 8 ||
+                    var->red.offset != 16 ||
+                    var->red.length != 8 ||
+                    (var->transp.length != 0 && var->transp.length != 8) ||
+                    (var->transp.length == 8 && var->transp.offset != 24)) {
+                        vmlfb_set_pref_pixel_format(&v);
+                }
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        *var = v;
+
+        return 0;
+}
+
+static int vmlfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct vml_info *vinfo = container_of(info, struct vml_info, info);
+        int ret;
+
+        mutex_lock(&vml_mutex);
+        ret = vmlfb_check_var_locked(var, vinfo);
+        mutex_unlock(&vml_mutex);
+
+        return ret;
+}
+
+static void vml_wait_vblank(struct vml_info *vinfo)
+{
+        /* Wait for vblank. For now, just wait for a 50Hz cycle (20ms)) */
+        mdelay(20);
+}
+
+static void vmlfb_disable_pipe(struct vml_info *vinfo)
+{
+        struct vml_par *par = vinfo->par;
+
+        /* Disable the MDVO pad */
+        VML_WRITE32(par, VML_RCOMPSTAT, 0);
+        while (!(VML_READ32(par, VML_RCOMPSTAT) & VML_MDVO_VDC_I_RCOMP)) ;
+
+        /* Disable display planes */
+        VML_WRITE32(par, VML_DSPCCNTR,
+                    VML_READ32(par, VML_DSPCCNTR) & ~VML_GFX_ENABLE);
+        (void)VML_READ32(par, VML_DSPCCNTR);
+        /* Wait for vblank for the disable to take effect */
+        vml_wait_vblank(vinfo);
+
+        /* Next, disable display pipes */
+        VML_WRITE32(par, VML_PIPEACONF, 0);
+        (void)VML_READ32(par, VML_PIPEACONF);
+
+        vinfo->pipe_disabled = 1;
+}
+
+#ifdef VERMILION_DEBUG
+static void vml_dump_regs(struct vml_info *vinfo)
+{
+        struct vml_par *par = vinfo->par;
+
+        printk(KERN_DEBUG MODULE_NAME ": Modesetting register dump:\n");
+        printk(KERN_DEBUG MODULE_NAME ": \tHTOTAL_A         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_HTOTAL_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tHBLANK_A         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_HBLANK_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tHSYNC_A          : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_HSYNC_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tVTOTAL_A         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_VTOTAL_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tVBLANK_A         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_VBLANK_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tVSYNC_A          : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_VSYNC_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tDSPCSTRIDE       : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_DSPCSTRIDE));
+        printk(KERN_DEBUG MODULE_NAME ": \tDSPCSIZE         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_DSPCSIZE));
+        printk(KERN_DEBUG MODULE_NAME ": \tDSPCPOS          : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_DSPCPOS));
+        printk(KERN_DEBUG MODULE_NAME ": \tDSPARB           : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_DSPARB));
+        printk(KERN_DEBUG MODULE_NAME ": \tDSPCADDR         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_DSPCADDR));
+        printk(KERN_DEBUG MODULE_NAME ": \tBCLRPAT_A        : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_BCLRPAT_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tCANVSCLR_A       : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_CANVSCLR_A));
+        printk(KERN_DEBUG MODULE_NAME ": \tPIPEASRC         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_PIPEASRC));
+        printk(KERN_DEBUG MODULE_NAME ": \tPIPEACONF        : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_PIPEACONF));
+        printk(KERN_DEBUG MODULE_NAME ": \tDSPCCNTR         : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_DSPCCNTR));
+        printk(KERN_DEBUG MODULE_NAME ": \tRCOMPSTAT        : 0x%08x\n",
+               (unsigned)VML_READ32(par, VML_RCOMPSTAT));
+        printk(KERN_DEBUG MODULE_NAME ": End of modesetting register dump.\n");
+}
+#endif
+
+static int vmlfb_set_par_locked(struct vml_info *vinfo)
+{
+        struct vml_par *par = vinfo->par;
+        struct fb_info *info = &vinfo->info;
+        struct fb_var_screeninfo *var = &info->var;
+        u32 htotal, hactive, hblank_start, hblank_end, hsync_start, hsync_end;
+        u32 vtotal, vactive, vblank_start, vblank_end, vsync_start, vsync_end;
+        u32 dspcntr;
+        int clock;
+
+        vinfo->bytes_per_pixel = var->bits_per_pixel >> 3;
+        vinfo->stride =
+            __ALIGN_MASK(var->xres_virtual * vinfo->bytes_per_pixel, 0x3F);
+        info->fix.line_length = vinfo->stride;
+
+        if (!subsys)
+                return 0;
+
+        htotal =
+            var->xres + var->right_margin + var->hsync_len + var->left_margin;
+        hactive = var->xres;
+        hblank_start = var->xres;
+        hblank_end = htotal;
+        hsync_start = hactive + var->right_margin;
+        hsync_end = hsync_start + var->hsync_len;
+
+        vtotal =
+            var->yres + var->lower_margin + var->vsync_len + var->upper_margin;
+        vactive = var->yres;
+        vblank_start = var->yres;
+        vblank_end = vtotal;
+        vsync_start = vactive + var->lower_margin;
+        vsync_end = vsync_start + var->vsync_len;
+
+        dspcntr = VML_GFX_ENABLE | VML_GFX_GAMMABYPASS;
+        clock = PICOS2KHZ(var->pixclock);
+
+        if (subsys->nearest_clock) {
+                clock = subsys->nearest_clock(subsys, clock);
+        } else {
+                clock = vml_nearest_clock(clock);
+        }
+        printk(KERN_DEBUG MODULE_NAME
+               ": Set mode Hfreq : %d kHz, Vfreq : %d Hz.\n", clock / htotal,
+               ((clock / htotal) * 1000) / vtotal);
+
+        switch (var->bits_per_pixel) {
+        case 16:
+                dspcntr |= VML_GFX_ARGB1555;
+                break;
+        case 32:
+                if (var->transp.length == 8)
+                        dspcntr |= VML_GFX_ARGB8888 | VML_GFX_ALPHAMULT;
+                else
+                        dspcntr |= VML_GFX_RGB0888;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        vmlfb_disable_pipe(vinfo);
+        mb();
+
+        if (subsys->set_clock)
+                subsys->set_clock(subsys, clock);
+        else
+                return -EINVAL;
+
+        VML_WRITE32(par, VML_HTOTAL_A, ((htotal - 1) << 16) | (hactive - 1));
+        VML_WRITE32(par, VML_HBLANK_A,
+                    ((hblank_end - 1) << 16) | (hblank_start - 1));
+        VML_WRITE32(par, VML_HSYNC_A,
+                    ((hsync_end - 1) << 16) | (hsync_start - 1));
+        VML_WRITE32(par, VML_VTOTAL_A, ((vtotal - 1) << 16) | (vactive - 1));
+        VML_WRITE32(par, VML_VBLANK_A,
+                    ((vblank_end - 1) << 16) | (vblank_start - 1));
+        VML_WRITE32(par, VML_VSYNC_A,
+                    ((vsync_end - 1) << 16) | (vsync_start - 1));
+        VML_WRITE32(par, VML_DSPCSTRIDE, vinfo->stride);
+        VML_WRITE32(par, VML_DSPCSIZE,
+                    ((var->yres - 1) << 16) | (var->xres - 1));
+        VML_WRITE32(par, VML_DSPCPOS, 0x00000000);
+        VML_WRITE32(par, VML_DSPARB, VML_FIFO_DEFAULT);
+        VML_WRITE32(par, VML_BCLRPAT_A, 0x00000000);
+        VML_WRITE32(par, VML_CANVSCLR_A, 0x00000000);
+        VML_WRITE32(par, VML_PIPEASRC,
+                    ((var->xres - 1) << 16) | (var->yres - 1));
+
+        wmb();
+        VML_WRITE32(par, VML_PIPEACONF, VML_PIPE_ENABLE);
+        wmb();
+        VML_WRITE32(par, VML_DSPCCNTR, dspcntr);
+        wmb();
+        VML_WRITE32(par, VML_DSPCADDR, (u32) vinfo->vram_start +
+                    var->yoffset * vinfo->stride +
+                    var->xoffset * vinfo->bytes_per_pixel);
+
+        VML_WRITE32(par, VML_RCOMPSTAT, VML_MDVO_PAD_ENABLE);
+
+        while (!(VML_READ32(par, VML_RCOMPSTAT) &
+                 (VML_MDVO_VDC_I_RCOMP | VML_MDVO_PAD_ENABLE))) ;
+
+        vinfo->pipe_disabled = 0;
+#ifdef VERMILION_DEBUG
+        vml_dump_regs(vinfo);
+#endif
+
+        return 0;
+}
+
+static int vmlfb_set_par(struct fb_info *info)
+{
+        struct vml_info *vinfo = container_of(info, struct vml_info, info);
+        int ret;
+
+        mutex_lock(&vml_mutex);
+        list_del(&vinfo->head);
+        list_add(&vinfo->head, (subsys) ? &global_has_mode : &global_no_mode);
+        ret = vmlfb_set_par_locked(vinfo);
+
+        mutex_unlock(&vml_mutex);
+        return ret;
+}
+
+static int vmlfb_blank_locked(struct vml_info *vinfo)
+{
+        struct vml_par *par = vinfo->par;
+        u32 cur = VML_READ32(par, VML_PIPEACONF);
+
+        switch (vinfo->cur_blank_mode) {
+        case FB_BLANK_UNBLANK:
+                if (vinfo->pipe_disabled) {
+                        vmlfb_set_par_locked(vinfo);
+                }
+                VML_WRITE32(par, VML_PIPEACONF, cur & ~VML_PIPE_FORCE_BORDER);
+                (void)VML_READ32(par, VML_PIPEACONF);
+                break;
+        case FB_BLANK_NORMAL:
+                if (vinfo->pipe_disabled) {
+                        vmlfb_set_par_locked(vinfo);
+                }
+                VML_WRITE32(par, VML_PIPEACONF, cur | VML_PIPE_FORCE_BORDER);
+                (void)VML_READ32(par, VML_PIPEACONF);
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+                if (!vinfo->pipe_disabled) {
+                        vmlfb_disable_pipe(vinfo);
+                }
+                break;
+        case FB_BLANK_POWERDOWN:
+                if (!vinfo->pipe_disabled) {
+                        vmlfb_disable_pipe(vinfo);
+                }
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vmlfb_blank(int blank_mode, struct fb_info *info)
+{
+        struct vml_info *vinfo = container_of(info, struct vml_info, info);
+        int ret;
+
+        mutex_lock(&vml_mutex);
+        vinfo->cur_blank_mode = blank_mode;
+        ret = vmlfb_blank_locked(vinfo);
+        mutex_unlock(&vml_mutex);
+        return ret;
+}
+
+static int vmlfb_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+        struct vml_info *vinfo = container_of(info, struct vml_info, info);
+        struct vml_par *par = vinfo->par;
+
+        mutex_lock(&vml_mutex);
+        VML_WRITE32(par, VML_DSPCADDR, (u32) vinfo->vram_start +
+                    var->yoffset * vinfo->stride +
+                    var->xoffset * vinfo->bytes_per_pixel);
+        (void)VML_READ32(par, VML_DSPCADDR);
+        mutex_unlock(&vml_mutex);
+
+        return 0;
+}
+
+static int vmlfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                           u_int transp, struct fb_info *info)
+{
+        u32 v;
+
+        if (regno >= 16)
+                return -EINVAL;
+
+        if (info->var.grayscale) {
+                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
+        }
+
+        if (info->fix.visual != FB_VISUAL_TRUECOLOR)
+                return -EINVAL;
+
+        red = VML_TOHW(red, info->var.red.length);
+        blue = VML_TOHW(blue, info->var.blue.length);
+        green = VML_TOHW(green, info->var.green.length);
+        transp = VML_TOHW(transp, info->var.transp.length);
+
+        v = (red << info->var.red.offset) |
+            (green << info->var.green.offset) |
+            (blue << info->var.blue.offset) |
+            (transp << info->var.transp.offset);
+
+        switch (info->var.bits_per_pixel) {
+        case 16:
+                ((u32 *) info->pseudo_palette)[regno] = v;
+                break;
+        case 24:
+        case 32:
+                ((u32 *) info->pseudo_palette)[regno] = v;
+                break;
+        }
+        return 0;
+}
+
+static int vmlfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+        struct vml_info *vinfo = container_of(info, struct vml_info, info);
+        unsigned long size = vma->vm_end - vma->vm_start;
+        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+        int ret;
+
+        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
+                return -EINVAL;
+        if (offset + size > vinfo->vram_contig_size)
+                return -EINVAL;
+        ret = vmlfb_vram_offset(vinfo, offset);
+        if (ret)
+                return -EINVAL;
+        offset += vinfo->vram_start;
+        pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+        pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
+        vma->vm_flags |= VM_RESERVED | VM_IO;
+        if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT,
+                                                size, vma->vm_page_prot))
+                return -EAGAIN;
+        return 0;
+}
+
+static int vmlfb_sync(struct fb_info *info)
+{
+        return 0;
+}
+
+static int vmlfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        return -EINVAL; /* just to force soft_cursor() call */
+}
+
+static struct fb_ops vmlfb_ops = {
+        .owner = THIS_MODULE,
+        .fb_open = vmlfb_open,
+        .fb_release = vmlfb_release,
+        .fb_check_var = vmlfb_check_var,
+        .fb_set_par = vmlfb_set_par,
+        .fb_blank = vmlfb_blank,
+        .fb_pan_display = vmlfb_pan_display,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+        .fb_cursor = vmlfb_cursor,
+        .fb_sync = vmlfb_sync,
+        .fb_mmap = vmlfb_mmap,
+        .fb_setcolreg = vmlfb_setcolreg
+};
+
+static struct pci_device_id vml_ids[] = {
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, VML_DEVICE_VDC)},
+        {0}
+};
+
+static struct pci_driver vmlfb_pci_driver = {
+        .name = "vmlfb",
+        .id_table = vml_ids,
+        .probe = vml_pci_probe,
+        .remove = __devexit_p(vml_pci_remove)
+};
+
+static void __exit vmlfb_cleanup(void)
+{
+        pci_unregister_driver(&vmlfb_pci_driver);
+}
+
+static int __init vmlfb_init(void)
+{
+
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options(MODULE_NAME, &option))
+                return -ENODEV;
+#endif
+
+        printk(KERN_DEBUG MODULE_NAME ": initializing\n");
+        mutex_init(&vml_mutex);
+        INIT_LIST_HEAD(&global_no_mode);
+        INIT_LIST_HEAD(&global_has_mode);
+
+        return pci_register_driver(&vmlfb_pci_driver);
+}
+
+int vmlfb_register_subsys(struct vml_sys *sys)
+{
+        struct vml_info *entry;
+        struct list_head *list;
+        u32 save_activate;
+
+        mutex_lock(&vml_mutex);
+        if (subsys != NULL) {
+                subsys->restore(subsys);
+        }
+        subsys = sys;
+        subsys->save(subsys);
+
+        /*
+         * We need to restart list traversal for each item, since we
+         * release the list mutex in the loop.
+         */
+
+        list = global_no_mode.next;
+        while (list != &global_no_mode) {
+                list_del_init(list);
+                entry = list_entry(list, struct vml_info, head);
+
+                /*
+                 * First, try the current mode which might not be
+                 * completely validated with respect to the pixel clock.
+                 */
+
+                if (!vmlfb_check_var_locked(&entry->info.var, entry)) {
+                        vmlfb_set_par_locked(entry);
+                        list_add_tail(list, &global_has_mode);
+                } else {
+
+                        /*
+                         * Didn't work. Try to find another mode,
+                         * that matches this subsys.
+                         */
+
+                        mutex_unlock(&vml_mutex);
+                        save_activate = entry->info.var.activate;
+                        entry->info.var.bits_per_pixel = 16;
+                        vmlfb_set_pref_pixel_format(&entry->info.var);
+                        if (fb_find_mode(&entry->info.var,
+                                         &entry->info,
+                                         vml_default_mode, NULL, 0, NULL, 16)) {
+                                entry->info.var.activate |=
+                                    FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW;
+                                fb_set_var(&entry->info, &entry->info.var);
+                        } else {
+                                printk(KERN_ERR MODULE_NAME
+                                       ": Sorry. no mode found for this subsys.\n");
+                        }
+                        entry->info.var.activate = save_activate;
+                        mutex_lock(&vml_mutex);
+                }
+                vmlfb_blank_locked(entry);
+                list = global_no_mode.next;
+        }
+        mutex_unlock(&vml_mutex);
+
+        printk(KERN_DEBUG MODULE_NAME ": Registered %s subsystem.\n",
+                                subsys->name ? subsys->name : "unknown");
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(vmlfb_register_subsys);
+
+void vmlfb_unregister_subsys(struct vml_sys *sys)
+{
+        struct vml_info *entry, *next;
+
+        mutex_lock(&vml_mutex);
+        if (subsys != sys) {
+                mutex_unlock(&vml_mutex);
+                return;
+        }
+        subsys->restore(subsys);
+        subsys = NULL;
+        list_for_each_entry_safe(entry, next, &global_has_mode, head) {
+                printk(KERN_DEBUG MODULE_NAME ": subsys disable pipe\n");
+                vmlfb_disable_pipe(entry);
+                list_del(&entry->head);
+                list_add_tail(&entry->head, &global_no_mode);
+        }
+        mutex_unlock(&vml_mutex);
+}
+
+EXPORT_SYMBOL_GPL(vmlfb_unregister_subsys);
+
+module_init(vmlfb_init);
+module_exit(vmlfb_cleanup);
+
+MODULE_AUTHOR("Tungsten Graphics");
+MODULE_DESCRIPTION("Initialization of the Vermilion display devices");
+MODULE_VERSION("1.0.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
new file mode 100644
index 000000000000..1fc6695a49d2
--- /dev/null
+++ b/drivers/video/vermilion/vermilion.h
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *
+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
+ * develop this driver.
+ *
+ * This file is part of the Vermilion Range fb driver.
+ * The Vermilion Range fb driver 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.
+ *
+ * The Vermilion Range fb driver 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 driver; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ */
+
+#ifndef _VERMILION_H_
+#define _VERMILION_H_
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/pci.h>
+#include <asm/atomic.h>
+#include <linux/mutex.h>
+
+#define VML_DEVICE_GPU 0x5002
+#define VML_DEVICE_VDC 0x5009
+
+#define VML_VRAM_AREAS 3
+#define VML_MAX_XRES 1024
+#define VML_MAX_YRES 768
+#define VML_MAX_XRES_VIRTUAL 1040
+
+/*
+ * Display controller registers:
+ */
+
+/* Display controller 10-bit color representation */
+
+#define VML_R_MASK                   0x3FF00000
+#define VML_R_SHIFT                  20
+#define VML_G_MASK                   0x000FFC00
+#define VML_G_SHIFT                  10
+#define VML_B_MASK                   0x000003FF
+#define VML_B_SHIFT                  0
+
+/* Graphics plane control */
+#define VML_DSPCCNTR                 0x00072180
+#define VML_GFX_ENABLE               0x80000000
+#define VML_GFX_GAMMABYPASS          0x40000000
+#define VML_GFX_ARGB1555             0x0C000000
+#define VML_GFX_RGB0888              0x18000000
+#define VML_GFX_ARGB8888             0x1C000000
+#define VML_GFX_ALPHACONST           0x02000000
+#define VML_GFX_ALPHAMULT            0x01000000
+#define VML_GFX_CONST_ALPHA          0x000000FF
+
+/* Graphics plane start address. Pixel aligned. */
+#define VML_DSPCADDR                 0x00072184
+
+/* Graphics plane stride register. */
+#define VML_DSPCSTRIDE               0x00072188
+
+/* Graphics plane position register. */
+#define VML_DSPCPOS                  0x0007218C
+#define VML_POS_YMASK                0x0FFF0000
+#define VML_POS_YSHIFT               16
+#define VML_POS_XMASK                0x00000FFF
+#define VML_POS_XSHIFT               0
+
+/* Graphics plane height and width */
+#define VML_DSPCSIZE                 0x00072190
+#define VML_SIZE_HMASK               0x0FFF0000
+#define VML_SIZE_HSHIFT              16
+#define VML_SISE_WMASK               0x00000FFF
+#define VML_SIZE_WSHIFT              0
+
+/* Graphics plane gamma correction lookup table registers (129 * 32 bits) */
+#define VML_DSPCGAMLUT               0x00072200
+
+/* Pixel video output configuration register */
+#define VML_PVOCONFIG                0x00061140
+#define VML_CONFIG_BASE              0x80000000
+#define VML_CONFIG_PIXEL_SWAP        0x04000000
+#define VML_CONFIG_DE_INV            0x01000000
+#define VML_CONFIG_HREF_INV          0x00400000
+#define VML_CONFIG_VREF_INV          0x00100000
+#define VML_CONFIG_CLK_INV           0x00040000
+#define VML_CONFIG_CLK_DIV2          0x00010000
+#define VML_CONFIG_ESTRB_INV         0x00008000
+
+/* Pipe A Horizontal total register */
+#define VML_HTOTAL_A                 0x00060000
+#define VML_HTOTAL_MASK              0x1FFF0000
+#define VML_HTOTAL_SHIFT             16
+#define VML_HTOTAL_VAL               8192
+#define VML_HACTIVE_MASK             0x000007FF
+#define VML_HACTIVE_SHIFT            0
+#define VML_HACTIVE_VAL              4096
+
+/* Pipe A Horizontal Blank register */
+#define VML_HBLANK_A                 0x00060004
+#define VML_HBLANK_END_MASK          0x1FFF0000
+#define VML_HBLANK_END_SHIFT         16
+#define VML_HBLANK_END_VAL           8192
+#define VML_HBLANK_START_MASK        0x00001FFF
+#define VML_HBLANK_START_SHIFT       0
+#define VML_HBLANK_START_VAL         8192
+
+/* Pipe A Horizontal Sync register */
+#define VML_HSYNC_A                  0x00060008
+#define VML_HSYNC_END_MASK           0x1FFF0000
+#define VML_HSYNC_END_SHIFT          16
+#define VML_HSYNC_END_VAL            8192
+#define VML_HSYNC_START_MASK         0x00001FFF
+#define VML_HSYNC_START_SHIFT        0
+#define VML_HSYNC_START_VAL          8192
+
+/* Pipe A Vertical total register */
+#define VML_VTOTAL_A                 0x0006000C
+#define VML_VTOTAL_MASK              0x1FFF0000
+#define VML_VTOTAL_SHIFT             16
+#define VML_VTOTAL_VAL               8192
+#define VML_VACTIVE_MASK             0x000007FF
+#define VML_VACTIVE_SHIFT            0
+#define VML_VACTIVE_VAL              4096
+
+/* Pipe A Vertical Blank register */
+#define VML_VBLANK_A                 0x00060010
+#define VML_VBLANK_END_MASK          0x1FFF0000
+#define VML_VBLANK_END_SHIFT         16
+#define VML_VBLANK_END_VAL           8192
+#define VML_VBLANK_START_MASK        0x00001FFF
+#define VML_VBLANK_START_SHIFT       0
+#define VML_VBLANK_START_VAL         8192
+
+/* Pipe A Vertical Sync register */
+#define VML_VSYNC_A                  0x00060014
+#define VML_VSYNC_END_MASK           0x1FFF0000
+#define VML_VSYNC_END_SHIFT          16
+#define VML_VSYNC_END_VAL            8192
+#define VML_VSYNC_START_MASK         0x00001FFF
+#define VML_VSYNC_START_SHIFT        0
+#define VML_VSYNC_START_VAL          8192
+
+/* Pipe A Source Image size (minus one - equal to active size)
+ * Programmable while pipe is enabled.
+ */
+#define VML_PIPEASRC                 0x0006001C
+#define VML_PIPEASRC_HMASK           0x0FFF0000
+#define VML_PIPEASRC_HSHIFT          16
+#define VML_PIPEASRC_VMASK           0x00000FFF
+#define VML_PIPEASRC_VSHIFT          0
+
+/* Pipe A Border Color Pattern register (10 bit color) */
+#define VML_BCLRPAT_A                0x00060020
+
+/* Pipe A Canvas Color register  (10 bit color) */
+#define VML_CANVSCLR_A               0x00060024
+
+/* Pipe A Configuration register */
+#define VML_PIPEACONF                0x00070008
+#define VML_PIPE_BASE                0x00000000
+#define VML_PIPE_ENABLE              0x80000000
+#define VML_PIPE_FORCE_BORDER        0x02000000
+#define VML_PIPE_PLANES_OFF          0x00080000
+#define VML_PIPE_ARGB_OUTPUT_MODE    0x00040000
+
+/* Pipe A FIFO setting */
+#define VML_DSPARB                   0x00070030
+#define VML_FIFO_DEFAULT             0x00001D9C
+
+/* MDVO rcomp status & pads control register */
+#define VML_RCOMPSTAT                0x00070048
+#define VML_MDVO_VDC_I_RCOMP         0x80000000
+#define VML_MDVO_POWERSAVE_OFF       0x00000008
+#define VML_MDVO_PAD_ENABLE          0x00000004
+#define VML_MDVO_PULLDOWN_ENABLE     0x00000001
+
+struct vml_par {
+        struct pci_dev *vdc;
+        u64 vdc_mem_base;
+        u64 vdc_mem_size;
+        char __iomem *vdc_mem;
+
+        struct pci_dev *gpu;
+        u64 gpu_mem_base;
+        u64 gpu_mem_size;
+        char __iomem *gpu_mem;
+
+        atomic_t refcount;
+};
+
+struct vram_area {
+        unsigned long logical;
+        unsigned long phys;
+        unsigned long size;
+        unsigned order;
+};
+
+struct vml_info {
+        struct fb_info info;
+        struct vml_par *par;
+        struct list_head head;
+        struct vram_area vram[VML_VRAM_AREAS];
+        u64 vram_start;
+        u64 vram_contig_size;
+        u32 num_areas;
+        void __iomem *vram_logical;
+        u32 pseudo_palette[16];
+        u32 stride;
+        u32 bytes_per_pixel;
+        atomic_t vmas;
+        int cur_blank_mode;
+        int pipe_disabled;
+};
+
+/*
+ * Subsystem
+ */
+
+struct vml_sys {
+        char *name;
+
+        /*
+         * Save / Restore;
+         */
+
+        int (*save) (struct vml_sys * sys);
+        int (*restore) (struct vml_sys * sys);
+
+        /*
+         * PLL programming;
+         */
+
+        int (*set_clock) (struct vml_sys * sys, int clock);
+        int (*nearest_clock) (const struct vml_sys * sys, int clock);
+};
+
+extern int vmlfb_register_subsys(struct vml_sys *sys);
+extern void vmlfb_unregister_subsys(struct vml_sys *sys);
+
+#define VML_READ32(_par, _offset) \
+        (ioread32((_par)->vdc_mem + (_offset)))
+#define VML_WRITE32(_par, _offset, _value)                              \
+        iowrite32(_value, (_par)->vdc_mem + (_offset))
+
+#endif
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index a9b99b01bd8e..64ee78c3c12b 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -84,13 +84,15 @@ static int vfb_mmap(struct fb_info *info,
                     struct vm_area_struct *vma);
 
 static struct fb_ops vfb_ops = {
+        .fb_read        = fb_sys_read,
+        .fb_write       = fb_sys_write,
         .fb_check_var   = vfb_check_var,
         .fb_set_par     = vfb_set_par,
         .fb_setcolreg   = vfb_setcolreg,
         .fb_pan_display = vfb_pan_display,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
+        .fb_fillrect    = sys_fillrect,
+        .fb_copyarea    = sys_copyarea,
+        .fb_imageblit   = sys_imageblit,
         .fb_mmap        = vfb_mmap,
 };
 
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index ec4c7dc54a66..2a14d28c4163 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1378,6 +1378,8 @@ static int __init vga16fb_probe(struct platform_device *dev)
         info->fbops = &vga16fb_ops;
         info->var = vga16fb_defined;
         info->fix = vga16fb_fix;
+        /* supports rectangles with widths of multiples of 8 */
+        info->pixmap.blit_x = 1 << 7 | 1 << 15 | 1 << 23 | 1 << 31;
         info->flags = FBINFO_FLAG_DEFAULT |
                 FBINFO_HWACCEL_YPAN;
 
diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c
index d94efafc77b5..b91c466225b9 100644
--- a/drivers/video/vgastate.c
+++ b/drivers/video/vgastate.c
@@ -50,23 +50,28 @@ static void save_vga_text(struct vgastate *state, void __iomem *fbbase)
         struct regstate *saved = (struct regstate *) state->vidstate;
         int i;
         u8 misc, attr10, gr4, gr5, gr6, seq1, seq2, seq4;
+        unsigned short iobase;
 
         /* if in graphics mode, no need to save */
+        misc = vga_r(state->vgabase, VGA_MIS_R);
+        iobase = (misc & 1) ? 0x3d0 : 0x3b0;
+
+        vga_r(state->vgabase, iobase + 0xa);
+        vga_w(state->vgabase, VGA_ATT_W, 0x00);
         attr10 = vga_rattr(state->vgabase, 0x10);
+        vga_r(state->vgabase, iobase + 0xa);
+        vga_w(state->vgabase, VGA_ATT_W, 0x20);
+
         if (attr10 & 1)
                 return;
-        
+
         /* save regs */
-        misc = vga_r(state->vgabase, VGA_MIS_R);
         gr4 = vga_rgfx(state->vgabase, VGA_GFX_PLANE_READ);
         gr5 = vga_rgfx(state->vgabase, VGA_GFX_MODE);
         gr6 = vga_rgfx(state->vgabase, VGA_GFX_MISC);
         seq2 = vga_rseq(state->vgabase, VGA_SEQ_PLANE_WRITE);
         seq4 = vga_rseq(state->vgabase, VGA_SEQ_MEMORY_MODE);
         
-        /* force graphics mode */
-        vga_w(state->vgabase, VGA_MIS_W, misc | 1);
-
         /* blank screen */
         seq1 = vga_rseq(state->vgabase, VGA_SEQ_CLOCK_MODE);
         vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x1);
@@ -115,15 +120,12 @@ static void save_vga_text(struct vgastate *state, void __iomem *fbbase)
         }
 
         /* restore regs */
-        vga_wattr(state->vgabase, 0x10, attr10);
-
         vga_wseq(state->vgabase, VGA_SEQ_PLANE_WRITE, seq2);
         vga_wseq(state->vgabase, VGA_SEQ_MEMORY_MODE, seq4);
 
         vga_wgfx(state->vgabase, VGA_GFX_PLANE_READ, gr4);
         vga_wgfx(state->vgabase, VGA_GFX_MODE, gr5);
         vga_wgfx(state->vgabase, VGA_GFX_MISC, gr6);
-        vga_w(state->vgabase, VGA_MIS_W, misc);
 
         /* unblank screen */
         vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x1);
@@ -137,11 +139,10 @@ static void restore_vga_text(struct vgastate *state, void __iomem *fbbase)
 {
         struct regstate *saved = (struct regstate *) state->vidstate;
         int i;
-        u8 misc, gr1, gr3, gr4, gr5, gr6, gr8; 
+        u8 gr1, gr3, gr4, gr5, gr6, gr8;
         u8 seq1, seq2, seq4;
 
         /* save regs */
-        misc = vga_r(state->vgabase, VGA_MIS_R);
         gr1 = vga_rgfx(state->vgabase, VGA_GFX_SR_ENABLE);
         gr3 = vga_rgfx(state->vgabase, VGA_GFX_DATA_ROTATE);
         gr4 = vga_rgfx(state->vgabase, VGA_GFX_PLANE_READ);
@@ -151,9 +152,6 @@ static void restore_vga_text(struct vgastate *state, void __iomem *fbbase)
         seq2 = vga_rseq(state->vgabase, VGA_SEQ_PLANE_WRITE);
         seq4 = vga_rseq(state->vgabase, VGA_SEQ_MEMORY_MODE);
         
-        /* force graphics mode */
-        vga_w(state->vgabase, VGA_MIS_W, misc | 1);
-
         /* blank screen */
         seq1 = vga_rseq(state->vgabase, VGA_SEQ_CLOCK_MODE);
         vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x1);
@@ -213,8 +211,6 @@ static void restore_vga_text(struct vgastate *state, void __iomem *fbbase)
         vga_wseq(state->vgabase, VGA_SEQ_RESET, 0x3);
 
         /* restore regs */
-        vga_w(state->vgabase, VGA_MIS_W, misc);
-
         vga_wgfx(state->vgabase, VGA_GFX_SR_ENABLE, gr1);
         vga_wgfx(state->vgabase, VGA_GFX_DATA_ROTATE, gr3);
         vga_wgfx(state->vgabase, VGA_GFX_PLANE_READ, gr4);
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
new file mode 100644
index 000000000000..5e9755e464a1
--- /dev/null
+++ b/drivers/video/vt8623fb.c
@@ -0,0 +1,927 @@
+/*
+ * linux/drivers/video/vt8623fb.c - fbdev driver for
+ * integrated graphic core in VIA VT8623 [CLE266] chipset
+ *
+ * Copyright (c) 2006-2007 Ondrej Zajicek <santiago@crfreenet.org>
+ *
+ * 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.
+ *
+ * Code is based on s3fb, some parts are from David Boucher's viafb
+ * (http://davesdomain.org.uk/viafb/)
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/svga.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/console.h> /* Why should fb driver call console functions? because acquire_console_sem() */
+#include <video/vga.h>
+
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
+
+struct vt8623fb_info {
+        char __iomem *mmio_base;
+        int mtrr_reg;
+        struct vgastate state;
+        struct mutex open_lock;
+        unsigned int ref_count;
+        u32 pseudo_palette[16];
+};
+
+
+
+/* ------------------------------------------------------------------------- */
+
+static const struct svga_fb_format vt8623fb_formats[] = {
+        { 0,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 0,
+                FB_TYPE_TEXT, FB_AUX_TEXT_SVGA_STEP8,   FB_VISUAL_PSEUDOCOLOR, 16, 16},
+        { 4,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_PSEUDOCOLOR, 16, 16},
+        { 4,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 1,
+                FB_TYPE_INTERLEAVED_PLANES, 1,          FB_VISUAL_PSEUDOCOLOR, 16, 16},
+        { 8,  {0, 6, 0},  {0, 6, 0},  {0, 6, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_PSEUDOCOLOR, 8, 8},
+/*      {16,  {10, 5, 0}, {5, 5, 0},  {0, 5, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 4, 4},     */
+        {16,  {11, 5, 0}, {5, 6, 0},  {0, 5, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 4, 4},
+        {32,  {16, 8, 0}, {8, 8, 0},  {0, 8, 0}, {0, 0, 0}, 0,
+                FB_TYPE_PACKED_PIXELS, 0,               FB_VISUAL_TRUECOLOR, 2, 2},
+        SVGA_FORMAT_END
+};
+
+static const struct svga_pll vt8623_pll = {2, 127, 2, 7, 0, 3,
+        60000, 300000, 14318};
+
+/* CRT timing register sets */
+
+struct vga_regset vt8623_h_total_regs[]       = {{0x00, 0, 7}, {0x36, 3, 3}, VGA_REGSET_END};
+struct vga_regset vt8623_h_display_regs[]     = {{0x01, 0, 7}, VGA_REGSET_END};
+struct vga_regset vt8623_h_blank_start_regs[] = {{0x02, 0, 7}, VGA_REGSET_END};
+struct vga_regset vt8623_h_blank_end_regs[]   = {{0x03, 0, 4}, {0x05, 7, 7}, {0x33, 5, 5}, VGA_REGSET_END};
+struct vga_regset vt8623_h_sync_start_regs[]  = {{0x04, 0, 7}, {0x33, 4, 4}, VGA_REGSET_END};
+struct vga_regset vt8623_h_sync_end_regs[]    = {{0x05, 0, 4}, VGA_REGSET_END};
+
+struct vga_regset vt8623_v_total_regs[]       = {{0x06, 0, 7}, {0x07, 0, 0}, {0x07, 5, 5}, {0x35, 0, 0}, VGA_REGSET_END};
+struct vga_regset vt8623_v_display_regs[]     = {{0x12, 0, 7}, {0x07, 1, 1}, {0x07, 6, 6}, {0x35, 2, 2}, VGA_REGSET_END};
+struct vga_regset vt8623_v_blank_start_regs[] = {{0x15, 0, 7}, {0x07, 3, 3}, {0x09, 5, 5}, {0x35, 3, 3}, VGA_REGSET_END};
+struct vga_regset vt8623_v_blank_end_regs[]   = {{0x16, 0, 7}, VGA_REGSET_END};
+struct vga_regset vt8623_v_sync_start_regs[]  = {{0x10, 0, 7}, {0x07, 2, 2}, {0x07, 7, 7}, {0x35, 1, 1}, VGA_REGSET_END};
+struct vga_regset vt8623_v_sync_end_regs[]    = {{0x11, 0, 3}, VGA_REGSET_END};
+
+struct vga_regset vt8623_offset_regs[]        = {{0x13, 0, 7}, {0x35, 5, 7}, VGA_REGSET_END};
+struct vga_regset vt8623_line_compare_regs[]  = {{0x18, 0, 7}, {0x07, 4, 4}, {0x09, 6, 6}, {0x33, 0, 2}, {0x35, 4, 4}, VGA_REGSET_END};
+struct vga_regset vt8623_fetch_count_regs[]   = {{0x1C, 0, 7}, {0x1D, 0, 1}, VGA_REGSET_END};
+struct vga_regset vt8623_start_address_regs[] = {{0x0d, 0, 7}, {0x0c, 0, 7}, {0x34, 0, 7}, {0x48, 0, 1}, VGA_REGSET_END};
+
+struct svga_timing_regs vt8623_timing_regs     = {
+        vt8623_h_total_regs, vt8623_h_display_regs, vt8623_h_blank_start_regs,
+        vt8623_h_blank_end_regs, vt8623_h_sync_start_regs, vt8623_h_sync_end_regs,
+        vt8623_v_total_regs, vt8623_v_display_regs, vt8623_v_blank_start_regs,
+        vt8623_v_blank_end_regs, vt8623_v_sync_start_regs, vt8623_v_sync_end_regs,
+};
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* Module parameters */
+
+static char *mode = "640x480-8@60";
+
+#ifdef CONFIG_MTRR
+static int mtrr = 1;
+#endif
+
+MODULE_AUTHOR("(c) 2006 Ondrej Zajicek <santiago@crfreenet.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]");
+
+module_param(mode, charp, 0644);
+MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
+
+#ifdef CONFIG_MTRR
+module_param(mtrr, int, 0444);
+MODULE_PARM_DESC(mtrr, "Enable write-combining with MTRR (1=enable, 0=disable, default=1)");
+#endif
+
+
+/* ------------------------------------------------------------------------- */
+
+
+static struct fb_tile_ops vt8623fb_tile_ops = {
+        .fb_settile     = svga_settile,
+        .fb_tilecopy    = svga_tilecopy,
+        .fb_tilefill    = svga_tilefill,
+        .fb_tileblit    = svga_tileblit,
+        .fb_tilecursor  = svga_tilecursor,
+        .fb_get_tilemax = svga_get_tilemax,
+};
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* image data is MSB-first, fb structure is MSB-first too */
+static inline u32 expand_color(u32 c)
+{
+        return ((c & 1) | ((c & 2) << 7) | ((c & 4) << 14) | ((c & 8) << 21)) * 0xFF;
+}
+
+/* vt8623fb_iplan_imageblit silently assumes that almost everything is 8-pixel aligned */
+static void vt8623fb_iplan_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        u32 fg = expand_color(image->fg_color);
+        u32 bg = expand_color(image->bg_color);
+        const u8 *src1, *src;
+        u8 __iomem *dst1;
+        u32 __iomem *dst;
+        u32 val;
+        int x, y;
+
+        src1 = image->data;
+        dst1 = info->screen_base + (image->dy * info->fix.line_length)
+                 + ((image->dx / 8) * 4);
+
+        for (y = 0; y < image->height; y++) {
+                src = src1;
+                dst = (u32 __iomem *) dst1;
+                for (x = 0; x < image->width; x += 8) {
+                        val = *(src++) * 0x01010101;
+                        val = (val & fg) | (~val & bg);
+                        fb_writel(val, dst++);
+                }
+                src1 += image->width / 8;
+                dst1 += info->fix.line_length;
+        }
+}
+
+/* vt8623fb_iplan_fillrect silently assumes that almost everything is 8-pixel aligned */
+static void vt8623fb_iplan_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        u32 fg = expand_color(rect->color);
+        u8 __iomem *dst1;
+        u32 __iomem *dst;
+        int x, y;
+
+        dst1 = info->screen_base + (rect->dy * info->fix.line_length)
+                 + ((rect->dx / 8) * 4);
+
+        for (y = 0; y < rect->height; y++) {
+                dst = (u32 __iomem *) dst1;
+                for (x = 0; x < rect->width; x += 8) {
+                        fb_writel(fg, dst++);
+                }
+                dst1 += info->fix.line_length;
+        }
+}
+
+
+/* image data is MSB-first, fb structure is high-nibble-in-low-byte-first */
+static inline u32 expand_pixel(u32 c)
+{
+        return (((c &  1) << 24) | ((c &  2) << 27) | ((c &  4) << 14) | ((c &   8) << 17) |
+                ((c & 16) <<  4) | ((c & 32) <<  7) | ((c & 64) >>  6) | ((c & 128) >>  3)) * 0xF;
+}
+
+/* vt8623fb_cfb4_imageblit silently assumes that almost everything is 8-pixel aligned */
+static void vt8623fb_cfb4_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        u32 fg = image->fg_color * 0x11111111;
+        u32 bg = image->bg_color * 0x11111111;
+        const u8 *src1, *src;
+        u8 __iomem *dst1;
+        u32 __iomem *dst;
+        u32 val;
+        int x, y;
+
+        src1 = image->data;
+        dst1 = info->screen_base + (image->dy * info->fix.line_length)
+                 + ((image->dx / 8) * 4);
+
+        for (y = 0; y < image->height; y++) {
+                src = src1;
+                dst = (u32 __iomem *) dst1;
+                for (x = 0; x < image->width; x += 8) {
+                        val = expand_pixel(*(src++));
+                        val = (val & fg) | (~val & bg);
+                        fb_writel(val, dst++);
+                }
+                src1 += image->width / 8;
+                dst1 += info->fix.line_length;
+        }
+}
+
+static void vt8623fb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        if ((info->var.bits_per_pixel == 4) && (image->depth == 1)
+            && ((image->width % 8) == 0) && ((image->dx % 8) == 0)) {
+                if (info->fix.type == FB_TYPE_INTERLEAVED_PLANES)
+                        vt8623fb_iplan_imageblit(info, image);
+                else
+                        vt8623fb_cfb4_imageblit(info, image);
+        } else
+                cfb_imageblit(info, image);
+}
+
+static void vt8623fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        if ((info->var.bits_per_pixel == 4)
+            && ((rect->width % 8) == 0) && ((rect->dx % 8) == 0)
+            && (info->fix.type == FB_TYPE_INTERLEAVED_PLANES))
+                vt8623fb_iplan_fillrect(info, rect);
+         else
+                cfb_fillrect(info, rect);
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+static void vt8623_set_pixclock(struct fb_info *info, u32 pixclock)
+{
+        u16 m, n, r;
+        u8 regval;
+        int rv;
+
+        rv = svga_compute_pll(&vt8623_pll, 1000000000 / pixclock, &m, &n, &r, info->node);
+        if (rv < 0) {
+                printk(KERN_ERR "fb%d: cannot set requested pixclock, keeping old value\n", info->node);
+                return;
+        }
+
+        /* Set VGA misc register  */
+        regval = vga_r(NULL, VGA_MIS_R);
+        vga_w(NULL, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD);
+
+        /* Set clock registers */
+        vga_wseq(NULL, 0x46, (n  | (r << 6)));
+        vga_wseq(NULL, 0x47, m);
+
+        udelay(1000);
+
+        /* PLL reset */
+        svga_wseq_mask(0x40, 0x02, 0x02);
+        svga_wseq_mask(0x40, 0x00, 0x02);
+}
+
+
+static int vt8623fb_open(struct fb_info *info, int user)
+{
+        struct vt8623fb_info *par = info->par;
+
+        mutex_lock(&(par->open_lock));
+        if (par->ref_count == 0) {
+                memset(&(par->state), 0, sizeof(struct vgastate));
+                par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS | VGA_SAVE_CMAP;
+                par->state.num_crtc = 0xA2;
+                par->state.num_seq = 0x50;
+                save_vga(&(par->state));
+        }
+
+        par->ref_count++;
+        mutex_unlock(&(par->open_lock));
+
+        return 0;
+}
+
+static int vt8623fb_release(struct fb_info *info, int user)
+{
+        struct vt8623fb_info *par = info->par;
+
+        mutex_lock(&(par->open_lock));
+        if (par->ref_count == 0) {
+                mutex_unlock(&(par->open_lock));
+                return -EINVAL;
+        }
+
+        if (par->ref_count == 1)
+                restore_vga(&(par->state));
+
+        par->ref_count--;
+        mutex_unlock(&(par->open_lock));
+
+        return 0;
+}
+
+static int vt8623fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        int rv, mem, step;
+
+        /* Find appropriate format */
+        rv = svga_match_format (vt8623fb_formats, var, NULL);
+        if (rv < 0)
+        {
+                printk(KERN_ERR "fb%d: unsupported mode requested\n", info->node);
+                return rv;
+        }
+
+        /* Do not allow to have real resoulution larger than virtual */
+        if (var->xres > var->xres_virtual)
+                var->xres_virtual = var->xres;
+
+        if (var->yres > var->yres_virtual)
+                var->yres_virtual = var->yres;
+
+        /* Round up xres_virtual to have proper alignment of lines */
+        step = vt8623fb_formats[rv].xresstep - 1;
+        var->xres_virtual = (var->xres_virtual+step) & ~step;
+
+        /* Check whether have enough memory */
+        mem = ((var->bits_per_pixel * var->xres_virtual) >> 3) * var->yres_virtual;
+        if (mem > info->screen_size)
+        {
+                printk(KERN_ERR "fb%d: not enough framebuffer memory (%d kB requested , %d kB available)\n", info->node, mem >> 10, (unsigned int) (info->screen_size >> 10));
+                return -EINVAL;
+        }
+
+        /* Text mode is limited to 256 kB of memory */
+        if ((var->bits_per_pixel == 0) && (mem > (256*1024)))
+        {
+                printk(KERN_ERR "fb%d: text framebuffer size too large (%d kB requested, 256 kB possible)\n", info->node, mem >> 10);
+                return -EINVAL;
+        }
+
+        rv = svga_check_timings (&vt8623_timing_regs, var, info->node);
+        if (rv < 0)
+        {
+                printk(KERN_ERR "fb%d: invalid timings requested\n", info->node);
+                return rv;
+        }
+
+        /* Interlaced mode not supported */
+        if (var->vmode & FB_VMODE_INTERLACED)
+                return -EINVAL;
+
+        return 0;
+}
+
+
+static int vt8623fb_set_par(struct fb_info *info)
+{
+        u32 mode, offset_value, fetch_value, screen_size;
+        u32 bpp = info->var.bits_per_pixel;
+
+        if (bpp != 0) {
+                info->fix.ypanstep = 1;
+                info->fix.line_length = (info->var.xres_virtual * bpp) / 8;
+
+                info->flags &= ~FBINFO_MISC_TILEBLITTING;
+                info->tileops = NULL;
+
+                /* in 4bpp supports 8p wide tiles only, any tiles otherwise */
+                info->pixmap.blit_x = (bpp == 4) ? (1 << (8 - 1)) : (~(u32)0);
+                info->pixmap.blit_y = ~(u32)0;
+
+                offset_value = (info->var.xres_virtual * bpp) / 64;
+                fetch_value  = ((info->var.xres * bpp) / 128) + 4;
+
+                if (bpp == 4)
+                        fetch_value  = (info->var.xres / 8) + 8; /* + 0 is OK */
+
+                screen_size  = info->var.yres_virtual * info->fix.line_length;
+        } else {
+                info->fix.ypanstep = 16;
+                info->fix.line_length = 0;
+
+                info->flags |= FBINFO_MISC_TILEBLITTING;
+                info->tileops = &vt8623fb_tile_ops;
+
+                /* supports 8x16 tiles only */
+                info->pixmap.blit_x = 1 << (8 - 1);
+                info->pixmap.blit_y = 1 << (16 - 1);
+
+                offset_value = info->var.xres_virtual / 16;
+                fetch_value  = (info->var.xres / 8) + 8;
+                screen_size  = (info->var.xres_virtual * info->var.yres_virtual) / 64;
+        }
+
+        info->var.xoffset = 0;
+        info->var.yoffset = 0;
+        info->var.activate = FB_ACTIVATE_NOW;
+
+        /* Unlock registers */
+        svga_wseq_mask(0x10, 0x01, 0x01);
+        svga_wcrt_mask(0x11, 0x00, 0x80);
+        svga_wcrt_mask(0x47, 0x00, 0x01);
+
+        /* Device, screen and sync off */
+        svga_wseq_mask(0x01, 0x20, 0x20);
+        svga_wcrt_mask(0x36, 0x30, 0x30);
+        svga_wcrt_mask(0x17, 0x00, 0x80);
+
+        /* Set default values */
+        svga_set_default_gfx_regs();
+        svga_set_default_atc_regs();
+        svga_set_default_seq_regs();
+        svga_set_default_crt_regs();
+        svga_wcrt_multi(vt8623_line_compare_regs, 0xFFFFFFFF);
+        svga_wcrt_multi(vt8623_start_address_regs, 0);
+
+        svga_wcrt_multi(vt8623_offset_regs, offset_value);
+        svga_wseq_multi(vt8623_fetch_count_regs, fetch_value);
+
+        if (info->var.vmode & FB_VMODE_DOUBLE)
+                svga_wcrt_mask(0x09, 0x80, 0x80);
+        else
+                svga_wcrt_mask(0x09, 0x00, 0x80);
+
+        svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus
+        svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus
+        svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read treshold
+        vga_wseq(NULL, 0x17, 0x1F);       // FIFO depth
+        vga_wseq(NULL, 0x18, 0x4E);
+        svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ?
+
+        vga_wcrt(NULL, 0x32, 0x00);
+        vga_wcrt(NULL, 0x34, 0x00);
+        vga_wcrt(NULL, 0x6A, 0x80);
+        vga_wcrt(NULL, 0x6A, 0xC0);
+
+        vga_wgfx(NULL, 0x20, 0x00);
+        vga_wgfx(NULL, 0x21, 0x00);
+        vga_wgfx(NULL, 0x22, 0x00);
+
+        /* Set SR15 according to number of bits per pixel */
+        mode = svga_match_format(vt8623fb_formats, &(info->var), &(info->fix));
+        switch (mode) {
+        case 0:
+                pr_debug("fb%d: text mode\n", info->node);
+                svga_set_textmode_vga_regs();
+                svga_wseq_mask(0x15, 0x00, 0xFE);
+                svga_wcrt_mask(0x11, 0x60, 0x70);
+                break;
+        case 1:
+                pr_debug("fb%d: 4 bit pseudocolor\n", info->node);
+                vga_wgfx(NULL, VGA_GFX_MODE, 0x40);
+                svga_wseq_mask(0x15, 0x20, 0xFE);
+                svga_wcrt_mask(0x11, 0x00, 0x70);
+                break;
+        case 2:
+                pr_debug("fb%d: 4 bit pseudocolor, planar\n", info->node);
+                svga_wseq_mask(0x15, 0x00, 0xFE);
+                svga_wcrt_mask(0x11, 0x00, 0x70);
+                break;
+        case 3:
+                pr_debug("fb%d: 8 bit pseudocolor\n", info->node);
+                svga_wseq_mask(0x15, 0x22, 0xFE);
+                break;
+        case 4:
+                pr_debug("fb%d: 5/6/5 truecolor\n", info->node);
+                svga_wseq_mask(0x15, 0xB6, 0xFE);
+                break;
+        case 5:
+                pr_debug("fb%d: 8/8/8 truecolor\n", info->node);
+                svga_wseq_mask(0x15, 0xAE, 0xFE);
+                break;
+        default:
+                printk(KERN_ERR "vt8623fb: unsupported mode - bug\n");
+                return (-EINVAL);
+        }
+
+        vt8623_set_pixclock(info, info->var.pixclock);
+        svga_set_timings(&vt8623_timing_regs, &(info->var), 1, 1,
+                         (info->var.vmode & FB_VMODE_DOUBLE) ? 2 : 1, 1,
+                         1, info->node);
+
+        memset_io(info->screen_base, 0x00, screen_size);
+
+        /* Device and screen back on */
+        svga_wcrt_mask(0x17, 0x80, 0x80);
+        svga_wcrt_mask(0x36, 0x00, 0x30);
+        svga_wseq_mask(0x01, 0x00, 0x20);
+
+        return 0;
+}
+
+
+static int vt8623fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                                u_int transp, struct fb_info *fb)
+{
+        switch (fb->var.bits_per_pixel) {
+        case 0:
+        case 4:
+                if (regno >= 16)
+                        return -EINVAL;
+
+                outb(0x0F, VGA_PEL_MSK);
+                outb(regno, VGA_PEL_IW);
+                outb(red >> 10, VGA_PEL_D);
+                outb(green >> 10, VGA_PEL_D);
+                outb(blue >> 10, VGA_PEL_D);
+                break;
+        case 8:
+                if (regno >= 256)
+                        return -EINVAL;
+
+                outb(0xFF, VGA_PEL_MSK);
+                outb(regno, VGA_PEL_IW);
+                outb(red >> 10, VGA_PEL_D);
+                outb(green >> 10, VGA_PEL_D);
+                outb(blue >> 10, VGA_PEL_D);
+                break;
+        case 16:
+                if (regno >= 16)
+                        return 0;
+
+                if (fb->var.green.length == 5)
+                        ((u32*)fb->pseudo_palette)[regno] = ((red & 0xF800) >> 1) |
+                                ((green & 0xF800) >> 6) | ((blue & 0xF800) >> 11);
+                else if (fb->var.green.length == 6)
+                        ((u32*)fb->pseudo_palette)[regno] = (red & 0xF800) |
+                                ((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11);
+                else
+                        return -EINVAL;
+                break;
+        case 24:
+        case 32:
+                if (regno >= 16)
+                        return 0;
+
+                /* ((transp & 0xFF00) << 16) */
+                ((u32*)fb->pseudo_palette)[regno] = ((red & 0xFF00) << 8) |
+                        (green & 0xFF00) | ((blue & 0xFF00) >> 8);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+
+static int vt8623fb_blank(int blank_mode, struct fb_info *info)
+{
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                pr_debug("fb%d: unblank\n", info->node);
+                svga_wcrt_mask(0x36, 0x00, 0x30);
+                svga_wseq_mask(0x01, 0x00, 0x20);
+                break;
+        case FB_BLANK_NORMAL:
+                pr_debug("fb%d: blank\n", info->node);
+                svga_wcrt_mask(0x36, 0x00, 0x30);
+                svga_wseq_mask(0x01, 0x20, 0x20);
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                pr_debug("fb%d: DPMS standby (hsync off)\n", info->node);
+                svga_wcrt_mask(0x36, 0x10, 0x30);
+                svga_wseq_mask(0x01, 0x20, 0x20);
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                pr_debug("fb%d: DPMS suspend (vsync off)\n", info->node);
+                svga_wcrt_mask(0x36, 0x20, 0x30);
+                svga_wseq_mask(0x01, 0x20, 0x20);
+                break;
+        case FB_BLANK_POWERDOWN:
+                pr_debug("fb%d: DPMS off (no sync)\n", info->node);
+                svga_wcrt_mask(0x36, 0x30, 0x30);
+                svga_wseq_mask(0x01, 0x20, 0x20);
+                break;
+        }
+
+        return 0;
+}
+
+
+static int vt8623fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        unsigned int offset;
+
+        /* Calculate the offset */
+        if (var->bits_per_pixel == 0) {
+                offset = (var->yoffset / 16) * var->xres_virtual + var->xoffset;
+                offset = offset >> 3;
+        } else {
+                offset = (var->yoffset * info->fix.line_length) +
+                         (var->xoffset * var->bits_per_pixel / 8);
+                offset = offset >> ((var->bits_per_pixel == 4) ? 2 : 1);
+        }
+
+        /* Set the offset */
+        svga_wcrt_multi(vt8623_start_address_regs, offset);
+
+        return 0;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+
+/* Frame buffer operations */
+
+static struct fb_ops vt8623fb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_open        = vt8623fb_open,
+        .fb_release     = vt8623fb_release,
+        .fb_check_var   = vt8623fb_check_var,
+        .fb_set_par     = vt8623fb_set_par,
+        .fb_setcolreg   = vt8623fb_setcolreg,
+        .fb_blank       = vt8623fb_blank,
+        .fb_pan_display = vt8623fb_pan_display,
+        .fb_fillrect    = vt8623fb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = vt8623fb_imageblit,
+        .fb_get_caps    = svga_get_caps,
+};
+
+
+/* PCI probe */
+
+static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+        struct fb_info *info;
+        struct vt8623fb_info *par;
+        unsigned int memsize1, memsize2;
+        int rc;
+
+        /* Ignore secondary VGA device because there is no VGA arbitration */
+        if (! svga_primary_device(dev)) {
+                dev_info(&(dev->dev), "ignoring secondary device\n");
+                return -ENODEV;
+        }
+
+        /* Allocate and fill driver data structure */
+        info = framebuffer_alloc(sizeof(struct vt8623fb_info), NULL);
+        if (! info) {
+                dev_err(&(dev->dev), "cannot allocate memory\n");
+                return -ENOMEM;
+        }
+
+        par = info->par;
+        mutex_init(&par->open_lock);
+
+        info->flags = FBINFO_PARTIAL_PAN_OK | FBINFO_HWACCEL_YPAN;
+        info->fbops = &vt8623fb_ops;
+
+        /* Prepare PCI device */
+
+        rc = pci_enable_device(dev);
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot enable PCI device\n");
+                goto err_enable_device;
+        }
+
+        rc = pci_request_regions(dev, "vt8623fb");
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot reserve framebuffer region\n");
+                goto err_request_regions;
+        }
+
+        info->fix.smem_start = pci_resource_start(dev, 0);
+        info->fix.smem_len = pci_resource_len(dev, 0);
+        info->fix.mmio_start = pci_resource_start(dev, 1);
+        info->fix.mmio_len = pci_resource_len(dev, 1);
+
+        /* Map physical IO memory address into kernel space */
+        info->screen_base = pci_iomap(dev, 0, 0);
+        if (! info->screen_base) {
+                rc = -ENOMEM;
+                dev_err(&(dev->dev), "iomap for framebuffer failed\n");
+                goto err_iomap_1;
+        }
+
+        par->mmio_base = pci_iomap(dev, 1, 0);
+        if (! par->mmio_base) {
+                rc = -ENOMEM;
+                dev_err(&(dev->dev), "iomap for MMIO failed\n");
+                goto err_iomap_2;
+        }
+
+        /* Find how many physical memory there is on card */
+        memsize1 = (vga_rseq(NULL, 0x34) + 1) >> 1;
+        memsize2 = vga_rseq(NULL, 0x39) << 2;
+
+        if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
+                info->screen_size = memsize1 << 20;
+        else {
+                dev_err(&(dev->dev), "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
+                info->screen_size = 16 << 20;
+        }
+
+        info->fix.smem_len = info->screen_size;
+        strcpy(info->fix.id, "VIA VT8623");
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+        info->fix.ypanstep = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->pseudo_palette = (void*)par->pseudo_palette;
+
+        /* Prepare startup mode */
+
+        rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
+        if (! ((rc == 1) || (rc == 2))) {
+                rc = -EINVAL;
+                dev_err(&(dev->dev), "mode %s not found\n", mode);
+                goto err_find_mode;
+        }
+
+        rc = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot allocate colormap\n");
+                goto err_alloc_cmap;
+        }
+
+        rc = register_framebuffer(info);
+        if (rc < 0) {
+                dev_err(&(dev->dev), "cannot register framebugger\n");
+                goto err_reg_fb;
+        }
+
+        printk(KERN_INFO "fb%d: %s on %s, %d MB RAM\n", info->node, info->fix.id,
+                 pci_name(dev), info->fix.smem_len >> 20);
+
+        /* Record a reference to the driver data */
+        pci_set_drvdata(dev, info);
+
+#ifdef CONFIG_MTRR
+        if (mtrr) {
+                par->mtrr_reg = -1;
+                par->mtrr_reg = mtrr_add(info->fix.smem_start, info->fix.smem_len, MTRR_TYPE_WRCOMB, 1);
+        }
+#endif
+
+        return 0;
+
+        /* Error handling */
+err_reg_fb:
+        fb_dealloc_cmap(&info->cmap);
+err_alloc_cmap:
+err_find_mode:
+        pci_iounmap(dev, par->mmio_base);
+err_iomap_2:
+        pci_iounmap(dev, info->screen_base);
+err_iomap_1:
+        pci_release_regions(dev);
+err_request_regions:
+/*      pci_disable_device(dev); */
+err_enable_device:
+        framebuffer_release(info);
+        return rc;
+}
+
+/* PCI remove */
+
+static void __devexit vt8623_pci_remove(struct pci_dev *dev)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct vt8623fb_info *par = info->par;
+
+        if (info) {
+#ifdef CONFIG_MTRR
+                if (par->mtrr_reg >= 0) {
+                        mtrr_del(par->mtrr_reg, 0, 0);
+                        par->mtrr_reg = -1;
+                }
+#endif
+
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
+
+                pci_iounmap(dev, info->screen_base);
+                pci_iounmap(dev, par->mmio_base);
+                pci_release_regions(dev);
+/*              pci_disable_device(dev); */
+
+                pci_set_drvdata(dev, NULL);
+                framebuffer_release(info);
+        }
+}
+
+
+#ifdef CONFIG_PM
+/* PCI suspend */
+
+static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct vt8623fb_info *par = info->par;
+
+        dev_info(&(dev->dev), "suspend\n");
+
+        acquire_console_sem();
+        mutex_lock(&(par->open_lock));
+
+        if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) {
+                mutex_unlock(&(par->open_lock));
+                release_console_sem();
+                return 0;
+        }
+
+        fb_set_suspend(info, 1);
+
+        pci_save_state(dev);
+        pci_disable_device(dev);
+        pci_set_power_state(dev, pci_choose_state(dev, state));
+
+        mutex_unlock(&(par->open_lock));
+        release_console_sem();
+
+        return 0;
+}
+
+
+/* PCI resume */
+
+static int vt8623_pci_resume(struct pci_dev* dev)
+{
+        struct fb_info *info = pci_get_drvdata(dev);
+        struct vt8623fb_info *par = info->par;
+
+        dev_info(&(dev->dev), "resume\n");
+
+        acquire_console_sem();
+        mutex_lock(&(par->open_lock));
+
+        if (par->ref_count == 0) {
+                mutex_unlock(&(par->open_lock));
+                release_console_sem();
+                return 0;
+        }
+
+        pci_set_power_state(dev, PCI_D0);
+        pci_restore_state(dev);
+
+        if (pci_enable_device(dev))
+                goto fail;
+
+        pci_set_master(dev);
+
+        vt8623fb_set_par(info);
+        fb_set_suspend(info, 0);
+
+        mutex_unlock(&(par->open_lock));
+fail:
+        release_console_sem();
+
+        return 0;
+}
+#else
+#define vt8623_pci_suspend NULL
+#define vt8623_pci_resume NULL
+#endif /* CONFIG_PM */
+
+/* List of boards that we are trying to support */
+
+static struct pci_device_id vt8623_devices[] __devinitdata = {
+        {PCI_DEVICE(PCI_VENDOR_ID_VIA, 0x3122)},
+        {0, 0, 0, 0, 0, 0, 0}
+};
+
+MODULE_DEVICE_TABLE(pci, vt8623_devices);
+
+static struct pci_driver vt8623fb_pci_driver = {
+        .name           = "vt8623fb",
+        .id_table       = vt8623_devices,
+        .probe          = vt8623_pci_probe,
+        .remove         = __devexit_p(vt8623_pci_remove),
+        .suspend        = vt8623_pci_suspend,
+        .resume         = vt8623_pci_resume,
+};
+
+/* Cleanup */
+
+static void __exit vt8623fb_cleanup(void)
+{
+        pr_debug("vt8623fb: cleaning up\n");
+        pci_unregister_driver(&vt8623fb_pci_driver);
+}
+
+/* Driver Initialisation */
+
+int __init vt8623fb_init(void)
+{
+
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("vt8623fb", &option))
+                return -ENODEV;
+
+        if (option && *option)
+                mode = option;
+#endif
+
+        pr_debug("vt8623fb: initializing\n");
+        return pci_register_driver(&vt8623fb_pci_driver);
+}
+
+/* ------------------------------------------------------------------------- */
+
+/* Modularization */
+
+module_init(vt8623fb_init);
+module_exit(vt8623fb_cleanup);
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
new file mode 100644
index 000000000000..1d29a89a86b4
--- /dev/null
+++ b/drivers/video/xilinxfb.c
@@ -0,0 +1,381 @@
+/*
+ * xilinxfb.c
+ *
+ * Xilinx TFT LCD frame buffer driver
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * 2002-2007 (c) MontaVista Software, Inc.  This file is licensed under the
+ * terms of the GNU General Public License version 2.  This program is licensed
+ * "as is" without any warranty of any kind, whether express or implied.
+ */
+
+/*
+ * This driver was based on au1100fb.c by MontaVista rewritten for 2.6
+ * by Embedded Alley Solutions <source@embeddedalley.com>, which in turn
+ * was based on skeletonfb.c, Skeleton for a frame buffer device by
+ * Geert Uytterhoeven.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
+
+#include <asm/io.h>
+#include <syslib/virtex_devices.h>
+
+#define DRIVER_NAME             "xilinxfb"
+#define DRIVER_DESCRIPTION      "Xilinx TFT LCD frame buffer driver"
+
+/*
+ * Xilinx calls it "PLB TFT LCD Controller" though it can also be used for
+ * the VGA port on the Xilinx ML40x board. This is a hardware display controller
+ * for a 640x480 resolution TFT or VGA screen.
+ *
+ * The interface to the framebuffer is nice and simple.  There are two
+ * control registers.  The first tells the LCD interface where in memory
+ * the frame buffer is (only the 11 most significant bits are used, so
+ * don't start thinking about scrolling).  The second allows the LCD to
+ * be turned on or off as well as rotated 180 degrees.
+ */
+#define NUM_REGS        2
+#define REG_FB_ADDR     0
+#define REG_CTRL        1
+#define REG_CTRL_ENABLE  0x0001
+#define REG_CTRL_ROTATE  0x0002
+
+/*
+ * The hardware only handles a single mode: 640x480 24 bit true
+ * color. Each pixel gets a word (32 bits) of memory.  Within each word,
+ * the 8 most significant bits are ignored, the next 8 bits are the red
+ * level, the next 8 bits are the green level and the 8 least
+ * significant bits are the blue level.  Each row of the LCD uses 1024
+ * words, but only the first 640 pixels are displayed with the other 384
+ * words being ignored.  There are 480 rows.
+ */
+#define BYTES_PER_PIXEL 4
+#define BITS_PER_PIXEL  (BYTES_PER_PIXEL * 8)
+#define XRES            640
+#define YRES            480
+#define XRES_VIRTUAL    1024
+#define YRES_VIRTUAL    YRES
+#define LINE_LENGTH     (XRES_VIRTUAL * BYTES_PER_PIXEL)
+#define FB_SIZE         (YRES_VIRTUAL * LINE_LENGTH)
+
+#define RED_SHIFT       16
+#define GREEN_SHIFT     8
+#define BLUE_SHIFT      0
+
+#define PALETTE_ENTRIES_NO      16      /* passed to fb_alloc_cmap() */
+
+/*
+ * Here are the default fb_fix_screeninfo and fb_var_screeninfo structures
+ */
+static struct fb_fix_screeninfo xilinx_fb_fix __initdata = {
+        .id =           "Xilinx",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_TRUECOLOR,
+        .smem_len =     FB_SIZE,
+        .line_length =  LINE_LENGTH,
+        .accel =        FB_ACCEL_NONE
+};
+
+static struct fb_var_screeninfo xilinx_fb_var __initdata = {
+        .xres =                 XRES,
+        .yres =                 YRES,
+        .xres_virtual =         XRES_VIRTUAL,
+        .yres_virtual =         YRES_VIRTUAL,
+
+        .bits_per_pixel =       BITS_PER_PIXEL,
+
+        .red =          { RED_SHIFT, 8, 0 },
+        .green =        { GREEN_SHIFT, 8, 0 },
+        .blue =         { BLUE_SHIFT, 8, 0 },
+        .transp =       { 0, 0, 0 },
+
+        .activate =     FB_ACTIVATE_NOW
+};
+
+struct xilinxfb_drvdata {
+
+        struct fb_info  info;           /* FB driver info record */
+
+        u32             regs_phys;      /* phys. address of the control registers */
+        u32 __iomem     *regs;          /* virt. address of the control registers */
+
+        unsigned char __iomem   *fb_virt;       /* virt. address of the frame buffer */
+        dma_addr_t      fb_phys;        /* phys. address of the frame buffer */
+
+        u32             reg_ctrl_default;
+
+        u32             pseudo_palette[PALETTE_ENTRIES_NO];
+                                        /* Fake palette of 16 colors */
+};
+
+#define to_xilinxfb_drvdata(_info) \
+        container_of(_info, struct xilinxfb_drvdata, info)
+
+/*
+ * The LCD controller has DCR interface to its registers, but all
+ * the boards and configurations the driver has been tested with
+ * use opb2dcr bridge. So the registers are seen as memory mapped.
+ * This macro is to make it simple to add the direct DCR access
+ * when it's needed.
+ */
+#define xilinx_fb_out_be32(driverdata, offset, val) \
+        out_be32(driverdata->regs + offset, val)
+
+static int
+xilinx_fb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
+        unsigned transp, struct fb_info *fbi)
+{
+        u32 *palette = fbi->pseudo_palette;
+
+        if (regno >= PALETTE_ENTRIES_NO)
+                return -EINVAL;
+
+        if (fbi->var.grayscale) {
+                /* Convert color to grayscale.
+                 * grayscale = 0.30*R + 0.59*G + 0.11*B */
+                red = green = blue =
+                        (red * 77 + green * 151 + blue * 28 + 127) >> 8;
+        }
+
+        /* fbi->fix.visual is always FB_VISUAL_TRUECOLOR */
+
+        /* We only handle 8 bits of each color. */
+        red >>= 8;
+        green >>= 8;
+        blue >>= 8;
+        palette[regno] = (red << RED_SHIFT) | (green << GREEN_SHIFT) |
+                         (blue << BLUE_SHIFT);
+
+        return 0;
+}
+
+static int
+xilinx_fb_blank(int blank_mode, struct fb_info *fbi)
+{
+        struct xilinxfb_drvdata *drvdata = to_xilinxfb_drvdata(fbi);
+
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                /* turn on panel */
+                xilinx_fb_out_be32(drvdata, REG_CTRL, drvdata->reg_ctrl_default);
+                break;
+
+        case FB_BLANK_NORMAL:
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_POWERDOWN:
+                /* turn off panel */
+                xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
+        default:
+                break;
+
+        }
+        return 0; /* success */
+}
+
+static struct fb_ops xilinxfb_ops =
+{
+        .owner                  = THIS_MODULE,
+        .fb_setcolreg           = xilinx_fb_setcolreg,
+        .fb_blank               = xilinx_fb_blank,
+        .fb_fillrect            = cfb_fillrect,
+        .fb_copyarea            = cfb_copyarea,
+        .fb_imageblit           = cfb_imageblit,
+};
+
+/* === The device driver === */
+
+static int
+xilinxfb_drv_probe(struct device *dev)
+{
+        struct platform_device *pdev;
+        struct xilinxfb_platform_data *pdata;
+        struct xilinxfb_drvdata *drvdata;
+        struct resource *regs_res;
+        int retval;
+
+        if (!dev)
+                return -EINVAL;
+
+        pdev = to_platform_device(dev);
+        pdata = pdev->dev.platform_data;
+
+        if (pdata == NULL) {
+                printk(KERN_ERR "Couldn't find platform data.\n");
+                return -EFAULT;
+        }
+
+        drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
+        if (!drvdata) {
+                printk(KERN_ERR "Couldn't allocate device private record\n");
+                return -ENOMEM;
+        }
+        dev_set_drvdata(dev, drvdata);
+
+        /* Map the control registers in */
+        regs_res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!regs_res || (regs_res->end - regs_res->start + 1 < 8)) {
+                printk(KERN_ERR "Couldn't get registers resource\n");
+                retval = -EFAULT;
+                goto failed1;
+        }
+
+        if (!request_mem_region(regs_res->start, 8, DRIVER_NAME)) {
+                printk(KERN_ERR
+                       "Couldn't lock memory region at 0x%08X\n",
+                       regs_res->start);
+                retval = -EBUSY;
+                goto failed1;
+        }
+        drvdata->regs = (u32 __iomem*) ioremap(regs_res->start, 8);
+        drvdata->regs_phys = regs_res->start;
+
+        /* Allocate the framebuffer memory */
+        drvdata->fb_virt = dma_alloc_coherent(dev, PAGE_ALIGN(FB_SIZE),
+                                &drvdata->fb_phys, GFP_KERNEL);
+        if (!drvdata->fb_virt) {
+                printk(KERN_ERR "Could not allocate frame buffer memory\n");
+                retval = -ENOMEM;
+                goto failed2;
+        }
+
+        /* Clear (turn to black) the framebuffer */
+        memset_io((void *) drvdata->fb_virt, 0, FB_SIZE);
+
+        /* Tell the hardware where the frame buffer is */
+        xilinx_fb_out_be32(drvdata, REG_FB_ADDR, drvdata->fb_phys);
+
+        /* Turn on the display */
+        if (pdata->rotate_screen) {
+                drvdata->reg_ctrl_default = REG_CTRL_ENABLE | REG_CTRL_ROTATE;
+        } else {
+                drvdata->reg_ctrl_default = REG_CTRL_ENABLE;
+        }
+        xilinx_fb_out_be32(drvdata, REG_CTRL, drvdata->reg_ctrl_default);
+
+        /* Fill struct fb_info */
+        drvdata->info.device = dev;
+        drvdata->info.screen_base = drvdata->fb_virt;
+        drvdata->info.fbops = &xilinxfb_ops;
+        drvdata->info.fix = xilinx_fb_fix;
+        drvdata->info.fix.smem_start = drvdata->fb_phys;
+        drvdata->info.pseudo_palette = drvdata->pseudo_palette;
+
+        if (fb_alloc_cmap(&drvdata->info.cmap, PALETTE_ENTRIES_NO, 0) < 0) {
+                printk(KERN_ERR "Fail to allocate colormap (%d entries)\n",
+                        PALETTE_ENTRIES_NO);
+                retval = -EFAULT;
+                goto failed3;
+        }
+
+        drvdata->info.flags = FBINFO_DEFAULT;
+        xilinx_fb_var.height = pdata->screen_height_mm;
+        xilinx_fb_var.width = pdata->screen_width_mm;
+        drvdata->info.var = xilinx_fb_var;
+
+        /* Register new frame buffer */
+        if (register_framebuffer(&drvdata->info) < 0) {
+                printk(KERN_ERR "Could not register frame buffer\n");
+                retval = -EINVAL;
+                goto failed4;
+        }
+
+        return 0;       /* success */
+
+failed4:
+        fb_dealloc_cmap(&drvdata->info.cmap);
+
+failed3:
+        dma_free_coherent(dev, PAGE_ALIGN(FB_SIZE), drvdata->fb_virt,
+                drvdata->fb_phys);
+
+        /* Turn off the display */
+        xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
+        iounmap(drvdata->regs);
+
+failed2:
+        release_mem_region(regs_res->start, 8);
+
+failed1:
+        kfree(drvdata);
+        dev_set_drvdata(dev, NULL);
+
+        return retval;
+}
+
+static int
+xilinxfb_drv_remove(struct device *dev)
+{
+        struct xilinxfb_drvdata *drvdata;
+
+        if (!dev)
+                return -ENODEV;
+
+        drvdata = (struct xilinxfb_drvdata *) dev_get_drvdata(dev);
+
+#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+        xilinx_fb_blank(VESA_POWERDOWN, &drvdata->info);
+#endif
+
+        unregister_framebuffer(&drvdata->info);
+
+        fb_dealloc_cmap(&drvdata->info.cmap);
+
+        dma_free_coherent(dev, PAGE_ALIGN(FB_SIZE), drvdata->fb_virt,
+                drvdata->fb_phys);
+
+        /* Turn off the display */
+        xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
+        iounmap(drvdata->regs);
+
+        release_mem_region(drvdata->regs_phys, 8);
+
+        kfree(drvdata);
+        dev_set_drvdata(dev, NULL);
+
+        return 0;
+}
+
+
+static struct device_driver xilinxfb_driver = {
+        .name           = DRIVER_NAME,
+        .bus            = &platform_bus_type,
+
+        .probe          = xilinxfb_drv_probe,
+        .remove         = xilinxfb_drv_remove
+};
+
+static int __init
+xilinxfb_init(void)
+{
+        /*
+         * No kernel boot options used,
+         * so we just need to register the driver
+         */
+        return driver_register(&xilinxfb_driver);
+}
+
+static void __exit
+xilinxfb_cleanup(void)
+{
+        driver_unregister(&xilinxfb_driver);
+}
+
+module_init(xilinxfb_init);
+module_exit(xilinxfb_cleanup);
+
+MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
+MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index c287a9ae4fdd..ca75b3ad3a2e 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -1,4 +1,5 @@
 menu "Dallas's 1-wire bus"
+        depends on HAS_IOMEM
 
 config W1
         tristate "Dallas's 1-wire support"
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 2fb425536eae..8f779338f744 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -35,5 +35,13 @@ config W1_MASTER_DS2482
           This driver can also be built as a module.  If so, the module
           will be called ds2482.
 
+config W1_MASTER_DS1WM
+        tristate "Maxim DS1WM 1-wire busmaster"
+        depends on W1 && ARM
+        help
+          Say Y here to enable the DS1WM 1-wire driver, such as that
+          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
+          hx4700.
+
 endmenu
 
diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile
index 4cee256a8134..11551b328186 100644
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
@@ -5,4 +5,4 @@
 obj-$(CONFIG_W1_MASTER_MATROX)          += matrox_w1.o
 obj-$(CONFIG_W1_MASTER_DS2490)          += ds2490.o
 obj-$(CONFIG_W1_MASTER_DS2482)          += ds2482.o
-
+obj-$(CONFIG_W1_MASTER_DS1WM)           += ds1wm.o
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
new file mode 100644
index 000000000000..763bc73e5070
--- /dev/null
+++ b/drivers/w1/masters/ds1wm.c
@@ -0,0 +1,468 @@
+/*
+ * 1-wire busmaster driver for DS1WM and ASICs with embedded DS1WMs
+ * such as HP iPAQs (including h5xxx, h2200, and devices with ASIC3
+ * like hx4700).
+ *
+ * Copyright (c) 2004-2005, Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
+ * Copyright (c) 2004-2007, Matt Reimer <mreimer@vpop.net>
+ *
+ * Use consistent with the GNU GPL is permitted,
+ * provided that this copyright notice is
+ * preserved in its entirety in all copies and derived works.
+ */
+
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/pm.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/ds1wm.h>
+
+#include <asm/io.h>
+
+#include "../w1.h"
+#include "../w1_int.h"
+
+
+#define DS1WM_CMD       0x00    /* R/W 4 bits command */
+#define DS1WM_DATA      0x01    /* R/W 8 bits, transmit/receive buffer */
+#define DS1WM_INT       0x02    /* R/W interrupt status */
+#define DS1WM_INT_EN    0x03    /* R/W interrupt enable */
+#define DS1WM_CLKDIV    0x04    /* R/W 5 bits of divisor and pre-scale */
+
+#define DS1WM_CMD_1W_RESET  (1 << 0)    /* force reset on 1-wire bus */
+#define DS1WM_CMD_SRA       (1 << 1)    /* enable Search ROM accelerator mode */
+#define DS1WM_CMD_DQ_OUTPUT (1 << 2)    /* write only - forces bus low */
+#define DS1WM_CMD_DQ_INPUT  (1 << 3)    /* read only - reflects state of bus */
+#define DS1WM_CMD_RST       (1 << 5)    /* software reset */
+#define DS1WM_CMD_OD        (1 << 7)    /* overdrive */
+
+#define DS1WM_INT_PD        (1 << 0)    /* presence detect */
+#define DS1WM_INT_PDR       (1 << 1)    /* presence detect result */
+#define DS1WM_INT_TBE       (1 << 2)    /* tx buffer empty */
+#define DS1WM_INT_TSRE      (1 << 3)    /* tx shift register empty */
+#define DS1WM_INT_RBF       (1 << 4)    /* rx buffer full */
+#define DS1WM_INT_RSRF      (1 << 5)    /* rx shift register full */
+
+#define DS1WM_INTEN_EPD     (1 << 0)    /* enable presence detect int */
+#define DS1WM_INTEN_IAS     (1 << 1)    /* INTR active state */
+#define DS1WM_INTEN_ETBE    (1 << 2)    /* enable tx buffer empty int */
+#define DS1WM_INTEN_ETMT    (1 << 3)    /* enable tx shift register empty int */
+#define DS1WM_INTEN_ERBF    (1 << 4)    /* enable rx buffer full int */
+#define DS1WM_INTEN_ERSRF   (1 << 5)    /* enable rx shift register full int */
+#define DS1WM_INTEN_DQO     (1 << 6)    /* enable direct bus driving ops */
+
+
+#define DS1WM_TIMEOUT (HZ * 5)
+
+static struct {
+        unsigned long freq;
+        unsigned long divisor;
+} freq[] = {
+        { 4000000, 0x8 },
+        { 5000000, 0x2 },
+        { 6000000, 0x5 },
+        { 7000000, 0x3 },
+        { 8000000, 0xc },
+        { 10000000, 0x6 },
+        { 12000000, 0x9 },
+        { 14000000, 0x7 },
+        { 16000000, 0x10 },
+        { 20000000, 0xa },
+        { 24000000, 0xd },
+        { 28000000, 0xb },
+        { 32000000, 0x14 },
+        { 40000000, 0xe },
+        { 48000000, 0x11 },
+        { 56000000, 0xf },
+        { 64000000, 0x18 },
+        { 80000000, 0x12 },
+        { 96000000, 0x15 },
+        { 112000000, 0x13 },
+        { 128000000, 0x1c },
+};
+
+struct ds1wm_data {
+        void            *map;
+        int             bus_shift; /* # of shifts to calc register offsets */
+        struct platform_device *pdev;
+        struct ds1wm_platform_data *pdata;
+        int             irq;
+        int             active_high;
+        struct clk      *clk;
+        int             slave_present;
+        void            *reset_complete;
+        void            *read_complete;
+        void            *write_complete;
+        u8              read_byte; /* last byte received */
+};
+
+static inline void ds1wm_write_register(struct ds1wm_data *ds1wm_data, u32 reg,
+                                        u8 val)
+{
+        __raw_writeb(val, ds1wm_data->map + (reg << ds1wm_data->bus_shift));
+}
+
+static inline u8 ds1wm_read_register(struct ds1wm_data *ds1wm_data, u32 reg)
+{
+        return __raw_readb(ds1wm_data->map + (reg << ds1wm_data->bus_shift));
+}
+
+
+static irqreturn_t ds1wm_isr(int isr, void *data)
+{
+        struct ds1wm_data *ds1wm_data = data;
+        u8 intr = ds1wm_read_register(ds1wm_data, DS1WM_INT);
+
+        ds1wm_data->slave_present = (intr & DS1WM_INT_PDR) ? 0 : 1;
+
+        if ((intr & DS1WM_INT_PD) && ds1wm_data->reset_complete)
+                complete(ds1wm_data->reset_complete);
+
+        if ((intr & DS1WM_INT_TSRE) && ds1wm_data->write_complete)
+                complete(ds1wm_data->write_complete);
+
+        if (intr & DS1WM_INT_RBF) {
+                ds1wm_data->read_byte = ds1wm_read_register(ds1wm_data,
+                                                            DS1WM_DATA);
+                if (ds1wm_data->read_complete)
+                        complete(ds1wm_data->read_complete);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
+{
+        unsigned long timeleft;
+        DECLARE_COMPLETION_ONSTACK(reset_done);
+
+        ds1wm_data->reset_complete = &reset_done;
+
+        ds1wm_write_register(ds1wm_data, DS1WM_INT_EN, DS1WM_INTEN_EPD |
+                (ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0));
+
+        ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_1W_RESET);
+
+        timeleft = wait_for_completion_timeout(&reset_done, DS1WM_TIMEOUT);
+        ds1wm_data->reset_complete = NULL;
+        if (!timeleft) {
+                dev_dbg(&ds1wm_data->pdev->dev, "reset failed\n");
+                return 1;
+        }
+
+        /* Wait for the end of the reset. According to the specs, the time
+         * from when the interrupt is asserted to the end of the reset is:
+         *     tRSTH  - tPDH  - tPDL - tPDI
+         *     625 us - 60 us - 240 us - 100 ns = 324.9 us
+         *
+         * We'll wait a bit longer just to be sure.
+         */
+        udelay(500);
+
+        ds1wm_write_register(ds1wm_data, DS1WM_INT_EN,
+                DS1WM_INTEN_ERBF | DS1WM_INTEN_ETMT | DS1WM_INTEN_EPD |
+                (ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0));
+
+        if (!ds1wm_data->slave_present) {
+                dev_dbg(&ds1wm_data->pdev->dev, "reset: no devices found\n");
+                return 1;
+        }
+
+        return 0;
+}
+
+static int ds1wm_write(struct ds1wm_data *ds1wm_data, u8 data)
+{
+        DECLARE_COMPLETION_ONSTACK(write_done);
+        ds1wm_data->write_complete = &write_done;
+
+        ds1wm_write_register(ds1wm_data, DS1WM_DATA, data);
+
+        wait_for_completion_timeout(&write_done, DS1WM_TIMEOUT);
+        ds1wm_data->write_complete = NULL;
+
+        return 0;
+}
+
+static int ds1wm_read(struct ds1wm_data *ds1wm_data, unsigned char write_data)
+{
+        DECLARE_COMPLETION_ONSTACK(read_done);
+        ds1wm_data->read_complete = &read_done;
+
+        ds1wm_write(ds1wm_data, write_data);
+        wait_for_completion_timeout(&read_done, DS1WM_TIMEOUT);
+        ds1wm_data->read_complete = NULL;
+
+        return ds1wm_data->read_byte;
+}
+
+static int ds1wm_find_divisor(int gclk)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(freq); i++)
+                if (gclk <= freq[i].freq)
+                        return freq[i].divisor;
+
+        return 0;
+}
+
+static void ds1wm_up(struct ds1wm_data *ds1wm_data)
+{
+        int gclk, divisor;
+
+        if (ds1wm_data->pdata->enable)
+                ds1wm_data->pdata->enable(ds1wm_data->pdev);
+
+        gclk = clk_get_rate(ds1wm_data->clk);
+        clk_enable(ds1wm_data->clk);
+        divisor = ds1wm_find_divisor(gclk);
+        if (divisor == 0) {
+                dev_err(&ds1wm_data->pdev->dev,
+                        "no suitable divisor for %dHz clock\n", gclk);
+                return;
+        }
+        ds1wm_write_register(ds1wm_data, DS1WM_CLKDIV, divisor);
+
+        /* Let the w1 clock stabilize. */
+        msleep(1);
+
+        ds1wm_reset(ds1wm_data);
+}
+
+static void ds1wm_down(struct ds1wm_data *ds1wm_data)
+{
+        ds1wm_reset(ds1wm_data);
+
+        /* Disable interrupts. */
+        ds1wm_write_register(ds1wm_data, DS1WM_INT_EN,
+                             ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0);
+
+        if (ds1wm_data->pdata->disable)
+                ds1wm_data->pdata->disable(ds1wm_data->pdev);
+
+        clk_disable(ds1wm_data->clk);
+}
+
+/* --------------------------------------------------------------------- */
+/* w1 methods */
+
+static u8 ds1wm_read_byte(void *data)
+{
+        struct ds1wm_data *ds1wm_data = data;
+
+        return ds1wm_read(ds1wm_data, 0xff);
+}
+
+static void ds1wm_write_byte(void *data, u8 byte)
+{
+        struct ds1wm_data *ds1wm_data = data;
+
+        ds1wm_write(ds1wm_data, byte);
+}
+
+static u8 ds1wm_reset_bus(void *data)
+{
+        struct ds1wm_data *ds1wm_data = data;
+
+        ds1wm_reset(ds1wm_data);
+
+        return 0;
+}
+
+static void ds1wm_search(void *data, u8 search_type,
+                         w1_slave_found_callback slave_found)
+{
+        struct ds1wm_data *ds1wm_data = data;
+        int i;
+        unsigned long long rom_id;
+
+        /* XXX We need to iterate for multiple devices per the DS1WM docs.
+         * See http://www.maxim-ic.com/appnotes.cfm/appnote_number/120. */
+        if (ds1wm_reset(ds1wm_data))
+                return;
+
+        ds1wm_write(ds1wm_data, search_type);
+        ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_SRA);
+
+        for (rom_id = 0, i = 0; i < 16; i++) {
+
+                unsigned char resp, r, d;
+
+                resp = ds1wm_read(ds1wm_data, 0x00);
+
+                r = ((resp & 0x02) >> 1) |
+                    ((resp & 0x08) >> 2) |
+                    ((resp & 0x20) >> 3) |
+                    ((resp & 0x80) >> 4);
+
+                d = ((resp & 0x01) >> 0) |
+                    ((resp & 0x04) >> 1) |
+                    ((resp & 0x10) >> 2) |
+                    ((resp & 0x40) >> 3);
+
+                rom_id |= (unsigned long long) r << (i * 4);
+
+        }
+        dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX", rom_id);
+
+        ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA);
+        ds1wm_reset(ds1wm_data);
+
+        slave_found(ds1wm_data, rom_id);
+}
+
+/* --------------------------------------------------------------------- */
+
+static struct w1_bus_master ds1wm_master = {
+        .read_byte  = ds1wm_read_byte,
+        .write_byte = ds1wm_write_byte,
+        .reset_bus  = ds1wm_reset_bus,
+        .search     = ds1wm_search,
+};
+
+static int ds1wm_probe(struct platform_device *pdev)
+{
+        struct ds1wm_data *ds1wm_data;
+        struct ds1wm_platform_data *plat;
+        struct resource *res;
+        int ret;
+
+        if (!pdev)
+                return -ENODEV;
+
+        ds1wm_data = kzalloc(sizeof (*ds1wm_data), GFP_KERNEL);
+        if (!ds1wm_data)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, ds1wm_data);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                ret = -ENXIO;
+                goto err0;
+        }
+        ds1wm_data->map = ioremap(res->start, res->end - res->start + 1);
+        if (!ds1wm_data->map) {
+                ret = -ENOMEM;
+                goto err0;
+        }
+        plat = pdev->dev.platform_data;
+        ds1wm_data->bus_shift = plat->bus_shift;
+        ds1wm_data->pdev = pdev;
+        ds1wm_data->pdata = plat;
+
+        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!res) {
+                ret = -ENXIO;
+                goto err1;
+        }
+        ds1wm_data->irq = res->start;
+        ds1wm_data->active_high = (res->flags & IORESOURCE_IRQ_HIGHEDGE) ?
+                1 : 0;
+
+        set_irq_type(ds1wm_data->irq, ds1wm_data->active_high ?
+                        IRQ_TYPE_EDGE_RISING : IRQ_TYPE_EDGE_FALLING);
+
+        ret = request_irq(ds1wm_data->irq, ds1wm_isr, IRQF_DISABLED,
+                          "ds1wm", ds1wm_data);
+        if (ret)
+                goto err1;
+
+        ds1wm_data->clk = clk_get(&pdev->dev, "ds1wm");
+        if (!ds1wm_data->clk) {
+                ret = -ENOENT;
+                goto err2;
+        }
+
+        ds1wm_up(ds1wm_data);
+
+        ds1wm_master.data = (void *)ds1wm_data;
+
+        ret = w1_add_master_device(&ds1wm_master);
+        if (ret)
+                goto err3;
+
+        return 0;
+
+err3:
+        ds1wm_down(ds1wm_data);
+        clk_put(ds1wm_data->clk);
+err2:
+        free_irq(ds1wm_data->irq, ds1wm_data);
+err1:
+        iounmap(ds1wm_data->map);
+err0:
+        kfree(ds1wm_data);
+
+        return ret;
+}
+
+#ifdef CONFIG_PM
+static int ds1wm_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct ds1wm_data *ds1wm_data = platform_get_drvdata(pdev);
+
+        ds1wm_down(ds1wm_data);
+
+        return 0;
+}
+
+static int ds1wm_resume(struct platform_device *pdev)
+{
+        struct ds1wm_data *ds1wm_data = platform_get_drvdata(pdev);
+
+        ds1wm_up(ds1wm_data);
+
+        return 0;
+}
+#else
+#define ds1wm_suspend NULL
+#define ds1wm_resume NULL
+#endif
+
+static int ds1wm_remove(struct platform_device *pdev)
+{
+        struct ds1wm_data *ds1wm_data = platform_get_drvdata(pdev);
+
+        w1_remove_master_device(&ds1wm_master);
+        ds1wm_down(ds1wm_data);
+        clk_put(ds1wm_data->clk);
+        free_irq(ds1wm_data->irq, ds1wm_data);
+        iounmap(ds1wm_data->map);
+        kfree(ds1wm_data);
+
+        return 0;
+}
+
+static struct platform_driver ds1wm_driver = {
+        .driver   = {
+                .name = "ds1wm",
+        },
+        .probe    = ds1wm_probe,
+        .remove   = ds1wm_remove,
+        .suspend  = ds1wm_suspend,
+        .resume   = ds1wm_resume
+};
+
+static int __init ds1wm_init(void)
+{
+        printk("DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n");
+        return platform_driver_register(&ds1wm_driver);
+}
+
+static void __exit ds1wm_exit(void)
+{
+        platform_driver_unregister(&ds1wm_driver);
+}
+
+module_init(ds1wm_init);
+module_exit(ds1wm_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>, "
+              "Matt Reimer <mreimer@vpop.net>");
+MODULE_DESCRIPTION("DS1WM w1 busmaster driver");
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 63c07243993c..7d6876dbcc96 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -459,7 +459,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
                  (unsigned long long) sl->reg_num.id);
 
         dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__,
-                &sl->dev.bus_id[0]);
+                &sl->dev.bus_id[0], sl);
 
         err = device_register(&sl->dev);
         if (err < 0) {
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 357a2e0f637a..258defdb2efd 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -100,7 +100,8 @@ int w1_add_master_device(struct w1_bus_master *master)
 
         /* validate minimum functionality */
         if (!(master->touch_bit && master->reset_bus) &&
-            !(master->write_bit && master->read_bit)) {
+            !(master->write_bit && master->read_bit) &&
+            !(master->write_byte && master->read_byte && master->reset_bus)) {
                 printk(KERN_ERR "w1_add_master_device: invalid function set\n");
                 return(-EINVAL);
         }